Skip to content

Commit e371eeb

Browse files
committed
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)
2 parents f9d4d12 + 4b4a514 commit e371eeb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Cargo.lock

+5-4
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ dependencies = [
311311

312312
[[package]]
313313
name = "cargo"
314-
version = "0.62.0"
314+
version = "0.63.0"
315315
dependencies = [
316316
"anyhow",
317317
"atty",
@@ -348,6 +348,7 @@ dependencies = [
348348
"opener",
349349
"openssl",
350350
"os_info",
351+
"pathdiff",
351352
"percent-encoding 2.1.0",
352353
"pretty_env_logger",
353354
"rustc-workspace-hack",
@@ -453,7 +454,7 @@ dependencies = [
453454

454455
[[package]]
455456
name = "cargo-util"
456-
version = "0.1.2"
457+
version = "0.1.3"
457458
dependencies = [
458459
"anyhow",
459460
"core-foundation",
@@ -2651,9 +2652,9 @@ dependencies = [
26512652

26522653
[[package]]
26532654
name = "pathdiff"
2654-
version = "0.2.0"
2655+
version = "0.2.1"
26552656
source = "registry+https://github.com/rust-lang/crates.io-index"
2656-
checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34"
2657+
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
26572658

26582659
[[package]]
26592660
name = "percent-encoding"

0 commit comments

Comments
 (0)