Skip to content

Commit 03d537e

Browse files
committed
Auto merge of #65957 - Xanewok:update-rls, r=Xanewok
submodules: Bump RLS to 58869107ec162a821a4bee53cdd3f51c84cda3ea Most importantly it contains rust-lang/rls@d267b49 which fixes the RLS build whenever Clippy is built successfully in Rust CI. Closes #65944 r? @ghost
2 parents c553e8e + 0658b24 commit 03d537e

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

Cargo.lock

+7-14
Original file line numberDiff line numberDiff line change
@@ -1631,9 +1631,9 @@ dependencies = [
16311631

16321632
[[package]]
16331633
name = "jsonrpc-core"
1634-
version = "13.1.0"
1634+
version = "13.2.0"
16351635
source = "registry+https://github.com/rust-lang/crates.io-index"
1636-
checksum = "dd42951eb35079520ee29b7efbac654d85821b397ef88c8151600ef7e2d00217"
1636+
checksum = "91d767c183a7e58618a609499d359ce3820700b3ebb4823a18c343b4a2a41a0d"
16371637
dependencies = [
16381638
"futures",
16391639
"log",
@@ -2974,14 +2974,14 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
29742974

29752975
[[package]]
29762976
name = "rls"
2977-
version = "1.39.0"
2977+
version = "1.40.0"
29782978
dependencies = [
29792979
"cargo",
29802980
"cargo_metadata 0.8.0",
29812981
"clippy_lints",
29822982
"crossbeam-channel",
29832983
"difference",
2984-
"env_logger 0.6.2",
2984+
"env_logger 0.7.0",
29852985
"failure",
29862986
"futures",
29872987
"heck",
@@ -2995,7 +2995,7 @@ dependencies = [
29952995
"num_cpus",
29962996
"ordslice",
29972997
"racer",
2998-
"rand 0.6.1",
2998+
"rand 0.7.0",
29992999
"rayon",
30003000
"regex",
30013001
"rls-analysis",
@@ -3004,7 +3004,6 @@ dependencies = [
30043004
"rls-rustc",
30053005
"rls-span",
30063006
"rls-vfs",
3007-
"rustc-serialize",
30083007
"rustc-workspace-hack",
30093008
"rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
30103009
"rustfmt-nightly",
@@ -3065,11 +3064,11 @@ name = "rls-rustc"
30653064
version = "0.6.0"
30663065
dependencies = [
30673066
"clippy_lints",
3068-
"env_logger 0.6.2",
3067+
"env_logger 0.7.0",
30693068
"failure",
30703069
"futures",
30713070
"log",
3072-
"rand 0.6.1",
3071+
"rand 0.7.0",
30733072
"rls-data",
30743073
"rls-ipc",
30753074
"serde",
@@ -3365,12 +3364,6 @@ dependencies = [
33653364
"num_cpus",
33663365
]
33673366

3368-
[[package]]
3369-
name = "rustc-serialize"
3370-
version = "0.3.24"
3371-
source = "registry+https://github.com/rust-lang/crates.io-index"
3372-
checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
3373-
33743367
[[package]]
33753368
name = "rustc-std-workspace-alloc"
33763369
version = "1.99.0"

src/tools/rls

Submodule rls updated from a18df16 to 5db91c7

0 commit comments

Comments
 (0)