diff options
| author | Igor Matuszewski <Xanewok@gmail.com> | 2019-04-21 12:52:07 +0200 |
|---|---|---|
| committer | Igor Matuszewski <Xanewok@gmail.com> | 2019-04-21 12:52:07 +0200 |
| commit | 4fb570dea74acdd9db00a60c13e9eeddc14ecf27 (patch) | |
| tree | 3742559022a0d5116dc44150be51b5114404c38a /src | |
| parent | 25451967ee217b0d8a6db6195b84444f71f89d70 (diff) | |
| download | rust-4fb570dea74acdd9db00a60c13e9eeddc14ecf27.tar.gz rust-4fb570dea74acdd9db00a60c13e9eeddc14ecf27.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_save_analysis/Cargo.toml | 4 | ||||
| m--------- | src/tools/rls | 0 |
2 files changed, 2 insertions, 2 deletions
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 -Subproject b202e14dbf53949d05822e680ee5166b3346885 +Subproject 20e32686df573fc44ac1052bf3e6982b0da27cf |