Auto merge of rust-lang#68823 - matthiaskrgr:submodule_upd, r=ehuss

submodules: update cargo
JohnTitor · Feb 12, 2020 · e6db669 · e6db669
2 parents fc23a81 + 451d492
commit e6db669
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -281,7 +281,7 @@ dependencies = [
 
 [[package]]
 name = "cargo"
-version = "0.43.0"
+version = "0.44.0"
 dependencies = [
  "anyhow",
  "atty",
@@ -292,6 +292,7 @@ dependencies = [
  "clap",
  "core-foundation 0.7.0",
  "crates-io",
+ "crossbeam-channel 0.4.0",
  "crossbeam-utils 0.7.0",
  "crypto-hash",
  "curl",
@@ -729,6 +730,15 @@ dependencies = [
  "smallvec 0.6.10",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
+dependencies = [
+ "crossbeam-utils 0.7.0",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.1"
@@ -1077,13 +1087,14 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
 [[package]]
 name = "filetime"
-version = "0.2.4"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646"
+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
+ "winapi 0.3.8",
 ]
 
 [[package]]
@@ -1541,7 +1552,7 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7"
 dependencies = [
- "crossbeam-channel",
+ "crossbeam-channel 0.3.8",
  "globset",
  "lazy_static 1.4.0",
  "log",
@@ -2504,12 +2515,11 @@ dependencies = [
 
 [[package]]
 name = "pretty_env_logger"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
+checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
 dependencies = [
- "chrono",
- "env_logger 0.6.2",
+ "env_logger 0.7.1",
  "log",
 ]
 
@@ -2948,7 +2958,7 @@ dependencies = [
  "cargo",
  "cargo_metadata 0.8.0",
  "clippy_lints",
- "crossbeam-channel",
+ "crossbeam-channel 0.3.8",
  "difference",
  "env_logger 0.7.1",
  "futures",
@@ -4547,9 +4557,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.20"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2"
+checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"
 dependencies = [
  "filetime",
  "libc",

diff --git a/src/tools/cargo b/src/tools/cargo
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
@@ -59,6 +59,7 @@ const EXCEPTIONS: &[&str] = &[
     "dunce",              // CC0-1.0 mdbook-linkcheck
     "codespan-reporting", // Apache-2.0 mdbook-linkcheck
     "codespan",           // Apache-2.0 mdbook-linkcheck
+    "crossbeam-channel",  // MIT/Apache-2.0 AND BSD-2-Clause, cargo
 ];
 
 /// Which crates to check against the whitelist?
+84 −3		CHANGELOG.md
+5 −4		Cargo.toml
+4 −0		ci/azure-test-all.yml
+3 −3		crates/cargo-test-support/src/lib.rs
+2 −2		crates/resolver-tests/tests/resolve.rs
+76 −22		src/bin/cargo/cli.rs
+6 −1		src/bin/cargo/commands/build.rs
+0 −10		src/cargo/core/compiler/build_context/target_info.rs
+1 −0		src/cargo/core/compiler/compilation.rs
+18 −1		src/cargo/core/compiler/context/compilation_files.rs
+38 −5		src/cargo/core/compiler/context/mod.rs
+98 −38		src/cargo/core/compiler/custom_build.rs
+11 −4		src/cargo/core/compiler/fingerprint.rs
+9 −5		src/cargo/core/compiler/job_queue.rs
+29 −25		src/cargo/core/compiler/mod.rs
+17 −13		src/cargo/core/compiler/output_depinfo.rs
+30 −5		src/cargo/core/compiler/timings.rs
+0 −2		src/cargo/core/features.rs
+2 −16		src/cargo/core/profiles.rs
+4 −0		src/cargo/core/workspace.rs
+5 −3		src/cargo/ops/cargo_compile.rs
+26 −22		src/cargo/ops/cargo_install.rs
+12 −1		src/cargo/ops/cargo_new.rs
+9 −14		src/cargo/util/config/mod.rs
+102 −0		src/doc/src/reference/config.md
+20 −0		src/doc/src/reference/environment-variables.md
+6 −1		src/doc/src/reference/profiles.md
+7 −20		src/doc/src/reference/unstable.md
+2 −2		tests/testsuite/cache_messages.rs
+16 −0		tests/testsuite/cargo_alias_config.rs
+3 −3		tests/testsuite/clippy.rs
+2 −3		tests/testsuite/config.rs
+2 −2		tests/testsuite/fix.rs
+39 −11		tests/testsuite/freshness.rs
+48 −1		tests/testsuite/init.rs
+30 −4		tests/testsuite/install.rs
+24 −0		tests/testsuite/out_dir.rs
+0 −4		tests/testsuite/proc_macro.rs
+12 −46		tests/testsuite/profile_config.rs
+90 −0		tests/testsuite/profile_overrides.rs
+93 −0		tests/testsuite/required_features.rs
+0 −5		tests/testsuite/rustc_info_cache.rs