diff options
| author | bors <bors@rust-lang.org> | 2019-10-30 22:37:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-30 22:37:21 +0000 |
| commit | 03d537ef2276d7c82c5f138f68b1c2d5262f2899 (patch) | |
| tree | 40b06f6e9c28ecc78ef367a177a5d6320c74f88d | |
| parent | c553e8e8812c19809e70523064989e66c5cfd3f1 (diff) | |
| parent | 0658b2492565a051bdde66502e03de466d66f63c (diff) | |
| download | rust-03d537ef2276d7c82c5f138f68b1c2d5262f2899.tar.gz rust-03d537ef2276d7c82c5f138f68b1c2d5262f2899.zip | |
Auto merge of #65957 - Xanewok:update-rls, r=Xanewok
submodules: Bump RLS to 58869107ec162a821a4bee53cdd3f51c84cda3ea Most importantly it contains https://github.com/rust-lang/rls/commit/d267b49c2f7914f5b4bc94916dc56d64b37adf3a which fixes the RLS build whenever Clippy is built successfully in Rust CI. Closes #65944 r? @ghost
| -rw-r--r-- | Cargo.lock | 21 | ||||
| m--------- | src/tools/rls | 0 |
2 files changed, 7 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5826a1dbbd9..9119af12667 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1631,9 +1631,9 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "13.1.0" +version = "13.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd42951eb35079520ee29b7efbac654d85821b397ef88c8151600ef7e2d00217" +checksum = "91d767c183a7e58618a609499d359ce3820700b3ebb4823a18c343b4a2a41a0d" dependencies = [ "futures", "log", @@ -2974,14 +2974,14 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" [[package]] name = "rls" -version = "1.39.0" +version = "1.40.0" dependencies = [ "cargo", "cargo_metadata 0.8.0", "clippy_lints", "crossbeam-channel", "difference", - "env_logger 0.6.2", + "env_logger 0.7.0", "failure", "futures", "heck", @@ -2995,7 +2995,7 @@ dependencies = [ "num_cpus", "ordslice", "racer", - "rand 0.6.1", + "rand 0.7.0", "rayon", "regex", "rls-analysis", @@ -3004,7 +3004,6 @@ dependencies = [ "rls-rustc", "rls-span", "rls-vfs", - "rustc-serialize", "rustc-workspace-hack", "rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt-nightly", @@ -3065,11 +3064,11 @@ name = "rls-rustc" version = "0.6.0" dependencies = [ "clippy_lints", - "env_logger 0.6.2", + "env_logger 0.7.0", "failure", "futures", "log", - "rand 0.6.1", + "rand 0.7.0", "rls-data", "rls-ipc", "serde", @@ -3366,12 +3365,6 @@ dependencies = [ ] [[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] name = "rustc-std-workspace-alloc" version = "1.99.0" dependencies = [ diff --git a/src/tools/rls b/src/tools/rls -Subproject a18df16181947edd5eb593ea0f2321e0035448e +Subproject 5db91c7b94ca81eead6b25bcf6196b869a44ece |