Auto merge of #1394 - jabagawee:rls-analysis-serde, r=Xanewok

Add serde implementation to complement rustc-serialize

We want to transition off of rustc-serialize and onto serde, so this
commit sets up both to co-exist, gated by feature flags. Due to the fact
that they implement the same functions, only one feature flag can be
active at a time. To compile rls-analysis with serde, it is necessary to
run cargo build with the `--no-default-features` flag and the
`--features "serialize-serde"` flag.

The tests in this commit will still work with the default feature flags
but will need to be changed before the serde implementation can pass
tests.

Addresses #1354

Author: bors

rls-analysis/Cargo.toml

@@ -11,15 +11,22 @@ exclude = [
 ]
 
 [dependencies]
-rustc-serialize = "0.3"
+rustc-serialize = { version = "0.3", optional = true }
 log = "0.4"
 rls-data = "= 0.18.2"
 rls-span = "0.4"
 derive-new = "0.5"
 fst = { version = "0.3", default-features = false }
 itertools = "0.7.3"
 json = "0.11.13"
+serde = { version = "1.0", optional = true }
+serde_json = { version = "1.0", optional = true }
 
 [dev-dependencies]
 lazy_static = "1"
 env_logger = "0.5"
+
+[features]
+default = ["serialize-rustc"]
+serialize-rustc = ["rustc-serialize", "rls-data/serialize-rustc", "rls-span/serialize-rustc"]
+serialize-serde = ["serde", "serde_json", "rls-data/serialize-serde", "rls-span/serialize-serde"]

rls-analysis/src/lib.rs

@@ -15,7 +15,12 @@ extern crate itertools;
 extern crate json;
 extern crate rls_data as data;
 extern crate rls_span as span;
+#[cfg(feature = "serialize-rustc")]
 extern crate rustc_serialize;
+#[cfg(feature = "serialize-serde")]
+extern crate serde;
+#[cfg(feature = "serialize-serde")]
+extern crate serde_json;
 
 mod analysis;
 mod listings;

rls-analysis/src/raw.rs

@@ -12,7 +12,6 @@ pub use data::{
     CratePreludeData, Def, DefKind, GlobalCrateId as CrateId, Import, Ref, Relation, RelationKind,
     SigElement, Signature, SpanData,
 };
-use json;
 use listings::{DirectoryListing, ListingKind};
 use {AnalysisLoader, Blacklist};
 
@@ -123,7 +122,7 @@ fn read_crate_data(path: &Path) -> Option<Analysis> {
             Err(err)
         })
         .ok()?;
-    let s = ::rustc_serialize::json::decode(&buf)
+    let s = decode_buf(&buf)
         .or_else(|err| {
             warn!("deserialisation error: {:?}", err);
             json::parse(&buf)
@@ -157,6 +156,28 @@ fn read_crate_data(path: &Path) -> Option<Analysis> {
     s
 }
 
+#[cfg(all(feature = "serialize-rustc", not(feature = "serialize-serde")))]
+fn decode_buf(buf: &str) -> Result<Option<Analysis>, rustc_serialize::json::DecoderError> {
+    ::rustc_serialize::json::decode(buf)
+}
+
+#[cfg(all(feature = "serialize-serde", not(feature = "serialize-rustc")))]
+fn decode_buf(buf: &str) -> Result<Option<Analysis>, serde_json::Error> {
+    ::serde_json::from_str(buf)
+}
+
+#[cfg(all(feature = "serialize-rustc", feature = "serialize-serde"))]
+fn decode_buf(buf: &str) -> Result<Option<Analysis>, Box<dyn std::error::Error>> {
+    compile_error!("Features \"serialize-serde\" and \"serialize-rustc\" cannot both be enabled for this crate.")
+}
+
+#[cfg(not(any(feature = "serialize-serde", feature = "serialize-rustc")))]
+fn decode_buf(buf: &str) -> Result<Option<Analysis>, Box<dyn std::error::Error>> {
+    compile_error!(
+        "Either feature \"serialize-serde\" or \"serialize-rustc\" must be enabled for this crate."
+    )
+}
+
 pub fn name_space_for_def_kind(dk: DefKind) -> char {
     match dk {
         DefKind::Enum