Rollup merge of rust-lang#55831 - alexcrichton:beta-cargo-update, r=a…

…lexcrichton Hopefully a routine update to the rust-1.31.0 branch!
pietroalbini · Nov 10, 2018 · 3b3639a · 3b3639a
2 parents bee06e3 + e68d70c
commit 3b3639a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Cargo.lock b/src/Cargo.lock
@@ -209,6 +209,7 @@ dependencies = [
  "crossbeam-utils 0.5.0 (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.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curl-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.5.12 (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)",

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −0		Cargo.toml
+149 −21		src/cargo/core/package.rs
+1 −0		src/cargo/lib.rs
+8 −4		src/cargo/ops/fix.rs
+2 −1		src/cargo/ops/mod.rs
+46 −29		src/cargo/ops/registry.rs
+2 −1		src/cargo/util/config.rs
+4 −2		src/cargo/util/network.rs
+44 −0		tests/testsuite/fix.rs