Skip to content

Commit

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

Unfortunately it was reverted back to a broken state in
e06c515 by accident, so let's bring it forward
again!

Closes rust-lang/cargo#3844
  • Loading branch information
@bors
bors committed Mar 18, 2017
2 parents df3ab37 + 9fb737b commit 4853584
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cargo
Submodule cargo updated 12 files
+8 −8 .travis.yml
+4 −4 Cargo.lock
+2 −2 Cargo.toml
+1 −1 appveyor.yml
+3 −12 src/cargo/lib.rs
+9 −5 src/cargo/ops/cargo_rustc/mod.rs
+3 −12 src/cargo/util/rustc.rs
+6 −1 src/cargo/util/toml.rs
+1 −1 src/crates-io/Cargo.toml
+21 −0 tests/build.rs
+1 −4 tests/git.rs
+27 −0 tests/registry.rs

0 comments on commit 4853584

Please sign in to comment.