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

Update cargo 10 commits in e931e4796b61de593aa1097649445e535c9c7ee0..0cecbd67323ca14a7eb6505900d0d7307b00355b 2021-05-24 16:17:27 +0000 to 2021-06-01 20:09:13 +0000 - Configure hosts separately from targets when --target is specified. (rust-lang/cargo#9322) - Add some validation to rustc-link-arg (rust-lang/cargo#9523) - Implement suggestions for unknown features in workspace (rust-lang/cargo#9420) - Extract common `make_dep_path` to cargo_util (rust-lang/cargo#9529) - Add a note about rustflags compatibility. (rust-lang/cargo#9524) - Consolidate doc collision detection. (rust-lang/cargo#9526) - Add `--depth` option for `cargo-tree` (rust-lang/cargo#9499) - `cargo tree -e no-proc-macro` to hide procedural macro dependencies (rust-lang/cargo#9488) - Update to semver 1.0.0 (rust-lang/cargo#9508) - Update tar dependency to 0.4.35 (rust-lang/cargo#9517)
JohnTitor · Jun 3, 2021 · 80c871c · 80c871c
2 parents a5466fc + 7852935
commit 80c871c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -278,6 +278,7 @@ dependencies = [
  "humantime 2.0.1",
  "ignore",
  "im-rc",
+ "itertools 0.10.0",
  "jobserver",
  "lazy_static",
  "lazycell",
@@ -293,7 +294,7 @@ dependencies = [
  "rand 0.8.3",
  "rustc-workspace-hack",
  "rustfix",
- "semver 0.10.0",
+ "semver 1.0.1",
  "serde",
  "serde_ignored",
  "serde_json",
@@ -1715,6 +1716,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.6"
@@ -4674,6 +4684,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d023dabf011d5dcb5ac64e3685d97d3b0ef412911077a2851455c6098524a723"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
@@ -5033,9 +5052,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.33"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
+checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80"
 dependencies = [
  "filetime",
  "libc",

diff --git a/src/tools/cargo b/src/tools/cargo
+3 −2		Cargo.toml
+2 −7		crates/cargo-test-support/src/registry.rs
+1 −0		crates/cargo-util/src/lib.rs
+45 −0		crates/cargo-util/src/registry.rs
+3 −3		crates/resolver-tests/src/lib.rs
+53 −19		src/bin/cargo/commands/tree.rs
+9 −4		src/cargo/core/compiler/build_context/target_info.rs
+5 −22		src/cargo/core/compiler/compilation.rs
+1 −1		src/cargo/core/compiler/context/compilation_files.rs
+25 −1		src/cargo/core/compiler/context/mod.rs
+60 −19		src/cargo/core/compiler/custom_build.rs
+1 −1		src/cargo/core/compiler/standard_lib.rs
+18 −83		src/cargo/core/dependency.rs
+4 −0		src/cargo/core/features.rs
+1 −1		src/cargo/core/registry.rs
+1 −1		src/cargo/core/resolver/errors.rs
+281 −82		src/cargo/core/workspace.rs
+7 −1		src/cargo/ops/cargo_compile.rs
+5 −59		src/cargo/ops/cargo_doc.rs
+2 −6		src/cargo/ops/cargo_install.rs
+2 −0		src/cargo/ops/cargo_package.rs
+48 −19		src/cargo/ops/tree/mod.rs
+7 −12		src/cargo/sources/registry/index.rs
+4 −4		src/cargo/sources/registry/mod.rs
+2 −26		src/cargo/sources/registry/remote.rs
+10 −0		src/cargo/util/config/mod.rs
+49 −5		src/cargo/util/config/target.rs
+2 −0		src/cargo/util/mod.rs
+76 −0		src/cargo/util/semver_ext.rs
+1 −1		src/cargo/util/to_semver.rs
+29 −10		src/cargo/util/toml/mod.rs
+8 −1		src/doc/man/cargo-tree.md
+8 −2		src/doc/man/generated_txt/cargo-tree.txt
+8 −1		src/doc/src/commands/cargo-tree.md
+10 −0		src/doc/src/reference/config.md
+55 −0		src/doc/src/reference/unstable.md
+12 −1		src/etc/man/cargo-tree.1
+2 −2		tests/testsuite/build.rs
+387 −0		tests/testsuite/build_script.rs
+70 −0		tests/testsuite/build_script_extra_link_arg.rs
+33 −21		tests/testsuite/doc.rs
+2 −1		tests/testsuite/package.rs
+42 −2		tests/testsuite/package_features.rs
+0 −113		tests/testsuite/registry.rs
+243 −2		tests/testsuite/tree.rs