Reorganize the code, closes #76

Author: maciejhirsz

src/lib.rs

@@ -196,9 +196,7 @@
 //! # }
 //! ```
 
-use std::io::Write;
-use std::collections::{ BTreeMap, HashMap };
-use std::{ fmt, result, mem };
+use std::result;
 
 mod codegen;
 mod parser;
@@ -210,10 +208,6 @@ pub mod short;
 pub mod object;
 pub mod number;
 
-use short::Short;
-use number::Number;
-use object::Object;
-
 pub use error::Error;
 pub use value::JsonValue;
 pub use value::JsonValue::Null;
@@ -246,58 +240,9 @@ pub use Error as JsonError;
 pub use Result as JsonResult;
 
 pub use parser::parse;
-use codegen::{ Generator, PrettyGenerator, DumpGenerator, WriterGenerator };
 
 pub type Array = Vec<JsonValue>;
 
-impl JsonValue {
-    /// Prints out the value as JSON string.
-    pub fn dump(&self) -> String {
-        let mut gen = DumpGenerator::new();
-        gen.write_json(self);
-        gen.consume()
-    }
-
-    /// Pretty prints out the value as JSON string. Takes an argument that's
-    /// number of spaces to indent new blocks with.
-    pub fn pretty(&self, spaces: u16) -> String {
-        let mut gen = PrettyGenerator::new(spaces);
-        gen.write_json(self);
-        gen.consume()
-    }
-
-    /// Dumps the JSON as byte stream into an instance of `std::io::Write`.
-    pub fn to_writer<W: Write>(&self, writer: &mut W) {
-        let mut gen = WriterGenerator::new(writer);
-        gen.write_json(self);
-    }
-}
-
-/// Implements formatting
-///
-/// ```
-/// # use json;
-/// let data = json::parse(r#"{"url":"https://github.com/"}"#).unwrap();
-/// println!("{}", data);
-/// println!("{:#}", data);
-/// ```
-impl fmt::Display for JsonValue {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if f.alternate() {
-            f.write_str(&self.pretty(4))
-        } else {
-            match *self {
-                JsonValue::Short(ref value)   => value.fmt(f),
-                JsonValue::String(ref value)  => value.fmt(f),
-                JsonValue::Number(ref value)  => value.fmt(f),
-                JsonValue::Boolean(ref value) => value.fmt(f),
-                JsonValue::Null               => f.write_str("null"),
-                _                             => f.write_str(&self.dump())
-            }
-        }
-    }
-}
-
 /// Convenience for `JsonValue::from(value)`
 pub fn from<T>(value: T) -> JsonValue where T: Into<JsonValue> {
     value.into()
@@ -349,221 +294,3 @@ macro_rules! object {
     })
 }
 
