diff options
| author | bors <bors@rust-lang.org> | 2022-04-14 11:04:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-14 11:04:26 +0000 |
| commit | e371eeb778c293cc85ce396cec5d6372fe1ef8b7 (patch) | |
| tree | 9bfaf24401b6c71351ad8cc3e65c12583c73c7e7 | |
| parent | f9d4d12b6ab97fae8b9a6f607473fe149f38f6bd (diff) | |
| parent | 4b4a514b7aef3efefebb648ccd9ee06b5f387657 (diff) | |
| download | rust-e371eeb778c293cc85ce396cec5d6372fe1ef8b7.tar.gz rust-e371eeb778c293cc85ce396cec5d6372fe1ef8b7.zip | |
Auto merge of #96031 - ehuss:update-cargo, r=ehuss
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)
| -rw-r--r-- | Cargo.lock | 9 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 325503a0e95..045fcbac80e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.62.0" +version = "0.63.0" dependencies = [ "anyhow", "atty", @@ -348,6 +348,7 @@ dependencies = [ "opener", "openssl", "os_info", + "pathdiff", "percent-encoding 2.1.0", "pretty_env_logger", "rustc-workspace-hack", @@ -453,7 +454,7 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.1.2" +version = "0.1.3" dependencies = [ "anyhow", "core-foundation", @@ -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" diff --git a/src/tools/cargo b/src/tools/cargo -Subproject e2e2dddebe66dfc1403a312653557e332445308 +Subproject dba5baf4345858c591517b24801902a062c399f |