Skip to content

Commit e0c825c

Browse files
authored
Rollup merge of rust-lang#61670 - Xanewok:update-rls, r=oli-obk
Update RLS This bumps the version to 1.37 and also doesn't build clippy by default (should reduce toolstate breakages, see rust-lang#59761 (comment) for more details) r? @oli-obk
2 parents 6b71fba + 31dc27d commit e0c825c

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Cargo.lock

+11-11
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12771277

12781278
[[package]]
12791279
name = "jsonrpc-core"
1280-
version = "10.0.1"
1280+
version = "12.0.0"
12811281
source = "registry+https://github.com/rust-lang/crates.io-index"
12821282
dependencies = [
12831283
"futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1407,7 +1407,7 @@ dependencies = [
14071407

14081408
[[package]]
14091409
name = "lsp-types"
1410-
version = "0.57.0"
1410+
version = "0.57.2"
14111411
source = "registry+https://github.com/rust-lang/crates.io-index"
14121412
dependencies = [
14131413
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2266,7 +2266,7 @@ name = "rls"
22662266
version = "1.36.0"
22672267
dependencies = [
22682268
"cargo 0.38.0",
2269-
"cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
2269+
"cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
22702270
"clippy_lints 0.0.212",
22712271
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
22722272
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2276,11 +2276,11 @@ dependencies = [
22762276
"heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
22772277
"home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
22782278
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
2279-
"jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
2279+
"jsonrpc-core 12.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
22802280
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
22812281
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
22822282
"lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2283-
"lsp-types 0.57.0 (registry+https://github.com/rust-lang/crates.io-index)",
2283+
"lsp-types 0.57.2 (registry+https://github.com/rust-lang/crates.io-index)",
22842284
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
22852285
"ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
22862286
"racer 2.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2295,7 +2295,7 @@ dependencies = [
22952295
"rls-vfs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
22962296
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
22972297
"rustc-workspace-hack 1.0.0",
2298-
"rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
2298+
"rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
22992299
"rustfmt-nightly 1.2.2",
23002300
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
23012301
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3030,12 +3030,12 @@ dependencies = [
30303030

30313031
[[package]]
30323032
name = "rustc_tools_util"
3033-
version = "0.1.1"
3034-
source = "registry+https://github.com/rust-lang/crates.io-index"
3033+
version = "0.2.0"
30353034

30363035
[[package]]
30373036
name = "rustc_tools_util"
30383037
version = "0.2.0"
3038+
source = "registry+https://github.com/rust-lang/crates.io-index"
30393039

30403040
[[package]]
30413041
name = "rustc_traits"
@@ -4229,7 +4229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
42294229
"checksum jemalloc-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bef0d4ce37578dfd80b466e3d8324bd9de788e249f1accebb0c472ea4b52bdc"
42304230
"checksum jobserver 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b3d51e24009d966c8285d524dbaf6d60926636b2a89caee9ce0bd612494ddc16"
42314231
"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
4232-
"checksum jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a5152c3fda235dfd68341b3edf4121bc4428642c93acbd6de88c26bf95fc5d7"
4232+
"checksum jsonrpc-core 12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "288dca7f9713710a29e485076b9340156cb701edb46a881f5d0c31aa4f5b9143"
42334233
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
42344234
"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
42354235
"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
@@ -4243,7 +4243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
42434243
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
42444244
"checksum log_settings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19af41f0565d7c19b2058153ad0b42d4d5ce89ec4dbf06ed6741114a8b63e7cd"
42454245
"checksum lsp-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "169d737ad89cf8ddd82d1804d9122f54568c49377665157277cc90d747b1d31a"
4246-
"checksum lsp-types 0.57.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d220de1fbbb12b60df17898272579c22329375fc4baa960402fbd17cf0cdd165"
4246+
"checksum lsp-types 0.57.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b62b77309737b1e262b3bbf37ff8faa740562c633b14702afe9be85dbcb6f88a"
42474247
"checksum lzma-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d1eaa027402541975218bb0eec67d6b0412f6233af96e0d096d31dbdfd22e614"
42484248
"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
42494249
"checksum macro-utils 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2c4deaccc2ead6a28c16c0ba82f07d52b6475397415ce40876e559b0b0ea510"
@@ -4350,7 +4350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43504350
"checksum rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "526e7b6d2707a5b9bec3927d424ad70fa3cfc68e0ac1b75e46cdbbc95adc5108"
43514351
"checksum rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79d38ca7cbc22fa59f09d8534ea4b27f67b0facf0cbe274433aceea227a02543"
43524352
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
4353-
"checksum rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c5a95edfa0c893236ae4778bb7c4752760e4c0d245e19b5eff33c5aa5eb9dc"
4353+
"checksum rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee"
43544354
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
43554355
"checksum rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "af7c21531a91512a4a51b490be6ba1c8eff34fdda0dc5bf87dc28d86748aac56"
43564356
"checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c"

src/tools/rls

Submodule rls updated from 9692ca8 to d1e2028

0 commit comments

Comments
 (0)