Skip to content

Commit

Permalink
Auto merge of #71875 - Xanewok:update-rls, r=tmandry
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed May 5, 2020
2 parents f8d394e + 3b8358e commit 43271a3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3102,7 +3102,6 @@ version = "0.6.0"
dependencies = [
"clippy_lints",
"env_logger 0.7.1",
"failure",
"futures",
"log",
"rand 0.7.3",
Expand Down Expand Up @@ -3504,11 +3503,14 @@ name = "rustc-workspace-hack"
version = "1.0.0"
dependencies = [
"crossbeam-utils 0.7.2",
"proc-macro2 1.0.3",
"quote 1.0.2",
"serde",
"serde_json",
"smallvec 0.6.10",
"smallvec 1.4.0",
"syn 0.15.35",
"syn 1.0.11",
"url 2.1.0",
"winapi 0.3.8",
]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
8 changes: 6 additions & 2 deletions src/tools/rustc-workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ path = "lib.rs"
[target.'cfg(windows)'.dependencies.winapi]
version = "0.3"
features = [
"aclapi",
"accctrl",
"basetsd",
"consoleapi",
"errhandlingapi",
Expand Down Expand Up @@ -60,16 +62,18 @@ features = [
[dependencies]
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
proc-macro2 = { version = "1", features = ["default"] }
quote = { version = "1", features = ["default"] }
serde = { version = "1.0.82", features = ['derive'] }
serde_json = { version = "1.0.31", features = ["raw_value"] }
smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] }
smallvec = { version = "1.0", features = ['union', 'may_dangle'] }
url = { version = "2.0", features = ['serde'] }
syn = { version = "0.15", features = ['full', 'extra-traits'] }
syn-1 = { package = "syn", version = "1", features = ['fold', 'full', 'extra-traits', 'visit'] }
url = { version = "2.0", features = ['serde'] }

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


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

0 comments on commit 43271a3

Please sign in to comment.