Remove dependency on rustc_serialize

Author: epage

Cargo.toml

@@ -16,7 +16,7 @@ build = "build.rs"
 colored = "1.5"
 difference = "1.0"
 error-chain = "0.11"
-rustc-serialize = "0.3"
+serde_json = "1.0"
 
 [build-dependencies]
 skeptic = "0.13"

src/lib.rs

@@ -106,7 +106,7 @@
 
 extern crate difference;
 #[macro_use] extern crate error_chain;
-extern crate rustc_serialize;
+extern crate serde_json;
 
 mod errors;
 

src/macros.rs

@@ -1,5 +1,5 @@
 use std::borrow::Cow;
-use rustc_serialize::json::Json;
+use serde_json;
 
 /// Easily construct an `Assert` with a custom command.
 ///
@@ -50,10 +50,8 @@ macro_rules! assert_cmd {
 /// If `x` can not be decoded as `String`.
 #[doc(hidden)]
 fn deserialize_json_string(x: &str) -> String {
-    match Json::from_str(x).expect(&format!("Unable to deserialize `{:?}` as string.", x)) {
-        Json::String(deserialized) => deserialized,
-        _ => panic!("Unable to deserialize `{:?}` as string.", x),
-    }
+    serde_json::from_str(x)
+        .expect(&format!("Unable to deserialize `{:?}` as string.", x))
 }
 
 /// Deserialize a JSON-encoded `String`.
@@ -99,3 +97,32 @@ macro_rules! __assert_single_token_expression {
     // little helper
     (@DENY) => { };
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn flatten_unquoted()
+    {
+        assert_eq!(
+            flatten_escaped_string("hello world"),
+            "hello world");
+    }
+
+    #[test]
+    fn flatten_quoted()
+    {
+        assert_eq!(
+            flatten_escaped_string(r#""hello world""#),
+            "hello world");
+    }
+
+    #[test]
+    fn flatten_escaped()
+    {
+        assert_eq!(
+            flatten_escaped_string(r#""hello world \u0042 A""#),
+            "hello world B A");
+    }
+}