OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #42676 - alexcrichton:update-cargo, r=Mark-Simulacrum 

Update cargo/rls submodules and dependencies

Brings in a few regression fixes on the Cargo side, updates the rls to work
with the newer Cargo, and also updates other crates.io dependencies to pull in
various bug fixes and such.
This commit is contained in:
bors 2017-06-18 21:10:33 +00:00
parent 247a0184ff 1cede109d8
commit 10d7cb44c9
4 changed files with 335 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

647
src/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
src/Cargo.toml
View File

@ -37,4 +37,4 @@ debug = false
debug-assertions = false
[replace]
"https://github.com/rust-lang/cargo#0.20.0" = { path = "tools/cargo" }
"https://github.com/rust-lang/cargo#0.21.0" = { path = "tools/cargo" }

2
src/tools/cargo

@ -1 +1 @@
Subproject commit bbfe9b3a9d64aa8698b18cbb3803b3fa00ee3f44
Subproject commit 50b1c24d146fa072db71f12005deed319ac5ba9a

2
src/tools/rls

@ -1 +1 @@
Subproject commit 0d0f3baad02d65d96befbb90e77bf8a326dd14f5
Subproject commit e53e2f8d5b7f7751dd478fff68c1dbe7247cb096