Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 20e3268

Browse files
committed
rls: Switch to serde-only rls-* crates
1 parent 314d47c commit 20e3268

File tree

3 files changed

+28
-31
lines changed

3 files changed

+28
-31
lines changed

Cargo.lock

Lines changed: 22 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ test = false
2121
path = "rls/src/main.rs"
2222

2323
[dependencies]
24-
rls-analysis = "0.16.12"
24+
rls-analysis = "0.17.0"
2525
rls-blacklist = "0.1.3"
26-
rls-data = { version = "0.18.2", features = ["serialize-serde", "serialize-rustc"] }
26+
rls-data = "0.19"
2727
# FIXME: Release rls-rustc 0.6.0 to crates.io
2828
rls-rustc = { version = "0.6.0", path = "rls-rustc" }
29-
rls-span = { version = "0.4", features = ["serialize-serde"] }
30-
rls-vfs = "0.7"
29+
rls-span = "0.5"
30+
rls-vfs = "0.8"
3131

3232
cargo = { git = "https://github.com/rust-lang/cargo", rev = "ed858daaf7c62f6f2156c47d00b0c669bcf9b183" }
3333
cargo_metadata = "0.7"
@@ -41,7 +41,7 @@ lsp-types = { version = "0.57", features = ["proposed"] }
4141
lazy_static = "1"
4242
log = "0.4"
4343
num_cpus = "1"
44-
racer = { version = "2.1.21", default-features = false }
44+
racer = { version = "2.1.22", default-features = false }
4545
rand = "0.6"
4646
rayon = "1"
4747
rustc_tools_util = "0.1.1"

rls/src/build/external.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ where
106106
let mut contents = String::new();
107107
file.read_to_string(&mut contents).map_err(|e| e.to_string())?;
108108

109-
let data = rustc_serialize::json::decode(&contents).map_err(|e| e.to_string())?;
109+
let data = serde_json::from_str(&contents).map_err(|e| e.to_string())?;
110110
analyses.push(data);
111111
}
112112

0 commit comments

Comments
 (0)