Auto merge of rust-lang#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)
rust-lang-ci · Apr 14, 2022 · e371eeb · e371eeb
2 parents f9d4d12 + 4b4a514
commit e371eeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
+7 −0		.github/workflows/main.yml
+65 −1		CHANGELOG.md
+3 −2		Cargo.toml
+10 −1		crates/cargo-test-support/src/tools.rs
+1 −1		crates/cargo-util/Cargo.toml
+293 −50		crates/cargo-util/src/process_builder.rs
+7 −0		crates/cargo-util/src/process_error.rs
+1 −1		src/cargo/core/compiler/build_plan.rs
+1 −0		src/cargo/core/compiler/compilation.rs
+1 −0		src/cargo/core/compiler/context/mod.rs
+32 −6		src/cargo/core/compiler/mod.rs
+2 −2		src/cargo/core/compiler/unit_dependencies.rs
+4 −0		src/cargo/core/features.rs
+2 −1		src/cargo/core/mod.rs
+36 −186		src/cargo/core/workspace.rs
+135 −28		src/cargo/ops/cargo_clean.rs
+74 −46		src/cargo/ops/cargo_package.rs
+118 −55		src/cargo/ops/fix.rs
+12 −9		src/cargo/util/rustc.rs
+291 −67		src/cargo/util/toml/mod.rs
+28 −2		src/doc/src/reference/unstable.md
+86 −0		tests/testsuite/build.rs
+50 −0		tests/testsuite/check.rs
+52 −0		tests/testsuite/doc.rs
+13 −0		tests/testsuite/fix.rs
+82 −11		tests/testsuite/inheritable_workspace_fields.rs
+39 −0		tests/testsuite/package.rs
+1 −0		tests/testsuite/rustdocflags.rs
+106 −0		tests/testsuite/test.rs