Skip to content

Commit

Permalink
Auto merge of #50135 - matklad:update-cargo, r=kennytm
Browse files Browse the repository at this point in the history 
Update Cargo

Some noteble changes:

 * ~~regression fix: rust-lang/cargo#5390
  * ~~potentially breaking bug-fix: rust-lang/cargo#5389
  * ~~Cargo now caches the result of `rustc -vV`. It checks `rustc` binary
    mtime and rustup toolchain settings, so it should probably "just work"
    with rustbuild.~~

potentially breaking bug-fix: rust-lang/cargo#5390
  • Loading branch information
@bors
bors committed Apr 22, 2018
2 parents 28193e8 + cb46d28 commit 8887396
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 15 files
+4 −1 CONTRIBUTING.md
+6 −6 src/bin/command_prelude.rs
+5 −1 src/cargo/core/compiler/job_queue.rs
+0 −2 src/cargo/core/features.rs
+1 −1 src/cargo/core/resolver/types.rs
+1 −0 src/cargo/core/workspace.rs
+31 −74 src/cargo/ops/resolve.rs
+1 −1 tests/testsuite/bench.rs
+1 −1 tests/testsuite/build.rs
+14 −3 tests/testsuite/cargotest/support/mod.rs
+12 −12 tests/testsuite/check.rs
+4 −4 tests/testsuite/doc.rs
+12 −16 tests/testsuite/features.rs
+1 −1 tests/testsuite/rustdoc.rs
+5 −51 tests/testsuite/test.rs

0 comments on commit 8887396

Please sign in to comment.