user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to serde-enabled rls-* and update RLS appropriately

Browse source 
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.
This commit is contained in:
Igor Matuszewski 2019-04-21 12:52:07 +02:00
parent 25451967ee
commit 4fb570dea7
3 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_save_analysis/Cargo.toml
View file

@ -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"

2
src/tools/rls

@ -1 +1 @@
Subproject commit b202e14dbf53949d05822e680ee5166b33468853
Subproject commit 20e32686df573fc44ac1052bf3e6982b0da27cfc