Skip to content

Commit

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

Pull in fix for #57774.

6 commits in ffe65875fd05018599ad07e7389e99050c7915be..907c0febe7045fa02dff2a35c5e36d3bd59ea50d
2019-01-17 23:57:50 +0000 to 2019-01-20 22:31:07 +0000
- Put mtime-on-use behind a feature flag. (rust-lang/cargo#6573)
- Fix a typo in the unstable docs (rust-lang/cargo#6569)
- Perhaps you meant: foo, bar or foobar (rust-lang/cargo#6550)
- Refactor: Create uninstall submodule (rust-lang/cargo#6557)
- Fix spurious Windows errors with switch_features_rerun. (rust-lang/cargo#6561)
- Stop building on master on Travis. (rust-lang/cargo#6562)

r? @Mark-Simulacrum
  • Loading branch information
@bors
bors committed Jan 21, 2019
2 parents e730697 + c949d8e commit 7bac68a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 15 files
+1 −0 .travis.yml
+18 −8 src/cargo/core/compiler/fingerprint.rs
+2 −0 src/cargo/core/features.rs
+9 −2 src/cargo/core/resolver/errors.rs
+14 −398 src/cargo/ops/cargo_install.rs
+157 −0 src/cargo/ops/cargo_uninstall.rs
+259 −0 src/cargo/ops/common_for_install_and_uninstall.rs
+4 −1 src/cargo/ops/mod.rs
+2 −2 src/doc/src/reference/unstable.md
+6 −3 tests/testsuite/build_script.rs
+1 −1 tests/testsuite/directory.rs
+30 −29 tests/testsuite/freshness.rs
+1 −1 tests/testsuite/path.rs
+2 −2 tests/testsuite/registry.rs
+21 −0 tests/testsuite/support/mod.rs

0 comments on commit 7bac68a

Please sign in to comment.