Skip to content

Commit

Permalink
Auto merge of #54342 - steveklabnik:update-cargo-beta, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
Update Cargo

This pulls in rust-lang/cargo#6054, and
is a beta backport of #54334
  • Loading branch information
@bors
bors committed Sep 19, 2018
2 parents 14f51b0 + 889ab28 commit 7a0062e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 58 files
+1 −1 Cargo.toml
+1 −0 src/bin/cargo/cli.rs
+0 −1 src/bin/cargo/command_prelude.rs
+1 −1 src/bin/cargo/commands/doc.rs
+13 −4 src/cargo/core/compiler/build_context/mod.rs
+3 −0 src/cargo/core/compiler/job_queue.rs
+21 −11 src/cargo/core/compiler/mod.rs
+2 −0 src/cargo/core/features.rs
+2 −35 src/cargo/core/shell.rs
+4 −18 src/cargo/core/source/source_id.rs
+1 −2 src/cargo/ops/cargo_clean.rs
+4 −14 src/cargo/ops/cargo_compile.rs
+0 −1 src/cargo/ops/cargo_package.rs
+0 −33 src/cargo/ops/fix.rs
+0 −29 src/cargo/util/rustc.rs
+0 −10 src/cargo/util/toml/mod.rs
+4 −4 src/doc/src/reference/specifying-dependencies.md
+16 −0 src/doc/src/reference/unstable.md
+33 −35 tests/testsuite/alt_registry.rs
+1 −1 tests/testsuite/bad_config.rs
+23 −23 tests/testsuite/bench.rs
+64 −82 tests/testsuite/build.rs
+3 −3 tests/testsuite/build_lib.rs
+30 −30 tests/testsuite/build_script.rs
+1 −1 tests/testsuite/cargo_command.rs
+1 −1 tests/testsuite/check.rs
+21 −21 tests/testsuite/cross_compile.rs
+8 −8 tests/testsuite/cross_publish.rs
+4 −4 tests/testsuite/directory.rs
+22 −47 tests/testsuite/doc.rs
+25 −25 tests/testsuite/features.rs
+0 −23 tests/testsuite/fix.rs
+9 −9 tests/testsuite/freshness.rs
+17 −17 tests/testsuite/git.rs
+19 −19 tests/testsuite/install.rs
+6 −6 tests/testsuite/local_registry.rs
+1 −1 tests/testsuite/new.rs
+15 −15 tests/testsuite/overrides.rs
+24 −24 tests/testsuite/package.rs
+30 −30 tests/testsuite/patch.rs
+32 −32 tests/testsuite/path.rs
+2 −2 tests/testsuite/profile_config.rs
+7 −7 tests/testsuite/profile_overrides.rs
+108 −108 tests/testsuite/profile_targets.rs
+21 −21 tests/testsuite/profiles.rs
+15 −15 tests/testsuite/publish.rs
+45 −45 tests/testsuite/registry.rs
+3 −3 tests/testsuite/rename_deps.rs
+18 −18 tests/testsuite/required_features.rs
+27 −27 tests/testsuite/run.rs
+26 −26 tests/testsuite/rustc.rs
+22 −22 tests/testsuite/rustdoc.rs
+2 −2 tests/testsuite/search.rs
+11 −21 tests/testsuite/support/mod.rs
+1 −1 tests/testsuite/support/publish.rs
+33 −33 tests/testsuite/test.rs
+8 −8 tests/testsuite/tool_paths.rs
+1 −1 tests/testsuite/workspaces.rs

0 comments on commit 7a0062e

Please sign in to comment.