Skip to content

Commit

Permalink
Auto merge of rust-lang#96031 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history
Update cargo

11 commits in e2e2dddebe66dfc1403a312653557e332445308b..dba5baf4345858c591517b24801902a062c399f8
2022-04-05 17:04:53 +0000 to 2022-04-13 21:58:27 +0000
- Part 6 of RFC2906 - Switch the inheritance source from `workspace` to… (rust-lang/cargo#10564)
- Part 5 of RFC2906 - Add support for inheriting `rust-version` (rust-lang/cargo#10563)
- Add support for rustc --check-cfg well known names and values (rust-lang/cargo#10486)
- Reserve filename `Cargo.toml.orig` in `cargo package` (rust-lang/cargo#10551)
- Retry command invocation with argfile (rust-lang/cargo#10546)
- Add a progress indicator for `cargo clean` (rust-lang/cargo#10236)
- Ensure host units don't depend on Docscrape units, fixes rust-lang/cargo#10545 (rust-lang/cargo#10549)
- Fix docs: Bindeps env vars are passed to build script at runtime (rust-lang/cargo#10550)
- Part 4 of RFC2906 - Add support for inheriting `readme` (rust-lang/cargo#10548)
- Part 3 of RFC2906 - Add support for inheriting `license-path`, and `depednency.path` (rust-lang/cargo#10538)
- Bump to 0.63.0, update changelog (rust-lang/cargo#10544)
  • Loading branch information
bors committed Apr 14, 2022
2 parents f9d4d12 + 4b4a514 commit e371eeb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.62.0"
version = "0.63.0"
dependencies = [
"anyhow",
"atty",
Expand Down Expand Up @@ -348,6 +348,7 @@ dependencies = [
"opener",
"openssl",
"os_info",
"pathdiff",
"percent-encoding 2.1.0",
"pretty_env_logger",
"rustc-workspace-hack",
Expand Down Expand Up @@ -453,7 +454,7 @@ dependencies = [

[[package]]
name = "cargo-util"
version = "0.1.2"
version = "0.1.3"
dependencies = [
"anyhow",
"core-foundation",
Expand Down Expand Up @@ -2651,9 +2652,9 @@ dependencies = [

[[package]]
name = "pathdiff"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34"
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"

[[package]]
name = "percent-encoding"
Expand Down

0 comments on commit e371eeb

Please sign in to comment.