Rollup merge of rust-lang#55999 - alexcrichton:update-cargo, r=nrc

Update Cargo submodule Brings in some fixes and stabilizations!
kennytm · Nov 17, 2018 · bc7d2cf · bc7d2cf
2 parents c3d92b4 + 01127ca
commit bc7d2cf
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
@@ -185,11 +185,11 @@ dependencies = [
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "crates-io 0.21.0",
- "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -539,6 +539,14 @@ name = "crossbeam-utils"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crypto-hash"
 version = "0.3.1"
@@ -662,6 +670,18 @@ dependencies = [
  "termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "environment"
 version = "0.1.1"
@@ -731,6 +751,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libz-sys 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3210,6 +3231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-epoch 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c90f1474584f38e270b5b613e898c8c328aa4f3dea85e0a27ac2e642f009416"
 "checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
 "checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
+"checksum crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c55913cc2799171a550e307918c0a360e8c16004820291bf3b638969b4a01816"
 "checksum crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
 "checksum curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c7c9d851c825e0c033979d4516c9173bc19a78a96eb4d6ae51d4045440eafa16"
 "checksum curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "721c204978be2143fab0a84b708c49d79d1f6100b8785610f456043a90708870"
@@ -3222,6 +3244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum elasticlunr-rs 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4837d77a1e157489a3933b743fd774ae75074e0e390b2b7f071530048a0d87ee"
 "checksum ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621"
 "checksum env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f4d7e69c283751083d53d01eac767407343b8b69c4bd70058e08adc2637cb257"
+"checksum env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"
 "checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
 "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"

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
@@ -92,6 +92,7 @@ const WHITELIST: &[Crate] = &[
     Crate("kernel32-sys"),
     Crate("lazy_static"),
     Crate("libc"),
+    Crate("libz-sys"),
     Crate("lock_api"),
     Crate("log"),
     Crate("log_settings"),
@@ -133,6 +134,7 @@ const WHITELIST: &[Crate] = &[
     Crate("utf8-ranges"),
     Crate("version_check"),
     Crate("void"),
+    Crate("vcpkg"),
     Crate("winapi"),
     Crate("winapi-build"),
     Crate("winapi-i686-pc-windows-gnu"),
+3 −3		Cargo.toml
+1 −1		src/cargo/core/compiler/build_config.rs
+17 −8		src/cargo/core/compiler/context/compilation_files.rs
+88 −21		src/cargo/core/compiler/context/mod.rs
+2 −9		src/cargo/core/compiler/fingerprint.rs
+4 −2		src/cargo/core/compiler/job_queue.rs
+5 −4		src/cargo/core/compiler/mod.rs
+1 −1		src/cargo/core/features.rs
+15 −2		src/cargo/core/manifest.rs
+13 −0		src/cargo/core/package.rs
+3 −4		src/cargo/core/profiles.rs
+117 −38		src/cargo/core/resolver/conflict_cache.rs
+9 −8		src/cargo/core/resolver/context.rs
+2 −2		src/cargo/core/resolver/errors.rs
+4 −4		src/cargo/core/resolver/mod.rs
+9 −11		src/cargo/ops/cargo_compile.rs
+5 −3		src/cargo/ops/fix.rs
+6 −0		src/cargo/ops/registry.rs
+10 −8		src/cargo/util/process_builder.rs
+9 −0		src/crates-io/lib.rs
+62 −2		src/doc/src/reference/specifying-dependencies.md
+0 −55		src/doc/src/reference/unstable.md
+88 −31		tests/testsuite/build.rs
+24 −21		tests/testsuite/check.rs
+105 −0		tests/testsuite/collisions.rs
+71 −0		tests/testsuite/fix.rs
+1 −0		tests/testsuite/main.rs
+31 −0		tests/testsuite/out_dir.rs
+2 −11		tests/testsuite/profile_targets.rs
+6 −94		tests/testsuite/rename_deps.rs
+37 −10		tests/testsuite/resolve.rs
+0 −4		tests/testsuite/rustc.rs