diff options
| author | bors <bors@rust-lang.org> | 2019-04-16 20:58:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-16 20:58:15 +0000 |
| commit | c132c96a6daa86ba6b9e587a89dca1ce5c445dd1 (patch) | |
| tree | d4c90bcce6e9994a0756a99006956688b0db6df5 | |
| parent | 70f130954d6fd36fe3e77f4b5b33e5af50489288 (diff) | |
| parent | df7445b780c0dd1b0913222edfbe3fd6c50eb80d (diff) | |
| download | rust-c132c96a6daa86ba6b9e587a89dca1ce5c445dd1.tar.gz rust-c132c96a6daa86ba6b9e587a89dca1ce5c445dd1.zip | |
Auto merge of #59997 - ehuss:update-cargo, r=alexcrichton
Update cargo 16 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..b6581d383ed596b133e330011658c6f83cf85c2f 2019-04-04 14:11:33 +0000 to 2019-04-16 16:02:11 +0000 - Fix new_warning_with_corrupt_ws missing "USER". (rust-lang/cargo#6857) - Ignore Clippy redundant_closure (rust-lang/cargo#6855) - Pass OsStr/OsString args through to the process spawned by cargo run. (rust-lang/cargo#6849) - Bump to 0.37.0 (rust-lang/cargo#6852) - Fix test include_overrides_gitignore. (rust-lang/cargo#6850) - Clarify optional registry key behaviour (rust-lang/cargo#6851) - Ensure Summary::checksum works for registry crates (rust-lang/cargo#6842) - Better error if PathSource::walk can't access something. (rust-lang/cargo#6841) - Improve warning in `cargo new` with parse error. (rust-lang/cargo#6839) - Improve error message for `publish` key restriction. (rust-lang/cargo#6838) - Remove `Freshness` from `DependencyQueue` (rust-lang/cargo#6832) - testsuite: cleanup for `alternative-registries` (rust-lang/cargo#6837) - Improve error message to rerun a test in a workspace. (rust-lang/cargo#6824) - Fix mutable_borrow_reservation_conflict warning. (rust-lang/cargo#6829) - Add install-upgrade. (rust-lang/cargo#6798) - Clarify docs of install without <crate> (rust-lang/cargo#6823)
| -rw-r--r-- | Cargo.lock | 8 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0e3d39bcbb3..bc11ff2bbbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,7 +231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cargo" -version = "0.36.0" +version = "0.37.0" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -239,7 +239,7 @@ dependencies = [ "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.24.0", + "crates-io 0.25.0", "crossbeam-utils 0.6.2 (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.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -530,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "crates-io" -version = "0.24.0" +version = "0.25.0" dependencies = [ "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2215,7 +2215,7 @@ dependencies = [ name = "rls" version = "1.35.0" dependencies = [ - "cargo 0.36.0", + "cargo 0.37.0", "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "clippy_lints 0.0.212", "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 6f3e9c367abb497c64f360c3839dab5e74928d5 +Subproject b6581d383ed596b133e330011658c6f83cf85c2 |