Skip to content

Commit

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

Bring in some fixes for `cargo fix` notably
  • Loading branch information
@bors
bors committed Aug 1, 2018
2 parents e94df4a + 089ab25 commit efdd0e8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crates-io 0.18.0",
"crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -606,6 +606,11 @@ name = "crossbeam-utils"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "crossbeam-utils"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "crypto-hash"
version = "0.3.1"
Expand Down Expand Up @@ -3128,6 +3133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum crossbeam-epoch 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "285987a59c4d91388e749850e3cb7b3a92299668528caaacd08005b8f238c0ea"
"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
"checksum crossbeam-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ea52fab26a99d96cdff39d0ca75c9716125937f5dba2ab83923aaaf5928f684a"
"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
"checksum crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
"checksum curl 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "893713db705eab9847e050268507b0e2a2aad64e90a831874bd4e8e0d67f9523"
"checksum curl-sys 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "de9cf174efdf90b5887c4e2e900769373c89c5e18152e8f3ed75b501a6f1c0fb"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 52 files
+1 −1 Cargo.toml
+12 −7 src/bin/cargo/cli.rs
+15 −0 src/bin/cargo/command_prelude.rs
+19 −2 src/bin/cargo/commands/fix.rs
+3 −4 src/bin/cargo/commands/locate_project.rs
+5 −2 src/bin/cargo/commands/read_manifest.rs
+13 −7 src/bin/cargo/main.rs
+1 −1 src/cargo/core/compiler/build_context/mod.rs
+5 −5 src/cargo/core/compiler/compilation.rs
+17 −9 src/cargo/core/compiler/context/mod.rs
+1 −1 src/cargo/core/compiler/context/unit_dependencies.rs
+4 −6 src/cargo/core/compiler/fingerprint.rs
+31 −9 src/cargo/core/compiler/job_queue.rs
+18 −6 src/cargo/core/compiler/mod.rs
+57 −12 src/cargo/core/dependency.rs
+20 −9 src/cargo/core/manifest.rs
+14 −14 src/cargo/core/registry.rs
+1 −1 src/cargo/core/resolver/conflict_cache.rs
+11 −11 src/cargo/core/resolver/context.rs
+13 −13 src/cargo/core/resolver/mod.rs
+2 −2 src/cargo/core/resolver/types.rs
+5 −4 src/cargo/core/summary.rs
+1 −1 src/cargo/lib.rs
+13 −2 src/cargo/ops/cargo_compile.rs
+1 −5 src/cargo/ops/cargo_new.rs
+3 −5 src/cargo/ops/cargo_output_metadata.rs
+1 −1 src/cargo/ops/cargo_package.rs
+3 −3 src/cargo/ops/cargo_test.rs
+135 −33 src/cargo/ops/fix.rs
+8 −5 src/cargo/ops/registry.rs
+1 −1 src/cargo/ops/resolve.rs
+2 −2 src/cargo/sources/git/utils.rs
+4 −3 src/cargo/sources/registry/index.rs
+76 −12 src/cargo/util/diagnostic_server.rs
+3 −2 src/cargo/util/lockserver.rs
+1 −1 src/cargo/util/mod.rs
+3 −1 src/cargo/util/toml/mod.rs
+32 −8 src/cargo/util/toml/targets.rs
+17 −1 src/cargo/util/vcs.rs
+1 −1 src/doc/src/reference/manifest.md
+26 −1 src/doc/src/reference/unstable.md
+93 −3 tests/testsuite/build.rs
+1 −1 tests/testsuite/build_lib.rs
+19 −1 tests/testsuite/cargo_command.rs
+37 −0 tests/testsuite/doc.rs
+88 −4 tests/testsuite/fix.rs
+4 −11 tests/testsuite/init.rs
+0 −1 tests/testsuite/main.rs
+48 −12 tests/testsuite/new.rs
+145 −0 tests/testsuite/rename_deps.rs
+5 −15 tests/testsuite/support/mod.rs
+42 −0 tests/testsuite/test.rs

0 comments on commit efdd0e8

Please sign in to comment.