Rollup merge of #42191 - alexcrichton:update-cargo, r=Mark-Simulacrum · Mark-Simulacrum/rust@eacb51b

Commit

Rollup merge of rust-lang#42191 - alexcrichton:update-cargo, r=Mark-S…

…imulacrum

Update Cargo submodule

Contains a fix for rust-lang/cargo#4081

Mark-Simulacrum authored May 24, 2017

2 parents 8c88656 + 216a12c commit eacb51b

src/tools/cargo

Submodule cargo updated 12 files

+0 −29		Cargo.lock
+2 −3		Cargo.toml
+0 −1		src/cargo/lib.rs
+9 −1		src/cargo/ops/cargo_rustc/custom_build.rs
+5 −2		src/cargo/ops/cargo_rustc/mod.rs
+6 −3		src/cargo/ops/resolve.rs
+4 −1		src/cargo/util/toml.rs
+91 −0		tests/build-script.rs
+45 −0		tests/build.rs
+118 −0		tests/features.rs
+0 −1		tests/new.rs
+23 −0		tests/package.rs

Please sign in to comment.