Rollup merge of rust-lang#87928 - ehuss:update-cargo, r=ehuss

Update cargo 9 commits in cc17afbb0067b1f57d8882640f63b2168d5b7624..b51439fd8b505d4800a257acfecf3c69f81e35cf 2021-08-02 20:28:08 +0000 to 2021-08-09 18:40:05 +0000 - Deduplicate entries in cargo --list (rust-lang/cargo#9773) - Include aliases with other commands (rust-lang/cargo#9764) - Add a profile option to select the codegen backend (rust-lang/cargo#9118) - remove useless conversions (rust-lang/cargo#9617) - collapse nested if blocks (rust-lang/cargo#9613) - Refactor fake_file() away from cargo_command tests (rust-lang/cargo#9767) - Update cargo-platform to 0.1.2 (rust-lang/cargo#9762) - Bump to the latest jobserver dependency (rust-lang/cargo#9760) - Fix semver check for rust 1.54.0 (rust-lang/cargo#9763)
JohnTitor · Aug 12, 2021 · 12117e3 · 12117e3
2 parents 9775e88 + e62cd40
commit 12117e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -356,7 +356,7 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "serde",
 ]
@@ -1723,9 +1723,9 @@ checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
 
 [[package]]
 name = "jobserver"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
+checksum = "f5ca711fd837261e14ec9e674f092cbb931d3fa1482b017ae59328ddc6f3212b"
 dependencies = [
  "libc",
 ]

diff --git a/src/tools/cargo b/src/tools/cargo
+2 −2		Cargo.toml
+1 −1		crates/cargo-platform/Cargo.toml
+45 −11		crates/cargo-test-support/src/lib.rs
+6 −3		src/bin/cargo/cli.rs
+35 −31		src/bin/cargo/main.rs
+6 −6		src/cargo/core/compiler/context/mod.rs
+5 −0		src/cargo/core/compiler/mod.rs
+1 −1		src/cargo/core/compiler/output_depinfo.rs
+3 −0		src/cargo/core/features.rs
+8 −0		src/cargo/core/profiles.rs
+5 −7		src/cargo/ops/cargo_config.rs
+11 −13		src/cargo/ops/cargo_install.rs
+7 −9		src/cargo/sources/registry/index.rs
+6 −13		src/cargo/util/command_prelude.rs
+5 −7		src/cargo/util/config/target.rs
+32 −4		src/cargo/util/toml/mod.rs
+1 −1		src/doc/src/reference/pkgid-spec.md
+1 −1		src/doc/src/reference/semver.md
+18 −0		src/doc/src/reference/unstable.md
+47 −69		tests/testsuite/cargo_command.rs
+124 −118		tests/testsuite/unit_graph.rs