Rollup merge of rust-lang#47729 - alexcrichton:update-cargo, r=sfackler

Update Cargo submodule to master Just a routine update
GuillaumeGomez · Jan 25, 2018 · e1fd7ca · e1fd7ca
2 parents 5d9ea4b + 15899b0
commit e1fd7ca
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+1 −1		src/bin/cargo.rs
+16 −0		src/cargo/core/dependency.rs
+1 −1		src/cargo/core/manifest.rs
+2 −2		src/cargo/core/package.rs
+96 −17		src/cargo/core/registry.rs
+14 −8		src/cargo/ops/cargo_generate_lockfile.rs
+1 −1		src/cargo/ops/cargo_new.rs
+1 −7		src/cargo/ops/cargo_package.rs
+5 −3		src/cargo/ops/cargo_rustc/compilation.rs
+10 −0		src/cargo/ops/cargo_rustc/context.rs
+15 −5		src/cargo/ops/registry.rs
+42 −25		src/cargo/ops/resolve.rs
+9 −16		src/cargo/sources/directory.rs
+7 −1		src/cargo/util/config.rs
+1 −0		src/cargo/util/lazy_cell.rs
+67 −40		src/cargo/util/toml/mod.rs
+2 −1		src/doc/src/reference/environment-variables.md
+9 −1		src/doc/src/reference/manifest.md
+3 −4		src/doc/src/reference/specifying-dependencies.md
+1 −1		src/etc/_cargo
+55 −5		tests/alt-registry.rs
+7 −6		tests/bench.rs
+0 −101		tests/build.rs
+2 −2		tests/cargo-features.rs
+34 −0		tests/cargotest/support/mod.rs
+34 −0		tests/directory.rs
+0 −1		tests/git.rs
+14 −5		tests/package.rs
+56 −0		tests/patch.rs
+2 −1		tests/publish.rs
+43 −0		tests/run.rs
+43 −6		tests/rustflags.rs