diff options
| author | bors <bors@rust-lang.org> | 2020-04-22 00:50:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-22 00:50:49 +0000 |
| commit | 70f4f320b02cfd511c78389a6db1628285277410 (patch) | |
| tree | fe3783c263c86661dbd0755bc9eafd8d819f56b2 | |
| parent | 45d050cde277b22a755847338f2acc2c7b834141 (diff) | |
| parent | da2eb65d017ad6d9b08c6cda4b36f1a2ae678817 (diff) | |
| download | rust-70f4f320b02cfd511c78389a6db1628285277410.tar.gz rust-70f4f320b02cfd511c78389a6db1628285277410.zip | |
Auto merge of #71402 - ehuss:update-cargo, r=ehuss
Update cargo, rls ## cargo 17 commits in ebda5065ee8a1e46801380abcbac21a25bc7e755..8751eb3010d4cdb5329b5a6bd2b6d765c95b0dca 2020-04-16 14:28:43 +0000 to 2020-04-21 18:04:35 +0000 - Uplift windows gnu DLL import libraries. (rust-lang/cargo#8141) - Add windows-gnu CI and fix tests (rust-lang/cargo#8139) - Several updates to token/index handling. (rust-lang/cargo#7973) - Add `resolver` opt-in for new feature resolver. (rust-lang/cargo#8129) - Improve error message when running `cargo install .` (rust-lang/cargo#8137) - fix mem replace unused (rust-lang/cargo#8138) - Change `-Cembed-bitcode=no` use to `-Cbitcode-in-rlib=no`. (rust-lang/cargo#8134) - Refactor BuildContext (rust-lang/cargo#8068) - Rename allows_underscores to allows_dashes. (rust-lang/cargo#8135) - Fixed a needless borrow. (rust-lang/cargo#8130) - Add link to changelog in the Cargo book. (rust-lang/cargo#8126) - Fix target for doc test cross compilation (rust-lang/cargo#8094) - Add note about .cargo/config support. (rust-lang/cargo#8125) - Fix pdb uplift when executable has dashes. (rust-lang/cargo#8123) - Hint upgrading for future edition keys (rust-lang/cargo#8122) - Use some fs shorthand functions. (rust-lang/cargo#8124) - Update documentation to mention "config.toml" instead of "config" (rust-lang/cargo#8121) ## rls 1 commits in 2659cbf14bfb0929a16d7ce9b6858d0bb286ede7..7de2a1f299f8744ffe109139f9f1fdf28bfec909 2020-04-14 22:07:24 +0200 to 2020-04-19 22:41:55 +0000 - Update cargo (rust-lang-nursery/rls#1663)
| -rw-r--r-- | Cargo.lock | 2 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| m--------- | src/tools/rls | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 73cb611d79f..7b1a51e6203 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -689,7 +689,7 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "crates-io" -version = "0.31.0" +version = "0.31.1" dependencies = [ "anyhow", "curl", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject ebda5065ee8a1e46801380abcbac21a25bc7e75 +Subproject 8751eb3010d4cdb5329b5a6bd2b6d765c95b0dc diff --git a/src/tools/rls b/src/tools/rls -Subproject 2659cbf14bfb0929a16d7ce9b6858d0bb286ede +Subproject 7de2a1f299f8744ffe109139f9f1fdf28bfec90 |