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

Remove rustc-serialize dependency #1277

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -36,13 +36,12 @@ rand = "0.6"
rayon = "1"
rls-analysis = "0.16.10"
rls-blacklist = "0.1.3"
rls-data = { version = "0.18.1", features = ["serialize-serde", "serialize-rustc"] }
rls-data = { version = "0.18.1", features = ["serialize-serde"] }
rls-rustc = "0.5.0"
rls-span = { version = "0.4", features = ["serialize-serde"] }
rls-vfs = "0.7"
rustc_tools_util = "0.1.1"
rustfmt-nightly = "1.0.1"
rustc-serialize = "0.3"
serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
3 changes: 2 additions & 1 deletion src/build/external.rs
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@ use cargo::util::{process, ProcessBuilder};
use log::trace;
use rls_data::{Analysis, CompilationOptions};
use serde_derive::Deserialize;
use serde_json;

fn cmd_line_to_command<S: AsRef<str>>(cmd_line: &S, cwd: &Path) -> Result<Command, ()> {
let cmd_line = cmd_line.as_ref();
@@ -121,7 +122,7 @@ where
file.read_to_string(&mut contents)
.map_err(|e| e.to_string())?;

let data = rustc_serialize::json::decode(&contents).map_err(|e| e.to_string())?;
let data: Analysis = serde_json::from_str(&contents).map_err(|e| e.to_string())?;
analyses.push(data);
}