Fall back to rustc_serialize for Analysis data

Author: Xanewok

Cargo.lock

@@ -12,9 +12,6 @@ categories = ["development-tools"]
 
 build = "build.rs"
 
-[patch.crates-io]
-rls-data = { git = "https://github.com/Xanewok/rls-data", branch = "serde-pathbuf" }
-
 [dependencies]
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "6a7672ef5344c1bb570610f2574250fbee932355" }
 cargo_metadata = "0.6"
@@ -31,11 +28,12 @@ racer = "2.1.4"
 rayon = "1"
 rls-analysis = "0.14"
 rls-blacklist = "0.1.2"
-rls-data = { version = "0.16", features = ["serialize-serde"] }
+rls-data = { version = "0.16", features = ["serialize-serde", "serialize-rustc"] }
 rls-rustc = "0.5.0"
 rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = "0.4.6"
 rustfmt-nightly = "0.99.2"
+rustc-serialize = "0.3"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"

Cargo.toml

@@ -93,7 +93,7 @@ where
         let mut contents = String::new();
         file.read_to_string(&mut contents).map_err(|e| e.to_string())?;
 
-        let data: Analysis = serde_json::from_str(&contents).map_err(|e| e.to_string())?;
+        let data = rustc_serialize::json::decode(&contents).map_err(|e| e.to_string())?;
         analyses.push(data);
     }