Skip to content

Commit

Permalink
Auto merge of #45949 - Mark-Simulacrum:cargo-next, r=alexcrichton
Browse files Browse the repository at this point in the history 
Bump cargo to master

Includes a few bugfixes, and updates the Cargo book.

Critically includes rust-lang/cargo#4716. This
unblocks (in theory) crater runs.
  • Loading branch information
@bors
bors committed Nov 13, 2017
2 parents 7f43981 + 1f921ec commit 783c6ec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 21 files
+12 −12 src/bin/yank.rs
+57 −17 src/cargo/core/resolver/mod.rs
+116 −32 src/cargo/core/shell.rs
+7 −5 src/cargo/ops/cargo_generate_lockfile.rs
+9 −6 src/cargo/ops/cargo_run.rs
+20 −11 src/cargo/ops/cargo_rustc/output_depinfo.rs
+14 −9 src/cargo/ops/lockfile.rs
+2 −6 src/cargo/ops/resolve.rs
+34 −32 src/cargo/sources/git/utils.rs
+7 −1 src/cargo/sources/registry/remote.rs
+4 −2 src/cargo/util/config.rs
+2 −0 src/cargo/util/mod.rs
+127 −0 src/cargo/util/progress.rs
+1 −1 src/doc/book/src/faq.md
+1 −1 src/doc/book/src/index.md
+1 −1 src/doc/book/src/reference/specifying-dependencies.md
+1 −0 tests/dep-info.rs
+10 −10 tests/lockfile-compat.rs
+1 −1 tests/required-features.rs
+1 −1 tests/resolve.rs
+2 −2 tests/run.rs

0 comments on commit 783c6ec

Please sign in to comment.