Changed structure in preparation for serde

src/lib.rs

@@ -4,13 +4,12 @@ extern crate rustc_serialize;
 
 
 mod traitdef;
-mod traitimpls;
 mod diff;
 mod recorder;
 mod merger;
+pub mod value;
 
 pub use traitdef::*;
-pub use traitimpls::*;
 pub use diff::*;
 pub use recorder::*;
 pub use merger::*;

src/value/json/mod.rs

@@ -0,0 +1,3 @@
+
+#[cfg(feature = "with-rustc-serialize")]
+pub mod rustc_serialize;

src/value/mod.rs

@@ -0,0 +1 @@
+pub mod json;

tests/diff.rs

@@ -4,7 +4,8 @@ extern crate treediff;
 #[cfg(feature = "with-rustc-serialize")]
 mod diff {
     extern crate rustc_serialize;
-    use treediff::{diff, Recorder, JsonKey};
+    use treediff::{diff, Recorder};
+    use treediff::value::json::rustc_serialize::JsonKey;
     use self::rustc_serialize::json::Json;
     use treediff::ChangeType::*;
 

tests/json_value.rs

@@ -1,12 +1,22 @@
 extern crate treediff;
 
+macro_rules! make_suite {
+    ($module:ident) => {
+    mod $module {
+
+    }
+    };
+}
+
 #[cfg(feature = "with-rustc-serialize")]
 mod rustc_json_value {
     extern crate rustc_serialize;
     use treediff::Value;
-    use treediff::JsonKey;
+    use treediff::value::json::rustc_serialize::JsonKey;
     use self::rustc_serialize::json::Json;
 
+    make_suite!(rustc_value);
+
     #[test]
     fn scalar_values() {
         for v in &["null", "true", "1.23", "-1234456", "1234456", "\"string\""] {