From 1dd0e3c38f2cd4af7162a308d509018711417b5c Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Mon, 4 May 2020 14:51:31 +0200 Subject: [PATCH 1/3] 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. --- Cargo.lock | 1 - src/tools/rls | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74578084a72c8..23521e0736d03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3102,7 +3102,6 @@ version = "0.6.0" dependencies = [ "clippy_lints", "env_logger 0.7.1", - "failure", "futures", "log", "rand 0.7.3", diff --git a/src/tools/rls b/src/tools/rls index 75491db0bff74..1cb7c09eb2454 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 75491db0bff74a14dc6392b1491043bc7c924c65 +Subproject commit 1cb7c09eb245454648bdecd61fa93bace3041b6d From b512b1c7af7e45f3127859d3786377032aff1956 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Tue, 5 May 2020 14:16:15 +0200 Subject: [PATCH 2/3] Unify some syn 1.0 et al. features for tools --- Cargo.lock | 3 +++ src/tools/rustc-workspace-hack/Cargo.toml | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 23521e0736d03..16bb501d3128e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3503,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", ] diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 7e70b52da4d1e..f07819aeac2f4 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -60,12 +60,15 @@ 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 } From 3b8358e682e4c6ba203bd52bd289e213e90f6cc5 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Tue, 5 May 2020 12:50:58 -0700 Subject: [PATCH 3/3] Unify winapi features for tools --- src/tools/rustc-workspace-hack/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index f07819aeac2f4..cbf7d09f2e42c 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -17,6 +17,8 @@ path = "lib.rs" [target.'cfg(windows)'.dependencies.winapi] version = "0.3" features = [ + "aclapi", + "accctrl", "basetsd", "consoleapi", "errhandlingapi", @@ -73,6 +75,5 @@ 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']