Rollup merge of #81245 - ehuss:update-cargo, r=ehuss

Update cargo 5 commits in a73e5b7d567c3036b296fc6b33ed52c5edcd882e..783bc43c660bf39c1e562c8c429b32078ad3099b 2021-01-12 23:45:39 +0000 to 2021-01-20 19:02:26 +0000 - Fix some issues with `cargo doc` and the new feature resolver. (rust-lang/cargo#9077) - Implement support for rust-version field in project metadata (rust-lang/cargo#8037) - Fix a bug in Cargo's cyclic dep graph detection (rust-lang/cargo#9075) - Typo correction: artifcats -> artifacts (rust-lang/cargo#9081) - Remove stray backtick from doc (rust-lang/cargo#9079)
rust-lang · Jan 23, 2021 · c4830da · c4830da
2 parents 3a3470b + 453ebbd
commit c4830da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
@@ -427,6 +427,7 @@ dependencies = [
  "remove_dir_all",
  "serde_json",
  "tar",
+ "toml",
  "url 2.1.1",
 ]
 

diff --git a/src/tools/cargo b/src/tools/cargo
-Original file line number
+Diff line change
@@ Expand Up / @@ -427,6 +427,7 @@ dependencies = [ @@
      "remove_dir_all",
      "serde_json",
      "tar",
+     "toml",
      "url 2.1.1",
     ]
@@ Expand Down @@
+1 −0		crates/cargo-test-support/Cargo.toml
+31 −2		crates/cargo-test-support/src/registry.rs
+1 −0		src/bin/cargo/commands/bench.rs
+1 −0		src/bin/cargo/commands/build.rs
+1 −0		src/bin/cargo/commands/check.rs
+1 −0		src/bin/cargo/commands/doc.rs
+1 −0		src/bin/cargo/commands/fix.rs
+1 −0		src/bin/cargo/commands/run.rs
+1 −0		src/bin/cargo/commands/rustc.rs
+1 −0		src/bin/cargo/commands/rustdoc.rs
+1 −0		src/bin/cargo/commands/test.rs
+2 −2		src/cargo/core/compiler/context/mod.rs
+10 −6		src/cargo/core/compiler/unit_dependencies.rs
+14 −0		src/cargo/core/features.rs
+7 −0		src/cargo/core/manifest.rs
+4 −0		src/cargo/core/package.rs
+29 −31		src/cargo/core/resolver/mod.rs
+153 −1		src/cargo/ops/cargo_compile.rs
+1 −0		src/cargo/ops/cargo_package.rs
+17 −0		src/cargo/util/command_prelude.rs
+46 −4		src/cargo/util/toml/mod.rs
+22 −3		src/doc/src/reference/unstable.md
+271 −0		tests/testsuite/collisions.rs
+47 −0		tests/testsuite/features2.rs
+1 −0		tests/testsuite/main.rs
+72 −0		tests/testsuite/path.rs
+260 −0		tests/testsuite/rust_version.rs