Skip to content

Commit

Permalink
Auto merge of #58358 - pietroalbini:update-cargo, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
Bump cargo to 865cb70

Merged PRs:

* Replace util::without_prefix with Path::strip_prefix rust-lang/cargo#6620
* keep track of crates that are whitelisted to be used even if yanked rust-lang/cargo#6611
* Fix default DYLD_FALLBACK_LIBRARY_PATH on MacOS. rust-lang/cargo#6625
* Bail when trying to run "test --doc --no-run" rust-lang/cargo#6628
* In cargo test's help, add that examples are built rust-lang/cargo#6619
* Extract & re-use filter_targets in cargo_compile rust-lang/cargo#6621
* Test cleanup: remove unnecessary with_status(0) rust-lang/cargo#6630
* Fix run's help message rust-lang/cargo#6631
* Some updates to bash completion. rust-lang/cargo#6644
* Introduce Source::download_now rust-lang/cargo#6637
* Switch from unused_imports to deprecated to test unfixable warnings rust-lang/cargo#6649
  • Loading branch information
@bors
bors committed Feb 11, 2019
2 parents 3d845e1 + 998e584 commit 2d72528
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 45 files
+1 −1 src/bin/cargo/cli.rs
+1 −1 src/bin/cargo/commands/run.rs
+10 −3 src/bin/cargo/commands/test.rs
+11 −0 src/cargo/core/compiler/compilation.rs
+8 −0 src/cargo/core/package_id.rs
+12 −2 src/cargo/core/registry.rs
+25 −1 src/cargo/core/source/mod.rs
+11 −2 src/cargo/core/source/source_id.rs
+43 −56 src/cargo/ops/cargo_compile.rs
+2 −2 src/cargo/ops/cargo_install.rs
+3 −3 src/cargo/ops/cargo_package.rs
+5 −5 src/cargo/ops/cargo_run.rs
+4 −7 src/cargo/ops/cargo_test.rs
+6 −14 src/cargo/ops/common_for_install_and_uninstall.rs
+3 −3 src/cargo/ops/registry.rs
+1 −0 src/cargo/ops/resolve.rs
+18 −7 src/cargo/sources/config.rs
+2 −0 src/cargo/sources/directory.rs
+2 −0 src/cargo/sources/git/source.rs
+7 −5 src/cargo/sources/path.rs
+9 −2 src/cargo/sources/registry/index.rs
+45 −18 src/cargo/sources/registry/mod.rs
+6 −0 src/cargo/sources/replaced.rs
+1 −1 src/cargo/util/mod.rs
+4 −14 src/cargo/util/paths.rs
+1 −1 src/cargo/util/toml/mod.rs
+2 −2 src/doc/man/cargo-run.adoc
+1 −1 src/doc/man/cargo.adoc
+9 −2 src/doc/man/generated/cargo-metadata.html
+2 −2 src/doc/man/generated/cargo-run.html
+1 −1 src/doc/man/generated/cargo.html
+63 −52 src/etc/cargo.bashcomp.sh
+11 −4 src/etc/man/cargo-metadata.1
+4 −4 src/etc/man/cargo-run.1
+3 −3 src/etc/man/cargo.1
+0 −2 tests/testsuite/build.rs
+0 −1 tests/testsuite/directory.rs
+1 −4 tests/testsuite/edition.rs
+38 −27 tests/testsuite/fix.rs
+2 −8 tests/testsuite/package.rs
+97 −0 tests/testsuite/registry.rs
+87 −9 tests/testsuite/run.rs
+2 −1 tests/testsuite/search.rs
+20 −0 tests/testsuite/test.rs
+0 −2 tests/testsuite/workspaces.rs

0 comments on commit 2d72528

Please sign in to comment.