Skip to content

Commit

Permalink
Auto merge of #41830 - jonhoo:update-cargo, r=alexcrichton
Browse files Browse the repository at this point in the history 
Bump cargo for rust-lang/cargo#4000

rust-lang/cargo#4000 recently landed, which fixes warnings about using `-Z` when `CARGO_INCREMENTAL` is set while running stable/beta builds. As #41751 has now landed, these warnings will turn to errors in the next release, so getting the cargo fix in place is necessary unless we want people confused about why they can no longer compile anything on stable/beta.
  • Loading branch information
@bors
bors committed May 9, 2017
2 parents 644fc40 + 1617eee commit d3abc80
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 34 files
+76 −75 Cargo.lock
+8 −8 Cargo.toml
+1 −1 Makefile.in
+1 −2 appveyor.yml
+14 −2 src/bin/bench.rs
+1 −1 src/bin/cargo.rs
+13 −0 src/cargo/core/manifest.rs
+2 −2 src/cargo/core/package_id.rs
+2 −2 src/cargo/core/resolver/encode.rs
+2 −2 src/cargo/core/source.rs
+5 −4 src/cargo/ops/cargo_new.rs
+16 −1 src/cargo/ops/cargo_read_manifest.rs
+3 −26 src/cargo/ops/cargo_rustc/compilation.rs
+17 −2 src/cargo/ops/cargo_rustc/context.rs
+4 −1 src/cargo/ops/cargo_rustc/custom_build.rs
+4 −4 src/cargo/ops/cargo_rustc/fingerprint.rs
+7 −0 src/cargo/ops/cargo_rustc/layout.rs
+42 −5 src/cargo/ops/cargo_rustc/mod.rs
+1 −1 src/cargo/ops/mod.rs
+8 −2 src/cargo/util/config.rs
+24 −25 src/cargo/util/toml.rs
+4 −4 src/crates-io/Cargo.toml
+9 −0 src/doc/manifest.md
+1 −0 src/doc/stylesheets/all.css
+3 −0 tests/bad-config.rs
+133 −0 tests/bench.rs
+2 −2 tests/build-auth.rs
+18 −7 tests/build-script.rs
+31 −0 tests/build.rs
+2 −2 tests/cargotest/Cargo.toml
+19 −28 tests/cargotest/lib.rs
+55 −0 tests/git.rs
+9 −0 tests/new.rs
+22 −11 tests/plugins.rs

0 comments on commit d3abc80

Please sign in to comment.