Skip to content

Commit 43271a3

Browse files
committed
Auto merge of #71875 - Xanewok:update-rls, r=tmandry
Update RLS In addition to fixing the toolstate, this also changes the default compilation model to the out-of-process one, which should hopefully target considerable memory usage for long-running instances of the RLS. Fixes #71753 r? @ghost
2 parents f8d394e + 3b8358e commit 43271a3

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Cargo.lock

+3-1
Original file line numberDiff line numberDiff line change
@@ -3102,7 +3102,6 @@ version = "0.6.0"
31023102
dependencies = [
31033103
"clippy_lints",
31043104
"env_logger 0.7.1",
3105-
"failure",
31063105
"futures",
31073106
"log",
31083107
"rand 0.7.3",
@@ -3504,11 +3503,14 @@ name = "rustc-workspace-hack"
35043503
version = "1.0.0"
35053504
dependencies = [
35063505
"crossbeam-utils 0.7.2",
3506+
"proc-macro2 1.0.3",
3507+
"quote 1.0.2",
35073508
"serde",
35083509
"serde_json",
35093510
"smallvec 0.6.10",
35103511
"smallvec 1.4.0",
35113512
"syn 0.15.35",
3513+
"syn 1.0.11",
35123514
"url 2.1.0",
35133515
"winapi 0.3.8",
35143516
]

src/tools/rustc-workspace-hack/Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ path = "lib.rs"
1717
[target.'cfg(windows)'.dependencies.winapi]
1818
version = "0.3"
1919
features = [
20+
"aclapi",
21+
"accctrl",
2022
"basetsd",
2123
"consoleapi",
2224
"errhandlingapi",
@@ -60,16 +62,18 @@ features = [
6062
[dependencies]
6163
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
6264
crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
65+
proc-macro2 = { version = "1", features = ["default"] }
66+
quote = { version = "1", features = ["default"] }
6367
serde = { version = "1.0.82", features = ['derive'] }
6468
serde_json = { version = "1.0.31", features = ["raw_value"] }
6569
smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] }
6670
smallvec = { version = "1.0", features = ['union', 'may_dangle'] }
67-
url = { version = "2.0", features = ['serde'] }
6871
syn = { version = "0.15", features = ['full', 'extra-traits'] }
72+
syn-1 = { package = "syn", version = "1", features = ['fold', 'full', 'extra-traits', 'visit'] }
73+
url = { version = "2.0", features = ['serde'] }
6974

7075
[target.'cfg(not(windows))'.dependencies]
7176
openssl = { version = "0.10.12", optional = true }
7277

73-
7478
[features]
7579
all-static = ['openssl/vendored', 'curl-sys/static-curl', 'curl-sys/force-system-lib-on-osx']

0 commit comments

Comments
 (0)