From 4fb570dea74acdd9db00a60c13e9eeddc14ecf27 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Sun, 21 Apr 2019 12:52:07 +0200 Subject: Switch to serde-enabled rls-* and update RLS appropriately This also bumps RLS version to 1.36. The updated rls-* packages use serde but *not* serde_derive thanks to manual proc macro expansion. This is a hack, since rustc cannot handle crates.io proc macros (duplicated in tools) when cross-compiling, so that's the best we can do in order to support serde_json in save-analysis. --- src/librustc_save_analysis/Cargo.toml | 4 ++-- src/tools/rls | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml index aee827776fc..767c726b761 100644 --- a/src/librustc_save_analysis/Cargo.toml +++ b/src/librustc_save_analysis/Cargo.toml @@ -19,5 +19,5 @@ rustc_typeck = { path = "../librustc_typeck" } serde_json = "1" syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } -rls-data = "0.18.1" -rls-span = "0.4" +rls-data = "0.19" +rls-span = "0.5" diff --git a/src/tools/rls b/src/tools/rls index b202e14dbf5..20e32686df5 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit b202e14dbf53949d05822e680ee5166b33468853 +Subproject commit 20e32686df573fc44ac1052bf3e6982b0da27cfc -- cgit 1.4.1-3-g733a5