Merge pull request #1471 from Manishearth/serde

remove rustc-serialize dependency and factor `util::cargo` out into a crate

Author: llogiq

Cargo.toml

@@ -32,14 +32,15 @@ test = false
 # begin automatic update
 clippy_lints = { version = "0.0.111", path = "clippy_lints" }
 # end automatic update
+cargo_metadata = "0.1.1"
 
 [dev-dependencies]
 compiletest_rs = "0.2.5"
 lazy_static = "0.1.15"
 regex = "0.2"
-rustc-serialize = "0.3"
+serde_derive = "0.9.1"
 clippy-mini-macro-test = { version = "0.1", path = "mini-macro" }
-serde = "0.7"
+serde = "0.9.1"
 
 [features]
 debugging = []

clippy_lints/Cargo.toml

@@ -22,7 +22,6 @@ semver = "0.2.1"
 toml = "0.2"
 unicode-normalization = "0.1"
 quine-mc_cluskey = "0.2.2"
-rustc-serialize = "0.3"
 
 [features]
 debugging = []

clippy_lints/src/lib.rs

@@ -38,8 +38,6 @@ extern crate regex_syntax;
 // for finding minimal boolean expressions
 extern crate quine_mc_cluskey;
 
-extern crate rustc_serialize;
-
 extern crate rustc_errors;
 extern crate rustc_plugin;
 extern crate rustc_const_eval;

clippy_lints/src/utils/cargo.rs

@@ -21,7 +21,6 @@ use syntax::errors::DiagnosticBuilder;
 use syntax::ptr::P;
 use syntax::symbol::keywords;
 
-pub mod cargo;
 pub mod comparisons;
 pub mod conf;
 pub mod constants;

clippy_lints/src/utils/mod.rs

@@ -21,7 +21,7 @@ use std::process::{self, Command};
 use syntax::ast;
 use std::io::{self, Write};
 
-use clippy_lints::utils::cargo;
+extern crate cargo_metadata;
 
 struct ClippyCompilerCalls {
     default: RustcDefaultCalls,
@@ -179,15 +179,14 @@ pub fn main() {
 
         let manifest_path_arg = std::env::args().skip(2).find(|val| val.starts_with("--manifest-path="));
 
-        let mut metadata = if let Ok(metadata) = cargo::metadata(manifest_path_arg.as_ref().map(AsRef::as_ref)) {
+        let mut metadata = if let Ok(metadata) = cargo_metadata::metadata(manifest_path_arg.as_ref()
+            .map(AsRef::as_ref)) {
             metadata
         } else {
             let _ = io::stderr().write_fmt(format_args!("error: Could not obtain cargo metadata."));
             process::exit(101);
         };
 
-        assert_eq!(metadata.version, 1);
-
         let manifest_path = manifest_path_arg.map(|arg| PathBuf::from(Path::new(&arg["--manifest-path=".len()..])));
 
         let current_dir = std::env::current_dir();

src/main.rs

@@ -9,14 +9,19 @@ struct A;
 
 impl serde::de::Visitor for A {
     type Value = ();
-    fn visit_str<E>(&mut self, _v: &str) -> Result<Self::Value, E>
-        where E: serde::Error,
+
+    fn expecting(&self, _: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        unimplemented!()
+    }
+
+    fn visit_str<E>(self, _v: &str) -> Result<Self::Value, E>
+        where E: serde::de::Error,
     {
         unimplemented!()
     }
 
-    fn visit_string<E>(&mut self, _v: String) -> Result<Self::Value, E>
-        where E: serde::Error,
+    fn visit_string<E>(self, _v: String) -> Result<Self::Value, E>
+        where E: serde::de::Error,
     {
         unimplemented!()
     }
@@ -27,9 +32,13 @@ struct B;
 impl serde::de::Visitor for B {
     type Value = ();
 
-    fn visit_string<E>(&mut self, _v: String) -> Result<Self::Value, E>
+    fn expecting(&self, _: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        unimplemented!()
+    }
+
+    fn visit_string<E>(self, _v: String) -> Result<Self::Value, E>
     //~^ ERROR you should not implement `visit_string` without also implementing `visit_str`
-        where E: serde::Error,
+        where E: serde::de::Error,
     {
         unimplemented!()
     }

tests/compile-fail/serde.rs

@@ -1,11 +1,12 @@
 #![feature(plugin)]
 #![plugin(clippy)]
 
-extern crate rustc_serialize;
+#[macro_use]
+extern crate serde_derive;
 
 /// Test that we do not lint for unused underscores in a `MacroAttribute` expansion
 #[deny(used_underscore_binding)]
-#[derive(RustcEncodable)]
+#[derive(Deserialize)]
 struct MacroAttributesTest {
     _foo: u32,
 }

tests/used_underscore_binding_macro.rs

@@ -1,11 +1,10 @@
-extern crate clippy_lints;
-use clippy_lints::utils::cargo;
+extern crate cargo_metadata;
 
 #[test]
 fn check_that_clippy_lints_has_the_same_version_as_clippy() {
-    let clippy_meta = cargo::metadata(None).expect("could not obtain cargo metadata");
+    let clippy_meta = cargo_metadata::metadata(None).expect("could not obtain cargo metadata");
     std::env::set_current_dir(std::env::current_dir().unwrap().join("clippy_lints")).unwrap();
-    let clippy_lints_meta = cargo::metadata(None).expect("could not obtain cargo metadata");
+    let clippy_lints_meta = cargo_metadata::metadata(None).expect("could not obtain cargo metadata");
     assert_eq!(clippy_lints_meta.packages[0].version, clippy_meta.packages[0].version);
     for package in &clippy_meta.packages[0].dependencies {
         if package.name == "clippy_lints" {