-macro_rules! implement_extras {
-    ($from:ty) => {
-        impl From<Option<$from>> for JsonValue {
-            fn from(val: Option<$from>) -> JsonValue {
-                match val {
-                    Some(value) => value.into(),
-                    None        => Null,
-                }
-            }
-        }
-
-        impl From<Vec<$from>> for JsonValue {
-            fn from(mut val: Vec<$from>) -> JsonValue {
-                JsonValue::Array(
-                    val.drain(..)
-                       .map(|value| value.into())
-                       .collect()
-                )
-            }
-        }
-
-        impl From<Vec<Option<$from>>> for JsonValue {
-            fn from(mut val: Vec<Option<$from>>) -> JsonValue {
-                JsonValue::Array(
-                    val.drain(..)
-                       .map(|item| item.into())
-                       .collect()
-                )
-            }
-        }
-    }
-}
-
-macro_rules! implement_eq {
-    ($to:ident, $from:ty) => {
-        impl PartialEq<$from> for JsonValue {
-            fn eq(&self, other: &$from) -> bool {
-                match *self {
-                    JsonValue::$to(ref value) => value == other,
-                    _                         => false
-                }
-            }
-        }
-
-        impl<'a> PartialEq<$from> for &'a JsonValue {
-            fn eq(&self, other: &$from) -> bool {
-                match **self {
-                    JsonValue::$to(ref value) => value == other,
-                    _                         => false
-                }
-            }
-        }
-
-        impl PartialEq<JsonValue> for $from {
-            fn eq(&self, other: &JsonValue) -> bool {
-                match *other {
-                    JsonValue::$to(ref value) => value == self,
-                    _ => false
-                }
-            }
-        }
-    }
-}
-
-macro_rules! implement {
-    ($to:ident, $from:ty as num) => {
-        impl From<$from> for JsonValue {
-            fn from(val: $from) -> JsonValue {
-                JsonValue::$to(val.into())
-            }
-        }
-
-        implement_eq!($to, $from);
-        implement_extras!($from);
-    };
-    ($to:ident, $from:ty) => {
-        impl From<$from> for JsonValue {
-            fn from(val: $from) -> JsonValue {
-                JsonValue::$to(val)
-            }
-        }
-
-        implement_eq!($to, $from);
-        implement_extras!($from);
-    }
-}
-
-impl<'a> From<&'a str> for JsonValue {
-    fn from(val: &'a str) -> JsonValue {
-        if val.len() <= short::MAX_LEN {
-            JsonValue::Short(unsafe { Short::from_slice(val) })
-        } else {
-            JsonValue::String(val.into())
-        }
-    }
-}
-
-impl<'a> From<Option<&'a str>> for JsonValue {
-    fn from(val: Option<&'a str>) -> JsonValue {
-        match val {
-            Some(value) => value.into(),
-            None        => Null,
-        }
-    }
-}
-
-impl From<HashMap<String, JsonValue>> for JsonValue {
-    fn from(mut val: HashMap<String, JsonValue>) -> JsonValue {
-        let mut object = Object::with_capacity(val.len());
-
-        for (key, value) in val.drain() {
-            object.insert(&key, value);
-        }
-
-        JsonValue::Object(object)
-    }
-}
-
-impl From<Option<HashMap<String, JsonValue>>> for JsonValue {
-    fn from(val: Option<HashMap<String, JsonValue>>) -> JsonValue {
-        match val {
-            Some(value) => value.into(),
-            None        => Null,
-        }
-    }
-}
-
-impl From<BTreeMap<String, JsonValue>> for JsonValue {
-    fn from(mut val: BTreeMap<String, JsonValue>) -> JsonValue {
-        let mut object = Object::with_capacity(val.len());
-
-        for (key, value) in val.iter_mut() {
-            // Since BTreeMap has no `drain` available, we can use
-            // the mutable iterator and replace all values by nulls,
-            // taking ownership and transfering it to the new `Object`.
-            let value = mem::replace(value, Null);
-            object.insert(key, value);
-        }
-
-        JsonValue::Object(object)
-    }
-}
-
-impl From<Option<BTreeMap<String, JsonValue>>> for JsonValue {
-    fn from(val: Option<BTreeMap<String, JsonValue>>) -> JsonValue {
-        match val {
-            Some(value) => value.into(),
-            None        => Null,
-        }
-    }
-}
-
-impl From<Option<JsonValue>> for JsonValue {
-    fn from(val: Option<JsonValue>) -> JsonValue {
-        match val {
-            Some(value) => value,
-            None        => Null,
-        }
-    }
-}
-
-impl<'a> PartialEq<&'a str> for JsonValue {
-    fn eq(&self, other: &&str) -> bool {
-        match *self {
-            JsonValue::Short(ref value)  => value == *other,
-            JsonValue::String(ref value) => value == *other,
-            _ => false
-        }
-    }
-}
-
-impl<'a> PartialEq<JsonValue> for &'a str {
-    fn eq(&self, other: &JsonValue) -> bool {
-        match *other {
-            JsonValue::Short(ref value)  => value == *self,
-            JsonValue::String(ref value) => value == *self,
-            _ => false
-        }
-    }
-}
-
-impl PartialEq<str> for JsonValue {
-    fn eq(&self, other: &str) -> bool {
-        match *self {
-            JsonValue::Short(ref value)  => value == other,
-            JsonValue::String(ref value) => value == other,
-            _ => false
-        }
-    }
-}
-
-impl<'a> PartialEq<JsonValue> for str {
-    fn eq(&self, other: &JsonValue) -> bool {
-        match *other {
-            JsonValue::Short(ref value)  => value == self,
-            JsonValue::String(ref value) => value == self,
-            _ => false
-        }
-    }
-}
-
-implement!(String, String);
-implement!(Number, isize as num);
-implement!(Number, usize as num);
-implement!(Number, i8 as num);
-implement!(Number, i16 as num);
-implement!(Number, i32 as num);
-implement!(Number, i64 as num);
-implement!(Number, u8 as num);
-implement!(Number, u16 as num);
-implement!(Number, u32 as num);
-implement!(Number, u64 as num);
-implement!(Number, f32 as num);
-implement!(Number, f64 as num);
-implement!(Number, Number);
-implement!(Object, Object);
-implement!(Array, Array);
-implement!(Boolean, bool);