Version bump

.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 language: rust
 rust:
   - stable
@@ -26,12 +25,10 @@ after_success: |
   (cd serde && cargo doc --no-deps) &&
   (cd serde_codegen && cargo doc --no-deps) &&
   (cd serde_macros && cargo doc --no-deps) &&
-  (cd serde_json && cargo doc --no-deps) &&
   cp -r serde/target/doc target/doc/serde &&
   cp -r serde_codegen/target/doc target/doc/serde_codegen &&
   cp -r serde_macros/target/doc target/doc/serde_macros &&
-  cp -r serde_json/target/doc target/doc/serde_json &&
   echo "<meta http-equiv=refresh content=0;url=`echo $TRAVIS_REPO_SLUG | cut -d '/' -f 2`/index.html>" > target/doc/index.html &&
-  pip install ghp-import &&
+  sudo pip install ghp-import &&
   ghp-import -n target/doc &&
   git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages

README.md

@@ -10,210 +10,78 @@ information. In many situations, the handshake protocol between serializers and
 serializees can be completely optimized away, leaving Serde to perform roughly
 the same speed as a hand written serializer for a specific type.
 
-Documentation is available at:
+Documentation is available at http://serde-rs.github.io/serde/serde
 
-* [serde](https://serde-rs.github.io/serde/serde/serde/index.html)
-* [serde\_json](https://serde-rs.github.io/serde/serde_json/serde_json/index.html)
-* [serde\_codegen](https://serde-rs.github.io/serde/serde_codegen/serde_codegen/index.html)
+Making a Type Serializable
+==========================
 
-Using Serde
-===========
-
-Here is a simple example that demonstrates how to use Serde by serializing and
-deserializing to JSON. Serde comes with some powerful code generation libraries
-that work with Stable and Nightly Rust that eliminate much of the complexity of
-hand rolling serialization and deserialization for a given type. First lets see
-how we would use Nightly Rust, which is currently a bit simpler than Stable
-Rust:
-
-`Cargo.toml`:
-
-```toml
-[package]
-name = "serde_example_nightly"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-
-[dependencies]
-serde = "*"
-serde_json = "*"
-serde_macros = "*"
-```
-
-`src/main.rs`
+The simplest way to make a type serializable is to use the `serde_macros`
+syntax extension, which comes with a `#[derive(Serialize, Deserialize)]`
+annotation, which automatically generates implementations of 
+[Serialize](http://serde-rs.github.io/serde/serde/ser/trait.Serialize.html)
+and
+[Deserialize](http://serde-rs.github.io/serde/serde/de/trait.Deserialize.html)
+for the annotated type:
 
 ```rust
 #![feature(custom_derive, plugin)]
 #![plugin(serde_macros)]
 
 extern crate serde;
-extern crate serde_json;
 
-#[derive(Serialize, Deserialize, Debug)]
+...
+
+#[derive(Serialize, Deserialize)]
 struct Point {
     x: i32,
     y: i32,
 }
-
-fn main() {
-    let point = Point { x: 1, y: 2 };
-    let serialized = serde_json::to_string(&point).unwrap();
-
-    println!("{}", serialized);
-
-    let deserialized: Point = serde_json::from_str(&serialized_point).unwrap();
-
-    println!("{:?}", deserialized);
-}
 ```
 
-When run, it produces:
-
-```
-% cargo run
-{"x":1,"y":2}
-Point { x: 1, y: 2 }
-```
-
-Stable Rust is a little more complicated because it does not yet support
-compiler plugins. Instead we need to use the code generation library
-[syntex](https://github.com/erickt/rust-syntex) for this:
-
-```toml
-[package]
-name = "serde_example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-build = "build.rs"
-
-[build-dependencies]
-serde_codegen = "*"
-syntex = "*"
-
-[dependencies]
-serde = "*"
-serde_json = "*"
-```
-
-`src/main.rs`:
+Serde bundles a high performance JSON serializer and deserializer,
+[serde::json](http://serde-rs.github.io/serde/serde/json/index.html),
+which comes with the helper functions
+[to_string](http://serde-rs.github.io/serde/serde/json/ser/fn.to_string.html)
+and
+[from_str](http://serde-rs.github.io/serde/serde/json/de/fn.from_str.html)
+that make it easy to go to and from JSON:
 
 ```rust
-extern crate serde;
-extern crate serde_json;
+use serde::json;
 
-include!(concat!(env!("OUT_DIR"), "/main.rs"));
+...
+
+let point = Point { x: 1, y: 2 };
+let serialized_point = json::to_string(&point).unwrap();
+
+println!("{}", serialized_point); // prints: {"x":1,"y":2}
+
+let deserialize_point: Point = json::from_str(&serialized_point).unwrap();
 ```
 
-`src/main.rs.in`:
+[serde::json](http://serde-rs.github.io/serde/serde/json/index.html) also
+supports a generic
+[Value](http://serde-rs.github.io/serde/serde/json/value/enum.Value.html)
+type, which can represent any JSON value. Also, any
+[Serialize](http://serde-rs.github.io/serde/serde/ser/trait.Serialize.html)
+and
+[Deserialize](http://serde-rs.github.io/serde/serde/de/trait.Deserialize.html)
+can be converted into a 
+[Value](http://serde-rs.github.io/serde/serde/json/value/enum.Value.html)
+with the methods
+[to_value](http://serde-rs.github.io/serde/serde/json/value/fn.to_value.html)
+and
+[from_value](http://serde-rs.github.io/serde/serde/json/value/fn.from_value.html):
 
 ```rust
-#[derive(Serialize, Deserialize, Debug)]
-struct Point {
-    x: i32,
-    y: i32,
-}
+let point = Point { x: 1, y: 2 };
+let point_value = json::to_value(&point).unwrap();
 
-fn main() {
-    let point = Point { x: 1, y: 2 };
-    let serialized = serde_json::to_string(&point).unwrap();
+println!("{}", point_value.find("x")); // prints: Some(1)
 
-    println!("{}", serialized);
-
-    let deserialized: Point = serde_json::from_str(&serialized_point).unwrap();
-
-    println!("{:?}", deserialized);
-}
+let deserialize_point: Point = json::from_value(point_value).unwrap();
 ```
 
-This also produces:
-
-```
-% cargo run
-{"x":1,"y":2}
-Point { x: 1, y: 2 }
-```
-
-While this works well with Stable Rust, be aware that the error locations
-currently are reported in the generated file instead of in the source file. You
-may find it easier to develop with Nightly Rust and `serde\_macros`, then
-deploy with Stable Rust and `serde_codegen`. It's possible to combine both
-approaches in one setup:
-
-`Cargo.toml`:
-
-```toml
-[package]
-name = "serde_example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-build = "build.rs"
-
-[features]
-default = ["serde_codegen"]
-nightly = ["serde_macros"]
-
-[build-dependencies]
-serde_codegen = { version = "*", optional = true }
-syntex = "*"
-
-[dependencies]
-serde = "*"
-serde_json = "*"
-serde_macros = { version = "*", optional = true }
-```
-
-`build.rs`:
-
-```rust
-#[cfg(not(feature = "serde_macros"))]
-mod inner {
-    extern crate syntex;
-    extern crate serde_codegen;
-
-    use std::env;
-    use std::path::Path;
-
-    pub fn main() {
-        let out_dir = env::var_os("OUT_DIR").unwrap();
-
-        let src = Path::new("src/main.rs.in");
-        let dst = Path::new(&out_dir).join("main.rs");
-
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
-    }
-}
-
-#[cfg(feature = "serde_macros")]
-mod inner {
-    pub fn main() {}
-}
-
-fn main() {
-    inner::main();
-}
-```
-
-`src/main.rs`:
-
-```rust
-#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))]
-#![cfg_attr(feature = "serde_macros", plugin(serde_macros))]
-
-extern crate serde;
-extern crate serde_json;
-
-#[cfg(feature = "serde_macros")]
-include!("main.rs.in");
-
-#[cfg(not(feature = "serde_macros"))]
-include!(concat!(env!("OUT_DIR"), "/main.rs"));
-```
-
-The `src/main.rs.in` is the same as before.
-
 Serialization without Macros
 ============================
 
@@ -306,7 +174,7 @@ impl<K, V, I> MapVisitor for MapIteratorVisitor<I>
 ```
 
 Serializing structs follow this same pattern. In fact, structs are represented
-as a named map. Its visitor uses a simple state machine to iterate through all
+as a named map. It's visitor uses a simple state machine to iterate through all
 the fields:
 
 ```rust
@@ -319,7 +187,7 @@ impl serde::Serialize for Point {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: serde::Serializer
     {
-        serializer.visit_struct("Point", PointMapVisitor {
+        serializer.visit_named_map("Point", PointMapVisitor {
             value: self,
             state: 0,
         })
@@ -338,11 +206,11 @@ impl<'a> serde::ser::MapVisitor for PointMapVisitor<'a> {
         match self.state {
             0 => {
                 self.state += 1;
-                Ok(Some(try!(serializer.visit_struct_elt("x", &self.value.x))))
+                Ok(Some(try!(serializer.visit_map_elt("x", &self.value.x))))
             }
             1 => {
                 self.state += 1;
-                Ok(Some(try!(serializer.visit_struct_elt("y", &self.value.y))))
+                Ok(Some(try!(serializer.visit_map_elt("y", &self.value.y))))
             }
             _ => {
                 Ok(None)
@@ -407,7 +275,7 @@ to generate an error for a few common error conditions. Here's how it could be u
     fn visit_string<E>(&mut self, _: String) -> Result<i32, E>
         where E: Error,
     {
-        Err(serde::de::Error::syntax("expect a string"))
+        Err(serde::de::Error::syntax_error())
     }
 
     ...
@@ -498,7 +366,7 @@ impl serde::Deserialize for PointField {
                 match value {
                     "x" => Ok(Field::X),
                     "y" => Ok(Field::Y),
-                    _ => Err(serde::de::Error::syntax("expected x or y")),
+                    _ => Err(serde::de::Error::syntax_error()),
                 }
             }
         }
@@ -515,7 +383,7 @@ impl serde::Deserialize for Point {
     fn deserialize<D>(deserializer: &mut D) -> Result<Point, D::Error>
         where D: serde::de::Deserializer
     {
-        deserializer.visit_struct("Point", PointVisitor)
+        deserializer.visit_named_map("Point", PointVisitor)
     }
 }
 
@@ -524,9 +392,7 @@ struct PointVisitor;
 impl serde::de::Visitor for PointVisitor {
     type Value = Point;
 
-    fn visit_struct<V>(&mut self,
-                       _fields: &[&str],
-                       mut visitor: V) -> Result<Point, V::Error>
+    fn visit_map<V>(&mut self, mut visitor: V) -> Result<Point, V::Error>
         where V: serde::de::MapVisitor
     {
         let mut x = None;
@@ -556,14 +422,3 @@ impl serde::de::Visitor for PointVisitor {
     }
 }
 ```
-
-Serialization Formats Using Serde
-=================================
-
-| Format      | Name                                               |
-| ------      | ----                                               |
-| Bincode     | [bincode](https://crates.io/crates/bincode)        |
-| JSON        | [serde\_json](https://crates.io/crates/serde_json) |
-| MessagePack | [rmp](https://crates.io/crates/rmp)                |
-| XML         | [serde\_xml](https://github.com/serde-rs/xml)      |
-| YAML        | [serde\_yaml](https://github.com/serde-rs/yaml/)   |

serde/Cargo.toml

@@ -1,17 +1,13 @@
 [package]
 name = "serde"
-version = "0.5.2"
+version = "0.4.2"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde-rs.github.io/serde/serde/serde/index.html"
+documentation = "http://serde-rs.github.io/serde/serde"
 readme = "../README.md"
-keywords = ["serde", "serialization"]
+keywords = ["serialization"]
 
 [dependencies]
 num = "*"
-
-[features]
-nightly = []
-

serde/src/de/impls.rs

@@ -1,15 +1,4 @@
-use std::borrow::Cow;
-use std::collections::{
-    BinaryHeap,
-    BTreeMap,
-    BTreeSet,
-    LinkedList,
-    HashMap,
-    HashSet,
-    VecDeque,
-};
-#[cfg(feature = "nightly")]
-use collections::enum_set::{CLike, EnumSet};
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::hash::Hash;
 use std::marker::PhantomData;
 use std::path;
@@ -19,21 +8,12 @@ use std::sync::Arc;
 
 use num::FromPrimitive;
 
-#[cfg(feature = "nightly")]
-use core::nonzero::{NonZero, Zeroable};
-
-#[cfg(feature = "nightly")]
-use std::num::Zero;
-
 use de::{
     Deserialize,
     Deserializer,
-    EnumVisitor,
     Error,
     MapVisitor,
     SeqVisitor,
-    Type,
-    VariantVisitor,
     Visitor,
 };
 
@@ -61,13 +41,13 @@ impl Deserialize for () {
     fn deserialize<D>(deserializer: &mut D) -> Result<(), D::Error>
         where D: Deserializer,
     {
-        deserializer.visit_unit(UnitVisitor)
+        deserializer.visit(UnitVisitor)
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-pub struct BoolVisitor;
+struct BoolVisitor;
 
 impl Visitor for BoolVisitor {
     type Value = bool;
@@ -84,7 +64,7 @@ impl Visitor for BoolVisitor {
         match s.trim() {
             "true" => Ok(true),
             "false" => Ok(false),
-            _ => Err(Error::type_mismatch(Type::Bool)),
+            _ => Err(Error::syntax_error()),
         }
     }
 }
@@ -93,21 +73,21 @@ impl Deserialize for bool {
     fn deserialize<D>(deserializer: &mut D) -> Result<bool, D::Error>
         where D: Deserializer,
     {
-        deserializer.visit_bool(BoolVisitor)
+        deserializer.visit(BoolVisitor)
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 macro_rules! impl_deserialize_num_method {
-    ($src_ty:ty, $method:ident, $from_method:ident, $ty:expr) => {
+    ($src_ty:ty, $method:ident, $from_method:ident) => {
         #[inline]
         fn $method<E>(&mut self, v: $src_ty) -> Result<T, E>
             where E: Error,
         {
             match FromPrimitive::$from_method(v) {
                 Some(v) => Ok(v),
-                None => Err(Error::type_mismatch($ty)),
+                None => Err(Error::syntax_error()),
             }
         }
     }
@@ -131,52 +111,52 @@ impl<
 > Visitor for PrimitiveVisitor<T> {
     type Value = T;
 
-    impl_deserialize_num_method!(isize, visit_isize, from_isize, Type::Isize);
-    impl_deserialize_num_method!(i8, visit_i8, from_i8, Type::I8);
-    impl_deserialize_num_method!(i16, visit_i16, from_i16, Type::I16);
-    impl_deserialize_num_method!(i32, visit_i32, from_i32, Type::I32);
-    impl_deserialize_num_method!(i64, visit_i64, from_i64, Type::I64);
-    impl_deserialize_num_method!(usize, visit_usize, from_usize, Type::Usize);
-    impl_deserialize_num_method!(u8, visit_u8, from_u8, Type::U8);
-    impl_deserialize_num_method!(u16, visit_u16, from_u16, Type::U16);
-    impl_deserialize_num_method!(u32, visit_u32, from_u32, Type::U32);
-    impl_deserialize_num_method!(u64, visit_u64, from_u64, Type::U64);
-    impl_deserialize_num_method!(f32, visit_f32, from_f32, Type::F32);
-    impl_deserialize_num_method!(f64, visit_f64, from_f64, Type::F64);
+    impl_deserialize_num_method!(isize, visit_isize, from_isize);
+    impl_deserialize_num_method!(i8, visit_i8, from_i8);
+    impl_deserialize_num_method!(i16, visit_i16, from_i16);
+    impl_deserialize_num_method!(i32, visit_i32, from_i32);
+    impl_deserialize_num_method!(i64, visit_i64, from_i64);
+    impl_deserialize_num_method!(usize, visit_usize, from_usize);
+    impl_deserialize_num_method!(u8, visit_u8, from_u8);
+    impl_deserialize_num_method!(u16, visit_u16, from_u16);
+    impl_deserialize_num_method!(u32, visit_u32, from_u32);
+    impl_deserialize_num_method!(u64, visit_u64, from_u64);
+    impl_deserialize_num_method!(f32, visit_f32, from_f32);
+    impl_deserialize_num_method!(f64, visit_f64, from_f64);
 
     #[inline]
     fn visit_str<E>(&mut self, v: &str) -> Result<T, E>
         where E: Error,
     {
-        str::FromStr::from_str(v.trim()).or(Err(Error::type_mismatch(Type::Str)))
+        str::FromStr::from_str(v.trim()).or(Err(Error::syntax_error()))
     }
 }
 
 macro_rules! impl_deserialize_num {
-    ($ty:ty, $method:ident) => {
+    ($ty:ty) => {
         impl Deserialize for $ty {
             #[inline]
             fn deserialize<D>(deserializer: &mut D) -> Result<$ty, D::Error>
                 where D: Deserializer,
             {
-                deserializer.$method(PrimitiveVisitor::new())
+                deserializer.visit(PrimitiveVisitor::new())
             }
         }
     }
 }
 
-impl_deserialize_num!(isize, visit_isize);
-impl_deserialize_num!(i8, visit_i8);
-impl_deserialize_num!(i16, visit_i16);
-impl_deserialize_num!(i32, visit_i32);
-impl_deserialize_num!(i64, visit_i64);
-impl_deserialize_num!(usize, visit_usize);
-impl_deserialize_num!(u8, visit_u8);
-impl_deserialize_num!(u16, visit_u16);
-impl_deserialize_num!(u32, visit_u32);
-impl_deserialize_num!(u64, visit_u64);
-impl_deserialize_num!(f32, visit_f32);
-impl_deserialize_num!(f64, visit_f64);
+impl_deserialize_num!(isize);
+impl_deserialize_num!(i8);
+impl_deserialize_num!(i16);
+impl_deserialize_num!(i32);
+impl_deserialize_num!(i64);
+impl_deserialize_num!(usize);
+impl_deserialize_num!(u8);
+impl_deserialize_num!(u16);
+impl_deserialize_num!(u32);
+impl_deserialize_num!(u64);
+impl_deserialize_num!(f32);
+impl_deserialize_num!(f64);
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -199,12 +179,12 @@ impl Visitor for CharVisitor {
         let mut iter = v.chars();
         if let Some(v) = iter.next() {
             if iter.next().is_some() {
-                Err(Error::type_mismatch(Type::Char))
+                Err(Error::syntax_error())
             } else {
                 Ok(v)
             }
         } else {
-            Err(Error::end_of_stream())
+            Err(Error::end_of_stream_error())
         }
     }
 }
@@ -214,7 +194,7 @@ impl Deserialize for char {
     fn deserialize<D>(deserializer: &mut D) -> Result<char, D::Error>
         where D: Deserializer,
     {
-        deserializer.visit_char(CharVisitor)
+        deserializer.visit(CharVisitor)
     }
 }
 
@@ -242,7 +222,7 @@ impl Visitor for StringVisitor {
     {
         match str::from_utf8(v) {
             Ok(s) => Ok(s.to_string()),
-            Err(_) => Err(Error::type_mismatch(Type::String)),
+            Err(_) => Err(Error::syntax_error()),
         }
     }
 
@@ -251,7 +231,7 @@ impl Visitor for StringVisitor {
     {
         match String::from_utf8(v) {
             Ok(s) => Ok(s),
-            Err(_) => Err(Error::type_mismatch(Type::String)),
+            Err(_) => Err(Error::syntax_error()),
         }
     }
 }
@@ -260,7 +240,7 @@ impl Deserialize for String {
     fn deserialize<D>(deserializer: &mut D) -> Result<String, D::Error>
         where D: Deserializer,
     {
-        deserializer.visit_string(StringVisitor)
+        deserializer.visit(StringVisitor)
     }
 }
 
@@ -300,131 +280,159 @@ impl<T> Deserialize for Option<T> where T: Deserialize {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-macro_rules! set_impl {
-    (
-        $ty:ty,
-        < $($constraints:ident),* >,
-        $visitor_name:ident,
-        $visitor:ident,
-        $ctor:expr,
-        $with_capacity:expr,
-        $insert:expr
-    ) => {
-        pub struct $visitor_name<T> {
-            marker: PhantomData<T>,
-        }
+pub struct BTreeSetVisitor<T> {
+    marker: PhantomData<T>,
+}
 
-        impl<T> $visitor_name<T> {
-            pub fn new() -> Self {
-                $visitor_name {
-                    marker: PhantomData,
-                }
-            }
-        }
-
-        impl<T> Visitor for $visitor_name<T>
-            where T: $($constraints +)*,
-        {
-            type Value = $ty;
-
-            #[inline]
-            fn visit_unit<E>(&mut self) -> Result<$ty, E>
-                where E: Error,
-            {
-                Ok($ctor)
-            }
-
-            #[inline]
-            fn visit_seq<V>(&mut self, mut $visitor: V) -> Result<$ty, V::Error>
-                where V: SeqVisitor,
-            {
-                let mut values = $with_capacity;
-
-                while let Some(value) = try!($visitor.visit()) {
-                    $insert(&mut values, value);
-                }
-
-                try!($visitor.end());
-
-                Ok(values)
-            }
-        }
-
-        impl<T> Deserialize for $ty
-            where T: $($constraints +)*,
-        {
-            fn deserialize<D>(deserializer: &mut D) -> Result<$ty, D::Error>
-                where D: Deserializer,
-            {
-                deserializer.visit_seq($visitor_name::new())
-            }
+impl<T> BTreeSetVisitor<T> {
+    pub fn new() -> Self {
+        BTreeSetVisitor {
+            marker: PhantomData,
         }
     }
 }
 
-set_impl!(
-    BinaryHeap<T>,
-    <Deserialize, Ord>,
-    BinaryHeapVisitor,
-    visitor,
-    BinaryHeap::new(),
-    BinaryHeap::with_capacity(visitor.size_hint().0),
-    BinaryHeap::push);
+impl<T> Visitor for BTreeSetVisitor<T>
+    where T: Deserialize + Eq + Ord,
+{
+    type Value = BTreeSet<T>;
 
-set_impl!(
-    BTreeSet<T>,
-    <Deserialize, Eq, Ord>,
-    BTreeSetVisitor,
-    visitor,
-    BTreeSet::new(),
-    BTreeSet::new(),
-    BTreeSet::insert);
+    #[inline]
+    fn visit_unit<E>(&mut self) -> Result<BTreeSet<T>, E>
+        where E: Error,
+    {
+        Ok(BTreeSet::new())
+    }
 
-#[cfg(feature = "nightly")]
-set_impl!(
-    EnumSet<T>,
-    <Deserialize, CLike>,
-    EnumSetVisitor,
-    visitor,
-    EnumSet::new(),
-    EnumSet::new(),
-    EnumSet::insert);
+    #[inline]
+    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<BTreeSet<T>, V::Error>
+        where V: SeqVisitor,
+    {
+        let mut values = BTreeSet::new();
 
-set_impl!(
-    LinkedList<T>,
-    <Deserialize>,
-    LinkedListVisitor,
-    visitor,
-    LinkedList::new(),
-    LinkedList::new(),
-    LinkedList::push_back);
+        while let Some(value) = try!(visitor.visit()) {
+            values.insert(value);
+        }
 
-set_impl!(
-    HashSet<T>,
-    <Deserialize, Eq, Hash>,
-    HashSetVisitor,
-    visitor,
-    HashSet::new(),
-    HashSet::with_capacity(visitor.size_hint().0),
-    HashSet::insert);
+        try!(visitor.end());
 
-set_impl!(
-    Vec<T>,
-    <Deserialize>,
-    VecVisitor,
-    visitor,
-    Vec::new(),
-    Vec::with_capacity(visitor.size_hint().0),
-    Vec::push);
+        Ok(values)
+    }
+}
 
-set_impl!(
-    VecDeque<T>,
-    <Deserialize>,
-    VecDequeVisitor,
-    visitor,
-    VecDeque::new(),
-    VecDeque::with_capacity(visitor.size_hint().0),
-    VecDeque::push_back);
+impl<T> Deserialize for BTreeSet<T>
+    where T: Deserialize + Eq + Ord,
+{
+    fn deserialize<D>(deserializer: &mut D) -> Result<BTreeSet<T>, D::Error>
+        where D: Deserializer,
+    {
+        deserializer.visit(BTreeSetVisitor::new())
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+pub struct HashSetVisitor<T> {
+    marker: PhantomData<T>,
+}
+
+impl<T> HashSetVisitor<T> {
+    pub fn new() -> Self {
+        HashSetVisitor {
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<T> Visitor for HashSetVisitor<T>
+    where T: Deserialize + Eq + Hash,
+{
+    type Value = HashSet<T>;
+
+    #[inline]
+    fn visit_unit<E>(&mut self) -> Result<HashSet<T>, E>
+        where E: Error,
+    {
+        Ok(HashSet::new())
+    }
+
+    #[inline]
+    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<HashSet<T>, V::Error>
+        where V: SeqVisitor,
+    {
+        let (len, _) = visitor.size_hint();
+        let mut values = HashSet::with_capacity(len);
+
+        while let Some(value) = try!(visitor.visit()) {
+            values.insert(value);
+        }
+
+        try!(visitor.end());
+
+        Ok(values)
+    }
+}
+
+impl<T> Deserialize for HashSet<T>
+    where T: Deserialize + Eq + Hash,
+{
+    fn deserialize<D>(deserializer: &mut D) -> Result<HashSet<T>, D::Error>
+        where D: Deserializer,
+    {
+        deserializer.visit(HashSetVisitor::new())
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+pub struct VecVisitor<T> {
+    marker: PhantomData<T>,
+}
+
+impl<T> VecVisitor<T> {
+    pub fn new() -> Self {
+        VecVisitor {
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<T> Visitor for VecVisitor<T> where T: Deserialize {
+    type Value = Vec<T>;
+
+    #[inline]
+    fn visit_unit<E>(&mut self) -> Result<Vec<T>, E>
+        where E: Error,
+    {
+        Ok(Vec::new())
+    }
+
+    #[inline]
+    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<Vec<T>, V::Error>
+        where V: SeqVisitor,
+    {
+        let (len, _) = visitor.size_hint();
+        let mut values = Vec::with_capacity(len);
+
+        while let Some(value) = try!(visitor.visit()) {
+            values.push(value);
+        }
+
+        try!(visitor.end());
+
+        Ok(values)
+    }
+}
+
+impl<T> Deserialize for Vec<T>
+    where T: Deserialize,
+{
+    fn deserialize<D>(deserializer: &mut D) -> Result<Vec<T>, D::Error>
+        where D: Deserializer,
+    {
+        deserializer.visit_seq(VecVisitor::new())
+    }
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -465,7 +473,7 @@ impl<T> Deserialize for [T; 0]
     fn deserialize<D>(deserializer: &mut D) -> Result<[T; 0], D::Error>
         where D: Deserializer,
     {
-        deserializer.visit_seq(ArrayVisitor0::new())
+        deserializer.visit(ArrayVisitor0::new())
     }
 }
 
@@ -494,7 +502,7 @@ macro_rules! array_impls {
                     $(
                         let $name = match try!(visitor.visit()) {
                             Some(val) => val,
-                            None => { return Err(Error::end_of_stream()); }
+                            None => { return Err(Error::end_of_stream_error()); }
                         };
                     )+;
 
@@ -510,7 +518,7 @@ macro_rules! array_impls {
                 fn deserialize<D>(deserializer: &mut D) -> Result<[T; $len], D::Error>
                     where D: Deserializer,
                 {
-                    deserializer.visit_seq($visitor::new())
+                    deserializer.visit($visitor::new())
                 }
             }
         )+
@@ -564,21 +572,12 @@ array_impls! {
 
 macro_rules! tuple_impls {
     () => {};
-    ($($len:expr => $visitor:ident => ($($name:ident),+),)+) => {
+    ($($visitor:ident => ($($name:ident),+),)+) => {
         $(
-            pub struct $visitor<$($name,)+> {
+            struct $visitor<$($name,)+> {
                 marker: PhantomData<($($name,)+)>,
             }
 
-            impl<
-                $($name: Deserialize,)+
-            > $visitor<$($name,)+> {
-                pub fn new() -> Self {
-                    $visitor { marker: PhantomData }
-                }
-            }
-
-
             impl<
                 $($name: Deserialize,)+
             > Visitor for $visitor<$($name,)+> {
@@ -592,7 +591,7 @@ macro_rules! tuple_impls {
                     $(
                         let $name = match try!(visitor.visit()) {
                             Some(value) => value,
-                            None => { return Err(Error::end_of_stream()); }
+                            None => { return Err(Error::end_of_stream_error()); }
                         };
                      )+;
 
@@ -609,7 +608,7 @@ macro_rules! tuple_impls {
                 fn deserialize<D>(deserializer: &mut D) -> Result<($($name,)+), D::Error>
                     where D: Deserializer,
                 {
-                    deserializer.visit_tuple($len, $visitor::new())
+                    deserializer.visit_seq($visitor { marker: PhantomData })
                 }
             }
         )+
@@ -617,103 +616,187 @@ macro_rules! tuple_impls {
 }
 
 tuple_impls! {
-    1 => TupleVisitor1 => (T0),
-    2 => TupleVisitor2 => (T0, T1),
-    3 => TupleVisitor3 => (T0, T1, T2),
-    4 => TupleVisitor4 => (T0, T1, T2, T3),
-    5 => TupleVisitor5 => (T0, T1, T2, T3, T4),
-    6 => TupleVisitor6 => (T0, T1, T2, T3, T4, T5),
-    7 => TupleVisitor7 => (T0, T1, T2, T3, T4, T5, T6),
-    8 => TupleVisitor8 => (T0, T1, T2, T3, T4, T5, T6, T7),
-    9 => TupleVisitor9 => (T0, T1, T2, T3, T4, T5, T6, T7, T8),
-    10 => TupleVisitor10 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9),
-    11 => TupleVisitor11 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10),
-    12 => TupleVisitor12 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11),
+    TupleVisitor1 => (T0),
+    TupleVisitor2 => (T0, T1),
+    TupleVisitor3 => (T0, T1, T2),
+    TupleVisitor4 => (T0, T1, T2, T3),
+    TupleVisitor5 => (T0, T1, T2, T3, T4),
+    TupleVisitor6 => (T0, T1, T2, T3, T4, T5),
+    TupleVisitor7 => (T0, T1, T2, T3, T4, T5, T6),
+    TupleVisitor8 => (T0, T1, T2, T3, T4, T5, T6, T7),
+    TupleVisitor9 => (T0, T1, T2, T3, T4, T5, T6, T7, T8),
+    TupleVisitor10 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9),
+    TupleVisitor11 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10),
+    TupleVisitor12 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11),
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-macro_rules! map_impl {
-    (
-        $ty:ty,
-        < $($constraints:ident),* >,
-        $visitor_name:ident,
-        $visitor:ident,
-        $ctor:expr,
-        $with_capacity:expr,
-        $insert:expr
-    ) => {
-        pub struct $visitor_name<K, V> {
-            marker: PhantomData<$ty>,
-        }
+pub struct BTreeMapVisitor<K, V> {
+    marker: PhantomData<BTreeMap<K, V>>,
+}
 
-        impl<K, V> $visitor_name<K, V> {
-            pub fn new() -> Self {
-                $visitor_name {
-                    marker: PhantomData,
-                }
-            }
-        }
-
-        impl<K, V> Visitor for $visitor_name<K, V>
-            where K: $($constraints +)*,
-                  V: Deserialize,
-        {
-            type Value = $ty;
-
-            #[inline]
-            fn visit_unit<E>(&mut self) -> Result<$ty, E>
-                where E: Error,
-            {
-                Ok($ctor)
-            }
-
-            #[inline]
-            fn visit_map<Visitor>(&mut self, mut $visitor: Visitor) -> Result<$ty, Visitor::Error>
-                where Visitor: MapVisitor,
-            {
-                let mut values = $with_capacity;
-
-                while let Some((key, value)) = try!($visitor.visit()) {
-                    $insert(&mut values, key, value);
-                }
-
-                try!($visitor.end());
-
-                Ok(values)
-            }
-        }
-
-        impl<K, V> Deserialize for $ty
-            where K: $($constraints +)*,
-                  V: Deserialize,
-        {
-            fn deserialize<D>(deserializer: &mut D) -> Result<$ty, D::Error>
-                where D: Deserializer,
-            {
-                deserializer.visit_map($visitor_name::new())
-            }
+impl<K, V> BTreeMapVisitor<K, V> {
+    #[inline]
+    pub fn new() -> Self {
+        BTreeMapVisitor {
+            marker: PhantomData,
         }
     }
 }
 
-map_impl!(
-    BTreeMap<K, V>,
-    <Deserialize, Eq, Ord>,
-    BTreeMapVisitor,
-    visitor,
-    BTreeMap::new(),
-    BTreeMap::new(),
-    BTreeMap::insert);
+impl<K, V> Visitor for BTreeMapVisitor<K, V>
+    where K: Deserialize + Ord,
+          V: Deserialize
+{
+    type Value = BTreeMap<K, V>;
 
-map_impl!(
-    HashMap<K, V>,
-    <Deserialize, Eq, Hash>,
-    HashMapVisitor,
-    visitor,
-    HashMap::new(),
-    HashMap::with_capacity(visitor.size_hint().0),
-    HashMap::insert);
+    #[inline]
+    fn visit_unit<E>(&mut self) -> Result<BTreeMap<K, V>, E>
+        where E: Error,
+    {
+        Ok(BTreeMap::new())
+    }
+
+    #[inline]
+    fn visit_map<Visitor>(&mut self, mut visitor: Visitor) -> Result<BTreeMap<K, V>, Visitor::Error>
+        where Visitor: MapVisitor,
+    {
+        let mut values = BTreeMap::new();
+
+        while let Some((key, value)) = try!(visitor.visit()) {
+            values.insert(key, value);
+        }
+
+        try!(visitor.end());
+
+        Ok(values)
+    }
+}
+
+impl<K, V> Deserialize for BTreeMap<K, V>
+    where K: Deserialize + Eq + Ord,
+          V: Deserialize,
+{
+    fn deserialize<D>(deserializer: &mut D) -> Result<BTreeMap<K, V>, D::Error>
+        where D: Deserializer,
+    {
+        deserializer.visit(BTreeMapVisitor::new())
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+pub struct HashMapVisitor<K, V> {
+    marker: PhantomData<HashMap<K, V>>,
+}
+
+impl<K, V> HashMapVisitor<K, V> {
+    #[inline]
+    pub fn new() -> Self {
+        HashMapVisitor {
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<K, V> Visitor for HashMapVisitor<K, V>
+    where K: Deserialize + Eq + Hash,
+          V: Deserialize,
+{
+    type Value = HashMap<K, V>;
+
+    #[inline]
+    fn visit_unit<E>(&mut self) -> Result<HashMap<K, V>, E>
+        where E: Error,
+    {
+        Ok(HashMap::new())
+    }
+
+    #[inline]
+    fn visit_map<V_>(&mut self, mut visitor: V_) -> Result<HashMap<K, V>, V_::Error>
+        where V_: MapVisitor,
+    {
+        let (len, _) = visitor.size_hint();
+        let mut values = HashMap::with_capacity(len);
+
+        while let Some((key, value)) = try!(visitor.visit()) {
+            values.insert(key, value);
+        }
+
+        try!(visitor.end());
+
+        Ok(values)
+    }
+}
+
+impl<K, V> Deserialize for HashMap<K, V>
+    where K: Deserialize + Eq + Hash,
+          V: Deserialize,
+{
+    fn deserialize<D>(deserializer: &mut D) -> Result<HashMap<K, V>, D::Error>
+        where D: Deserializer,
+    {
+        deserializer.visit(HashMapVisitor::new())
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// FIXME: `VecMap` is unstable.
+/*
+pub struct VecMapVisitor<V> {
+    marker: PhantomData<VecMap<V>>,
+}
+
+impl<V> VecMapVisitor<V> {
+    #[inline]
+    pub fn new() -> Self {
+        VecMapVisitor {
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<V> Visitor for VecMapVisitor<V>
+    where V: Deserialize,
+{
+    type Value = VecMap<V>;
+
+    #[inline]
+    fn visit_unit<E>(&mut self) -> Result<VecMap<V>, E>
+        where E: Error,
+    {
+        Ok(VecMap::new())
+    }
+
+    #[inline]
+    fn visit_map<V_>(&mut self, mut visitor: V_) -> Result<VecMap<V>, V_::Error>
+        where V_: MapVisitor,
+    {
+        let (len, _) = visitor.size_hint();
+        let mut values = VecMap::with_capacity(len);
+
+        while let Some((key, value)) = try!(visitor.visit()) {
+            values.insert(key, value);
+        }
+
+        try!(visitor.end());
+
+        Ok(values)
+    }
+}
+
+impl<V> Deserialize for VecMap<V>
+    where V: Deserialize,
+{
+    fn deserialize<D>(deserializer: &mut D) -> Result<VecMap<V>, D::Error>
+        where D: Deserializer,
+    {
+        deserializer.visit(VecMapVisitor::new())
+    }
+}
+*/
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -771,113 +854,3 @@ impl<T: Deserialize> Deserialize for Rc<T> {
         Ok(Rc::new(val))
     }
 }
-
-impl<'a, T: ?Sized> Deserialize for Cow<'a, T> where T: ToOwned, T::Owned: Deserialize, {
-    #[inline]
-    fn deserialize<D>(deserializer: &mut D) -> Result<Cow<'a, T>, D::Error>
-        where D: Deserializer,
-    {
-        let val = try!(Deserialize::deserialize(deserializer));
-        Ok(Cow::Owned(val))
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#[cfg(feature = "nightly")]
-impl<T> Deserialize for NonZero<T> where T: Deserialize + PartialEq + Zeroable + Zero {
-    fn deserialize<D>(deserializer: &mut D) -> Result<NonZero<T>, D::Error> where D: Deserializer {
-        let value = try!(Deserialize::deserialize(deserializer));
-        if value == Zero::zero() {
-            return Err(Error::syntax("expected a non-zero value"))
-        }
-        unsafe {
-            Ok(NonZero::new(value))
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-impl<T, E> Deserialize for Result<T, E> where T: Deserialize, E: Deserialize {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Result<T, E>, D::Error>
-                      where D: Deserializer {
-        enum Field {
-            Ok,
-            Err,
-        }
-
-        impl Deserialize for Field {
-            #[inline]
-            fn deserialize<D>(deserializer: &mut D) -> Result<Field, D::Error>
-                where D: Deserializer
-            {
-                struct FieldVisitor;
-
-                impl ::de::Visitor for FieldVisitor {
-                    type Value = Field;
-
-                    fn visit_usize<E>(&mut self, value: usize) -> Result<Field, E> where E: Error {
-                        match value {
-                            0 => Ok(Field::Ok),
-                            1 => Ok(Field::Err),
-                            _ => Err(Error::unknown_field(&value.to_string())),
-                        }
-                    }
-
-                    fn visit_str<E>(&mut self, value: &str) -> Result<Field, E> where E: Error {
-                        match value {
-                            "Ok" => Ok(Field::Ok),
-                            "Err" => Ok(Field::Err),
-                            _ => Err(Error::unknown_field(value)),
-                        }
-                    }
-
-                    fn visit_bytes<E>(&mut self, value: &[u8]) -> Result<Field, E> where E: Error {
-                        match value {
-                            b"Ok" => Ok(Field::Ok),
-                            b"Err" => Ok(Field::Err),
-                            _ => {
-                                match str::from_utf8(value) {
-                                    Ok(value) => Err(Error::unknown_field(value)),
-                                    Err(_) => Err(Error::type_mismatch(Type::String)),
-                                }
-                            }
-                        }
-                    }
-                }
-
-                deserializer.visit(FieldVisitor)
-            }
-        }
-
-        struct Visitor<T, E>(PhantomData<Result<T, E>>);
-
-        impl<T, E> EnumVisitor for Visitor<T, E>
-            where T: Deserialize,
-                  E: Deserialize
-        {
-            type Value = Result<T, E>;
-
-            fn visit<V>(&mut self, mut visitor: V) -> Result<Result<T, E>, V::Error>
-                where V: VariantVisitor
-            {
-                match try!(visitor.visit_variant()) {
-                    Field::Ok => {
-                        let value = try!(visitor.visit_newtype());
-                        Ok(Ok(value))
-                    }
-                    Field::Err => {
-                        let value = try!(visitor.visit_newtype());
-                        Ok(Err(value))
-                    }
-                }
-            }
-        }
-
-        const VARIANTS: &'static [&'static str] = &["Ok", "Err"];
-
-        deserializer.visit_enum("Result", VARIANTS, Visitor(PhantomData))
-    }
-}

serde/src/de/mod.rs

@@ -5,65 +5,14 @@ pub mod value;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// `Error` is a trait that allows a `Deserialize` to generically create a
-/// `Deserializer` error.
-pub trait Error: Sized {
-    /// Raised when there is general error when deserializing a type.
-    fn syntax(msg: &str) -> Self;
+pub trait Error {
+    fn syntax_error() -> Self;
 
-    /// Raised when a fixed sized sequence or map was passed in the wrong amount of arguments.
-    fn length_mismatch(_len: usize) -> Self {
-        Error::syntax("incorrect length")
-    }
+    fn end_of_stream_error() -> Self;
 
-    /// Raised when a `Deserialize` was passed an incorrect type.
-    fn type_mismatch(_type: Type) -> Self {
-        Error::syntax("incorrect type")
-    }
+    fn unknown_field_error(field: &str) -> Self;
 
-    /// Raised when a `Deserialize` type unexpectedly hit the end of the stream.
-    fn end_of_stream() -> Self;
-
-    /// Raised when a `Deserialize` struct type received an unexpected struct field.
-    fn unknown_field(field: &str) -> Self;
-
-    /// Raised when a `Deserialize` struct type did not receive a field.
-    fn missing_field(field: &'static str) -> Self;
-}
-
-/// `Type` represents all the primitive types that can be deserialized. This is used by
-/// `Error::kind_mismatch`.
-pub enum Type {
-    Bool,
-    Usize,
-    U8,
-    U16,
-    U32,
-    U64,
-    Isize,
-    I8,
-    I16,
-    I32,
-    I64,
-    F32,
-    F64,
-    Char,
-    Str,
-    String,
-    Unit,
-    Option,
-    Seq,
-    Map,
-    UnitStruct,
-    NewtypeStruct,
-    TupleStruct,
-    Struct,
-    Tuple,
-    Enum,
-    StructVariant,
-    TupleVariant,
-    UnitVariant,
-    Bytes,
+    fn missing_field_error(field: &'static str) -> Self;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -76,164 +25,18 @@ pub trait Deserialize {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// `Deserializer` is a trait that can deserialize values by threading a `Visitor` trait through a
-/// value. It supports two entry point styles which enables different kinds of deserialization.
-///
-/// 1) The `visit` method. File formats like JSON embed the type of it's construct in it's file
-///    format. This allows the `Deserializer` to deserialize into a generic type like
-///    `json::Value`, which can represent all JSON types.
-///
-/// 2) The `visit_*` methods. File formats like bincode do not embed in it's format how to decode
-///    it's values. It relies instead on the `Deserialize` type to hint to the `Deserializer` with
-///    the `visit_*` methods how it should parse the next value. One downside though to only
-///    supporting the `visit_*` types is that it does not allow for deserializing into a generic
-///    `json::Value`-esque type.
+/// `Deserializer` is an abstract trait that can deserialize values into a `Visitor`.
 pub trait Deserializer {
     type Error: Error;
 
-    /// This method walks a visitor through a value as it is being deserialized.
+    /// The `visit` method walks a visitor through a value as it is being deserialized.
     fn visit<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
 
-    /// This method hints that the `Deserialize` type is expecting a `bool` value.
-    #[inline]
-    fn visit_bool<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `usize` value.
-    #[inline]
-    fn visit_usize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_u64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `u8` value.
-    #[inline]
-    fn visit_u8<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_u64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `u16` value.
-    #[inline]
-    fn visit_u16<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_u64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `u32` value.
-    #[inline]
-    fn visit_u32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_u64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `u64` value.
-    #[inline]
-    fn visit_u64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `isize` value.
-    #[inline]
-    fn visit_isize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_i64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `i8` value.
-    #[inline]
-    fn visit_i8<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_i64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `i16` value.
-    #[inline]
-    fn visit_i16<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_i64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `i32` value.
-    #[inline]
-    fn visit_i32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_i64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `i64` value.
-    #[inline]
-    fn visit_i64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting a `f32` value.
-    #[inline]
-    fn visit_f32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_f64(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting a `f64` value.
-    #[inline]
-    fn visit_f64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting a `char` value.
-    #[inline]
-    fn visit_char<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting a `&str` value.
-    #[inline]
-    fn visit_str<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting a `String` value.
-    #[inline]
-    fn visit_string<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_str(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `unit` value.
-    #[inline]
-    fn visit_unit<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an `Option` value. This allows
-    /// deserializers that encode an optional value as a nullable value to convert the null value
-    /// into a `None`, and a regular value as `Some(value)`.
+    /// The `visit_option` method allows a `Deserialize` type to inform the `Deserializer` that
+    /// it's expecting an optional value. This allows deserializers that encode an optional value
+    /// as a nullable value to convert the null value into a `None`, and a regular value as
+    /// `Some(value)`.
     #[inline]
     fn visit_option<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
@@ -241,8 +44,9 @@ pub trait Deserializer {
         self.visit(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting a sequence value. This allows
-    /// deserializers to parse sequences that aren't tagged as sequences.
+    /// The `visit_seq` method allows a `Deserialize` type to inform the `Deserializer` that it's
+    /// expecting a sequence of values. This allows deserializers to parse sequences that aren't
+    /// tagged as sequences.
     #[inline]
     fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
@@ -250,8 +54,9 @@ pub trait Deserializer {
         self.visit(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting a map of values. This allows
-    /// deserializers to parse sequences that aren't tagged as maps.
+    /// The `visit_map` method allows a `Deserialize` type to inform the `Deserializer` that it's
+    /// expecting a map of values. This allows deserializers to parse sequences that aren't tagged
+    /// as maps.
     #[inline]
     fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
@@ -259,82 +64,54 @@ pub trait Deserializer {
         self.visit(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting a unit struct. This allows
-    /// deserializers to a unit struct that aren't tagged as a unit struct.
+    /// The `visit_named_unit` method allows a `Deserialize` type to inform the `Deserializer` that
+    /// it's expecting a named unit. This allows deserializers to a named unit that aren't tagged
+    /// as a named unit.
     #[inline]
-    fn visit_unit_struct<V>(&mut self,
-                            _name: &'static str,
-                            visitor: V) -> Result<V::Value, Self::Error>
+    fn visit_named_unit<V>(&mut self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
     {
-        self.visit_unit(visitor)
+        self.visit(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting a newtype struct. This allows
-    /// deserializers to a newtype struct that aren't tagged as a newtype struct.
+    /// The `visit_named_seq` method allows a `Deserialize` type to inform the `Deserializer` that
+    /// it's expecting a named sequence of values. This allows deserializers to parse sequences
+    /// that aren't tagged as sequences.
     #[inline]
-    fn visit_newtype_struct<V>(&mut self,
-                               name: &'static str,
-                               visitor: V) -> Result<V::Value, Self::Error>
+    fn visit_named_seq<V>(&mut self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
     {
-        self.visit_tuple_struct(name, 1, visitor)
+        self.visit_seq(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting a tuple struct. This allows
-    /// deserializers to parse sequences that aren't tagged as sequences.
+    /// The `visit_named_map` method allows a `Deserialize` type to inform the `Deserializer` that
+    /// it's expecting a map of values. This allows deserializers to parse sequences that aren't
+    /// tagged as maps.
     #[inline]
-    fn visit_tuple_struct<V>(&mut self,
-                             _name: &'static str,
-                             len: usize,
-                             visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_tuple(len, visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting a struct. This allows
-    /// deserializers to parse sequences that aren't tagged as maps.
-    #[inline]
-    fn visit_struct<V>(&mut self,
-                       _name: &'static str,
-                       _fields: &'static [&'static str],
-                       visitor: V) -> Result<V::Value, Self::Error>
+    fn visit_named_map<V>(&mut self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
     {
         self.visit_map(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting a tuple value. This allows
-    /// deserializers that provide a custom tuple serialization to properly deserialize the type.
+    /// The `visit_enum` method allows a `Deserialize` type to inform the `Deserializer` that it's
+    /// expecting an enum value. This allows deserializers that provide a custom enumeration
+    /// serialization to properly deserialize the type.
     #[inline]
-    fn visit_tuple<V>(&mut self, _len: usize, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_seq(visitor)
-    }
-
-    /// This method hints that the `Deserialize` type is expecting an enum value. This allows
-    /// deserializers that provide a custom enumeration serialization to properly deserialize the
-    /// type.
-    #[inline]
-    fn visit_enum<V>(&mut self,
-                     _enum: &'static str,
-                     _variants: &'static [&'static str],
-                     _visitor: V) -> Result<V::Value, Self::Error>
+    fn visit_enum<V>(&mut self, _enum: &str, _visitor: V) -> Result<V::Value, Self::Error>
         where V: EnumVisitor,
     {
-        Err(Error::syntax("expected an enum"))
+        Err(Error::syntax_error())
     }
 
-    /// This method hints that the `Deserialize` type is expecting a `Vec<u8>`. This allows
-    /// deserializers that provide a custom byte vector serialization to properly deserialize the
-    /// type.
+    /// The `visit_bytes` method allows a `Deserialize` type to inform the `Deserializer` that it's
+    /// expecting a `Vec<u8>`. This allows deserializers that provide a custom byte vector
+    /// serialization to properly deserialize the type.
     #[inline]
     fn visit_bytes<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
     {
-        self.visit_seq(visitor)
+        self.visit(visitor)
     }
 
     /// Specify a format string for the deserializer.
@@ -355,7 +132,7 @@ pub trait Visitor {
     fn visit_bool<E>(&mut self, _v: bool) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Bool))
+        Err(Error::syntax_error())
     }
 
     fn visit_isize<E>(&mut self, v: isize) -> Result<Self::Value, E>
@@ -385,7 +162,7 @@ pub trait Visitor {
     fn visit_i64<E>(&mut self, _v: i64) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::I64))
+        Err(Error::syntax_error())
     }
 
     fn visit_usize<E>(&mut self, v: usize) -> Result<Self::Value, E>
@@ -415,7 +192,7 @@ pub trait Visitor {
     fn visit_u64<E>(&mut self, _v: u64) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::U64))
+        Err(Error::syntax_error())
     }
 
     fn visit_f32<E>(&mut self, v: f32) -> Result<Self::Value, E>
@@ -427,7 +204,7 @@ pub trait Visitor {
     fn visit_f64<E>(&mut self, _v: f64) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::F64))
+        Err(Error::syntax_error())
     }
 
     #[inline]
@@ -442,7 +219,7 @@ pub trait Visitor {
     fn visit_str<E>(&mut self, _v: &str) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Str))
+        Err(Error::syntax_error())
     }
 
     #[inline]
@@ -455,11 +232,11 @@ pub trait Visitor {
     fn visit_unit<E>(&mut self) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Unit))
+        Err(Error::syntax_error())
     }
 
     #[inline]
-    fn visit_unit_struct<E>(&mut self, _name: &'static str) -> Result<Self::Value, E>
+    fn visit_named_unit<E>(&mut self, _name: &str) -> Result<Self::Value, E>
         where E: Error,
     {
         self.visit_unit()
@@ -468,37 +245,31 @@ pub trait Visitor {
     fn visit_none<E>(&mut self) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Option))
+        Err(Error::syntax_error())
     }
 
     fn visit_some<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
         where D: Deserializer,
     {
-        Err(Error::type_mismatch(Type::Option))
-    }
-
-    fn visit_newtype_struct<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
-        where D: Deserializer,
-    {
-        Err(Error::type_mismatch(Type::NewtypeStruct))
+        Err(Error::syntax_error())
     }
 
     fn visit_seq<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
         where V: SeqVisitor,
     {
-        Err(Error::type_mismatch(Type::Seq))
+        Err(Error::syntax_error())
     }
 
     fn visit_map<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
         where V: MapVisitor,
     {
-        Err(Error::type_mismatch(Type::Map))
+        Err(Error::syntax_error())
     }
 
     fn visit_bytes<E>(&mut self, _v: &[u8]) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Bytes))
+        Err(Error::syntax_error())
     }
 
     fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<Self::Value, E>
@@ -580,7 +351,7 @@ pub trait MapVisitor {
     fn missing_field<V>(&mut self, field: &'static str) -> Result<V, Self::Error>
         where V: Deserialize,
     {
-        Err(Error::missing_field(field))
+        Err(Error::missing_field_error(field))
     }
 }
 
@@ -644,35 +415,21 @@ pub trait VariantVisitor {
 
     /// `visit_unit` is called when deserializing a variant with no values.
     fn visit_unit(&mut self) -> Result<(), Self::Error> {
-        Err(Error::type_mismatch(Type::UnitVariant))
+        Err(Error::syntax_error())
     }
 
-    /// `visit_newtype` is called when deserializing a variant with a single value. By default this
-    /// uses the `visit_tuple` method to deserialize the value.
-    #[inline]
-    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
-        where T: Deserialize,
-    {
-        let (value,) = try!(self.visit_tuple(1, impls::TupleVisitor1::new()));
-        Ok(value)
-    }
-
-    /// `visit_tuple` is called when deserializing a tuple-like variant.
-    fn visit_tuple<V>(&mut self,
-                      _len: usize,
-                      _visitor: V) -> Result<V::Value, Self::Error>
+    /// `visit_seq` is called when deserializing a tuple-like variant.
+    fn visit_seq<V>(&mut self, _visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor
     {
-        Err(Error::type_mismatch(Type::TupleVariant))
+        Err(Error::syntax_error())
     }
 
-    /// `visit_struct` is called when deserializing a struct-like variant.
-    fn visit_struct<V>(&mut self,
-                       _fields: &'static [&'static str],
-                       _visitor: V) -> Result<V::Value, Self::Error>
+    /// `visit_map` is called when deserializing a struct-like variant.
+    fn visit_map<V>(&mut self, _visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor
     {
-        Err(Error::type_mismatch(Type::StructVariant))
+        Err(Error::syntax_error())
     }
 }
 
@@ -689,26 +446,16 @@ impl<'a, T> VariantVisitor for &'a mut T where T: VariantVisitor {
         (**self).visit_unit()
     }
 
-    fn visit_newtype<D>(&mut self) -> Result<D, T::Error>
-        where D: Deserialize,
-    {
-        (**self).visit_newtype()
-    }
-
-    fn visit_tuple<V>(&mut self,
-                      len: usize,
-                      visitor: V) -> Result<V::Value, T::Error>
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, T::Error>
         where V: Visitor,
     {
-        (**self).visit_tuple(len, visitor)
+        (**self).visit_seq(visitor)
     }
 
-    fn visit_struct<V>(&mut self,
-                    fields: &'static [&'static str],
-                    visitor: V) -> Result<V::Value, T::Error>
+    fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, T::Error>
         where V: Visitor,
     {
-        (**self).visit_struct(fields, visitor)
+        (**self).visit_map(visitor)
     }
 }
 

serde/src/de/value.rs

@@ -24,10 +24,10 @@ pub enum Error {
 }
 
 impl de::Error for Error {
-    fn syntax(_: &str) -> Self { Error::SyntaxError }
-    fn end_of_stream() -> Self { Error::EndOfStreamError }
-    fn unknown_field(field: &str) -> Self { Error::UnknownFieldError(String::from(field)) }
-    fn missing_field(field: &'static str) -> Self { Error::MissingFieldError(field) }
+    fn syntax_error() -> Self { Error::SyntaxError }
+    fn end_of_stream_error() -> Self { Error::EndOfStreamError }
+    fn unknown_field_error(field: &str) -> Self { Error::UnknownFieldError(field.to_string()) }
+    fn missing_field_error(field: &'static str) -> Self { Error::MissingFieldError(field) }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ macro_rules! primitive_deserializer {
             {
                 match self.0.take() {
                     Some(v) => visitor.$method(v),
-                    None => Err(de::Error::end_of_stream()),
+                    None => Err(de::Error::end_of_stream_error()),
                 }
             }
         }
@@ -132,14 +132,11 @@ impl<'a> de::Deserializer for StrDeserializer<'a> {
     {
         match self.0.take() {
             Some(v) => visitor.visit_str(v),
-            None => Err(de::Error::end_of_stream()),
+            None => Err(de::Error::end_of_stream_error()),
         }
     }
 
-    fn visit_enum<V>(&mut self,
-                     _name: &str,
-                     _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
+    fn visit_enum<V>(&mut self, _name: &str, mut visitor: V) -> Result<V::Value, Error>
         where V: de::EnumVisitor,
     {
         visitor.visit(self)
@@ -181,14 +178,11 @@ impl de::Deserializer for StringDeserializer {
     {
         match self.0.take() {
             Some(string) => visitor.visit_string(string),
-            None => Err(de::Error::end_of_stream()),
+            None => Err(de::Error::end_of_stream_error()),
         }
     }
 
-    fn visit_enum<V>(&mut self,
-                     _name: &str,
-                     _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
+    fn visit_enum<V>(&mut self, _name: &str, mut visitor: V) -> Result<V::Value, Error>
         where V: de::EnumVisitor,
     {
         visitor.visit(self)
@@ -261,7 +255,7 @@ impl<I, T> de::SeqVisitor for SeqDeserializer<I>
         if self.len == 0 {
             Ok(())
         } else {
-            Err(de::Error::length_mismatch(self.len))
+            Err(de::Error::end_of_stream_error())
         }
     }
 
@@ -374,7 +368,7 @@ impl<I, K, V> de::MapVisitor for MapDeserializer<I, K, V>
                 let mut de = value.into_deserializer();
                 de::Deserialize::deserialize(&mut de)
             }
-            None => Err(de::Error::syntax("expected a map value"))
+            None => Err(de::Error::syntax_error())
         }
     }
 
@@ -382,7 +376,7 @@ impl<I, K, V> de::MapVisitor for MapDeserializer<I, K, V>
         if self.len == 0 {
             Ok(())
         } else {
-            Err(de::Error::length_mismatch(self.len))
+            Err(de::Error::end_of_stream_error())
         }
     }
 
@@ -438,7 +432,7 @@ impl<'a> de::Deserializer for BytesDeserializer<'a> {
     {
         match self.0.take() {
             Some(bytes) => visitor.visit_bytes(bytes),
-            None => Err(de::Error::end_of_stream()),
+            None => Err(de::Error::end_of_stream_error()),
         }
     }
 }
@@ -465,7 +459,7 @@ impl de::Deserializer for ByteBufDeserializer {
     {
         match self.0.take() {
             Some(bytes) => visitor.visit_byte_buf(bytes),
-            None => Err(de::Error::end_of_stream()),
+            None => Err(de::Error::end_of_stream_error()),
         }
     }
 }

serde/src/json/builder.rs

@@ -10,9 +10,8 @@
 
 use std::collections::BTreeMap;
 
-use serde::ser::{self, Serialize};
-
-use value::{self, Value};
+use ser::{self, Serialize};
+use json::value::{self, Value};
 
 pub struct ArrayBuilder {
     array: Vec<Value>,

serde/src/json/de.rs

@@ -3,10 +3,10 @@ use std::i32;
 use std::io;
 use std::str;
 
-use serde::de;
-use serde::iter::LineColIterator;
+use de;
+use iter::LineColIterator;
 
-use super::error::{Error, ErrorCode, Result};
+use super::error::{Error, ErrorCode};
 
 pub struct Deserializer<Iter: Iterator<Item=io::Result<u8>>> {
     rdr: LineColIterator<Iter>,
@@ -28,128 +28,98 @@ impl<Iter> Deserializer<Iter>
 {
     /// Creates the JSON parser from an `std::iter::Iterator`.
     #[inline]
-    pub fn new(rdr: Iter) -> Deserializer<Iter> {
-        Deserializer {
+    pub fn new(rdr: Iter) -> Result<Deserializer<Iter>, Error> {
+        let mut deserializer = Deserializer {
             rdr: LineColIterator::new(rdr),
             ch: None,
             str_buf: Vec::with_capacity(128),
-        }
+        };
+
+        try!(deserializer.bump());
+
+        Ok(deserializer)
     }
 
     #[inline]
-    pub fn end(&mut self) -> Result<()> {
+    pub fn end(&mut self) -> Result<(), Error> {
         try!(self.parse_whitespace());
-        if try!(self.eof()) {
+        if self.eof() {
             Ok(())
         } else {
             Err(self.error(ErrorCode::TrailingCharacters))
         }
     }
 
-    fn eof(&mut self) -> Result<bool> {
-        Ok(try!(self.peek()).is_none())
+    fn eof(&self) -> bool { self.ch.is_none() }
+
+    fn ch_or_null(&self) -> u8 { self.ch.unwrap_or(b'\x00') }
+
+    fn bump(&mut self) -> Result<(), Error> {
+        self.ch = match self.rdr.next() {
+            Some(Err(err)) => { return Err(Error::IoError(err)); }
+            Some(Ok(ch)) => Some(ch),
+            None => None,
+        };
+
+        Ok(())
     }
 
-    fn peek(&mut self) -> Result<Option<u8>> {
-        match self.ch {
-            Some(ch) => Ok(Some(ch)),
-            None => {
-                match self.rdr.next() {
-                    Some(Err(err)) => Err(Error::IoError(err)),
-                    Some(Ok(ch)) => {
-                        self.ch = Some(ch);
-                        Ok(self.ch)
-                    }
-                    None => Ok(None),
-                }
-            }
-        }
+    fn next_char(&mut self) -> Result<Option<u8>, Error> {
+        try!(self.bump());
+        Ok(self.ch)
     }
 
-    fn peek_or_null(&mut self) -> Result<u8> {
-        Ok(try!(self.peek()).unwrap_or(b'\x00'))
-    }
-
-    fn eat_char(&mut self) {
-        self.ch = None;
-    }
-
-    fn next_char(&mut self) -> Result<Option<u8>> {
-        match self.ch.take() {
-            Some(ch) => Ok(Some(ch)),
-            None => {
-                match self.rdr.next() {
-                    Some(Err(err)) => Err(Error::IoError(err)),
-                    Some(Ok(ch)) => Ok(Some(ch)),
-                    None => Ok(None),
-                }
-            }
-        }
-    }
-
-    fn next_char_or_null(&mut self) -> Result<u8> {
-        Ok(try!(self.next_char()).unwrap_or(b'\x00'))
+    fn ch_is(&self, c: u8) -> bool {
+        self.ch == Some(c)
     }
 
     fn error(&mut self, reason: ErrorCode) -> Error {
         Error::SyntaxError(reason, self.rdr.line(), self.rdr.col())
     }
 
-    fn parse_whitespace(&mut self) -> Result<()> {
-        loop {
-            match try!(self.peek_or_null()) {
-                b' ' | b'\n' | b'\t' | b'\r' => {
-                    self.eat_char();
-                }
-                _ => { return Ok(()); }
-            }
-        }
+    fn parse_whitespace(&mut self) -> Result<(), Error> {
+        while self.ch_is(b' ') ||
+              self.ch_is(b'\n') ||
+              self.ch_is(b'\t') ||
+              self.ch_is(b'\r') { try!(self.bump()); }
+
+        Ok(())
     }
 
-    fn parse_value<V>(&mut self, mut visitor: V) -> Result<V::Value>
+    fn parse_value<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         try!(self.parse_whitespace());
 
-        if try!(self.eof()) {
+        if self.eof() {
             return Err(self.error(ErrorCode::EOFWhileParsingValue));
         }
 
-        let value = match try!(self.peek_or_null()) {
+        let value = match self.ch_or_null() {
             b'n' => {
-                self.eat_char();
                 try!(self.parse_ident(b"ull"));
                 visitor.visit_unit()
             }
             b't' => {
-                self.eat_char();
                 try!(self.parse_ident(b"rue"));
                 visitor.visit_bool(true)
             }
             b'f' => {
-                self.eat_char();
                 try!(self.parse_ident(b"alse"));
                 visitor.visit_bool(false)
             }
-            b'-' => {
-                self.eat_char();
-                self.parse_integer(false, visitor)
-            }
-            b'0' ... b'9' => {
-                self.parse_integer(true, visitor)
-            }
+            b'0' ... b'9' | b'-' => self.parse_number(visitor),
             b'"' => {
-                self.eat_char();
                 try!(self.parse_string());
                 let s = str::from_utf8(&self.str_buf).unwrap();
                 visitor.visit_str(s)
             }
             b'[' => {
-                self.eat_char();
+                try!(self.bump());
                 visitor.visit_seq(SeqVisitor::new(self))
             }
             b'{' => {
-                self.eat_char();
+                try!(self.bump());
                 visitor.visit_map(MapVisitor::new(self))
             }
             _ => {
@@ -164,207 +134,147 @@ impl<Iter> Deserializer<Iter>
         }
     }
 
-    fn parse_ident(&mut self, ident: &[u8]) -> Result<()> {
+    fn parse_ident(&mut self, ident: &[u8]) -> Result<(), Error> {
         for c in ident {
             if Some(*c) != try!(self.next_char()) {
                 return Err(self.error(ErrorCode::ExpectedSomeIdent));
             }
         }
 
+        try!(self.bump());
         Ok(())
     }
 
-    fn parse_integer<V>(&mut self, pos: bool, visitor: V) -> Result<V::Value>
+    fn parse_number<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
-        match try!(self.next_char_or_null()) {
+        let mut neg = false;
+
+        if self.ch_is(b'-') {
+            try!(self.bump());
+            neg = true;
+        }
+
+        let res = try!(self.parse_integer());
+
+        if self.ch_is(b'.') || self.ch_is(b'e') || self.ch_is(b'E') {
+            let mut res = res as f64;
+
+            if self.ch_is(b'.') {
+                res = try!(self.parse_decimal(res));
+            }
+
+            if self.ch_is(b'e') || self.ch_is(b'E') {
+                res = try!(self.parse_exponent(res));
+            }
+
+            if neg {
+                visitor.visit_f64(-res)
+            } else {
+                visitor.visit_f64(res)
+            }
+        } else {
+            if neg {
+                let res = -(res as i64);
+
+                // Make sure we didn't underflow.
+                if res > 0 {
+                    Err(self.error(ErrorCode::InvalidNumber))
+                } else {
+                    visitor.visit_i64(res)
+                }
+            } else {
+                visitor.visit_u64(res)
+            }
+        }
+    }
+
+    fn parse_integer(&mut self) -> Result<u64, Error> {
+        let mut accum: u64 = 0;
+
+        match self.ch_or_null() {
             b'0' => {
+                try!(self.bump());
+
                 // There can be only one leading '0'.
-                match try!(self.peek_or_null()) {
+                match self.ch_or_null() {
                     b'0' ... b'9' => {
-                        Err(self.error(ErrorCode::InvalidNumber))
-                    }
-                    _ => {
-                        self.parse_number(pos, 0, visitor)
+                        return Err(self.error(ErrorCode::InvalidNumber));
                     }
+                    _ => ()
                 }
             },
-            c @ b'1' ... b'9' => {
-                let mut res: u64 = (c as u64) - ('0' as u64);
-
-                loop {
-                    match try!(self.peek_or_null()) {
+            b'1' ... b'9' => {
+                while !self.eof() {
+                    match self.ch_or_null() {
                         c @ b'0' ... b'9' => {
-                            self.eat_char();
+                            accum = try_or_invalid!(self, accum.checked_mul(10));
+                            accum = try_or_invalid!(self, accum.checked_add((c as u64) - ('0' as u64)));
 
-                            let digit = (c as u64) - ('0' as u64);
-
-                            // We need to be careful with overflow. If we can, try to keep the
-                            // number as a `u64` until we grow too large. At that point, switch to
-                            // parsing the value as a `f64`.
-                            match res.checked_mul(10).and_then(|val| val.checked_add(digit)) {
-                                Some(res_) => { res = res_; }
-                                None => {
-                                    return self.parse_float(
-                                        pos,
-                                        (res as f64) * 10.0 + (digit as f64),
-                                        visitor);
-                                }
-                            }
-                        }
-                        _ => {
-                            return self.parse_number(pos, res, visitor);
+                            try!(self.bump());
                         }
+                        _ => break,
                     }
                 }
             }
-            _ => {
-                Err(self.error(ErrorCode::InvalidNumber))
-            }
+            _ => { return Err(self.error(ErrorCode::InvalidNumber)); }
         }
+
+        Ok(accum)
     }
 
-    fn parse_float<V>(&mut self,
-                      pos: bool,
-                      mut res: f64,
-                      mut visitor: V) -> Result<V::Value>
-        where V: de::Visitor,
-    {
-        loop {
-            match try!(self.next_char_or_null()) {
-                c @ b'0' ... b'9' => {
-                    let digit = (c as u64) - ('0' as u64);
-
-                    res *= 10.0;
-                    res += digit as f64;
-                }
-                _ => {
-                    match try!(self.peek_or_null()) {
-                        b'.' => {
-                            return self.parse_decimal(pos, res, visitor);
-                        }
-                        b'e' | b'E' => {
-                            return self.parse_exponent(pos, res, visitor);
-                        }
-                        _ => {
-                            if !pos {
-                                res = -res;
-                            }
-
-                            return visitor.visit_f64(res);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn parse_number<V>(&mut self,
-                       pos: bool,
-                       res: u64,
-                       mut visitor: V) -> Result<V::Value>
-        where V: de::Visitor,
-    {
-        match try!(self.peek_or_null()) {
-            b'.' => {
-                self.parse_decimal(pos, res as f64, visitor)
-            }
-            b'e' | b'E' => {
-                self.parse_exponent(pos, res as f64, visitor)
-            }
-            _ => {
-                if pos {
-                    visitor.visit_u64(res)
-                } else {
-                    // FIXME: `wrapping_neg` will be stable in Rust 1.2
-                    //let res_i64 = (res as i64).wrapping_neg();
-                    let res_i64 = (!res + 1) as i64;
-
-                    // Convert into a float if we underflow.
-                    if res_i64 > 0 {
-                        visitor.visit_f64(-(res as f64))
-                    } else {
-                        visitor.visit_i64(res_i64)
-                    }
-                }
-            }
-        }
-    }
-
-    fn parse_decimal<V>(&mut self,
-                        pos: bool,
-                        mut res: f64,
-                        mut visitor: V) -> Result<V::Value>
-        where V: de::Visitor,
-    {
-        self.eat_char();
-
-        let mut dec = 0.1;
+    fn parse_decimal(&mut self, res: f64) -> Result<f64, Error> {
+        try!(self.bump());
 
         // Make sure a digit follows the decimal place.
-        match try!(self.next_char_or_null()) {
-            c @ b'0' ... b'9' => {
-                res += (((c as u64) - (b'0' as u64)) as f64) * dec;
-            }
+        match self.ch_or_null() {
+            b'0' ... b'9' => (),
              _ => { return Err(self.error(ErrorCode::InvalidNumber)); }
         }
 
-        loop {
-            match try!(self.peek_or_null()) {
+        let mut res = res;
+        let mut dec = 1.0;
+        while !self.eof() {
+            match self.ch_or_null() {
                 c @ b'0' ... b'9' => {
-                    self.eat_char();
-
                     dec /= 10.0;
                     res += (((c as u64) - (b'0' as u64)) as f64) * dec;
+                    try!(self.bump());
                 }
-                _ => { break; }
-            }
-        }
-
-        match try!(self.peek_or_null()) {
-            b'e' | b'E' => {
-                self.parse_exponent(pos, res, visitor)
-            }
-            _ => {
-                if pos {
-                    visitor.visit_f64(res)
-                } else {
-                    visitor.visit_f64(-res)
-                }
+                _ => break,
             }
         }
 
+        Ok(res)
     }
 
-    fn parse_exponent<V>(&mut self,
-                         pos: bool,
-                         mut res: f64,
-                         mut visitor: V) -> Result<V::Value>
-        where V: de::Visitor,
-    {
-        self.eat_char();
+    fn parse_exponent(&mut self, mut res: f64) -> Result<f64, Error> {
+        try!(self.bump());
 
-        let pos_exp = match try!(self.peek_or_null()) {
-            b'+' => { self.eat_char(); true }
-            b'-' => { self.eat_char(); false }
-            _ => { true }
-        };
+        let mut exp: u64 = 0;
+        let mut neg_exp = false;
+
+        if self.ch_is(b'+') {
+            try!(self.bump());
+        } else if self.ch_is(b'-') {
+            try!(self.bump());
+            neg_exp = true;
+        }
 
         // Make sure a digit follows the exponent place.
-        let mut exp = match try!(self.next_char_or_null()) {
-            c @ b'0' ... b'9' => { (c as u64) - (b'0' as u64) }
+        match self.ch_or_null() {
+            b'0' ... b'9' => (),
             _ => { return Err(self.error(ErrorCode::InvalidNumber)); }
-        };
-
-        loop {
-            match try!(self.peek_or_null()) {
+        }
+        while !self.eof() {
+            match self.ch_or_null() {
                 c @ b'0' ... b'9' => {
-                    self.eat_char();
-
                     exp = try_or_invalid!(self, exp.checked_mul(10));
                     exp = try_or_invalid!(self, exp.checked_add((c as u64) - (b'0' as u64)));
+
+                    try!(self.bump());
                 }
-                _ => { break; }
+                _ => break
             }
         }
 
@@ -374,24 +284,21 @@ impl<Iter> Deserializer<Iter>
             return Err(self.error(ErrorCode::InvalidNumber));
         };
 
-        if pos_exp {
-            res *= exp;
-        } else {
+        if neg_exp {
             res /= exp;
+        } else {
+            res *= exp;
         }
 
-        if pos {
-            visitor.visit_f64(res)
-        } else {
-            visitor.visit_f64(-res)
-        }
+        Ok(res)
     }
 
-    fn decode_hex_escape(&mut self) -> Result<u16> {
+    fn decode_hex_escape(&mut self) -> Result<u16, Error> {
         let mut i = 0;
         let mut n = 0u16;
-        while i < 4 && !try!(self.eof()) {
-            n = match try!(self.next_char_or_null()) {
+        while i < 4 && !self.eof() {
+            try!(self.bump());
+            n = match self.ch_or_null() {
                 c @ b'0' ... b'9' => n * 16_u16 + ((c as u16) - (b'0' as u16)),
                 b'a' | b'A' => n * 16_u16 + 10_u16,
                 b'b' | b'B' => n * 16_u16 + 11_u16,
@@ -413,7 +320,7 @@ impl<Iter> Deserializer<Iter>
         Ok(n)
     }
 
-    fn parse_string(&mut self) -> Result<()> {
+    fn parse_string(&mut self) -> Result<(), Error> {
         self.str_buf.clear();
 
         loop {
@@ -424,6 +331,7 @@ impl<Iter> Deserializer<Iter>
 
             match ch {
                 b'"' => {
+                    try!(self.bump());
                     return Ok(());
                 }
                 b'\\' => {
@@ -501,13 +409,16 @@ impl<Iter> Deserializer<Iter>
         }
     }
 
-    fn parse_object_colon(&mut self) -> Result<()> {
+    fn parse_object_colon(&mut self) -> Result<(), Error> {
         try!(self.parse_whitespace());
 
-        match try!(self.next_char()) {
-            Some(b':') => Ok(()),
-            Some(_) => Err(self.error(ErrorCode::ExpectedColon)),
-            None => Err(self.error(ErrorCode::EOFWhileParsingObject)),
+        if self.ch_is(b':') {
+            try!(self.bump());
+            Ok(())
+        } else if self.eof() {
+            Err(self.error(ErrorCode::EOFWhileParsingObject))
+        } else {
+            Err(self.error(ErrorCode::ExpectedColon))
         }
     }
 }
@@ -518,74 +429,54 @@ impl<Iter> de::Deserializer for Deserializer<Iter>
     type Error = Error;
 
     #[inline]
-    fn visit<V>(&mut self, visitor: V) -> Result<V::Value>
+    fn visit<V>(&mut self, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         self.parse_value(visitor)
     }
 
-    /// Parses a `null` as a None, and any other values as a `Some(...)`.
     #[inline]
-    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value>
+    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         try!(self.parse_whitespace());
 
-        match try!(self.peek_or_null()) {
-            b'n' => {
-                self.eat_char();
-                try!(self.parse_ident(b"ull"));
-                visitor.visit_none()
-            }
-            _ => {
-                visitor.visit_some(self)
-            }
+        if self.eof() {
+            return Err(self.error(ErrorCode::EOFWhileParsingValue));
+        }
+
+        if self.ch_is(b'n') {
+            try!(self.parse_ident(b"ull"));
+            visitor.visit_none()
+        } else {
+            visitor.visit_some(self)
         }
     }
 
-    /// Parses a newtype struct as the underlying value.
     #[inline]
-    fn visit_newtype_struct<V>(&mut self,
-                               _name: &str,
-                               mut visitor: V) -> Result<V::Value>
-        where V: de::Visitor,
-    {
-        visitor.visit_newtype_struct(self)
-    }
-
-    /// Parses an enum as an object like `{"$KEY":$VALUE}`, where $VALUE is either a straight
-    /// value, a `[..]`, or a `{..}`.
-    #[inline]
-    fn visit_enum<V>(&mut self,
-                     _name: &str,
-                     _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value>
+    fn visit_enum<V>(&mut self, _name: &str, mut visitor: V) -> Result<V::Value, Error>
         where V: de::EnumVisitor,
     {
         try!(self.parse_whitespace());
 
-        match try!(self.next_char_or_null()) {
-            b'{' => {
-                try!(self.parse_whitespace());
+        if self.ch_is(b'{') {
+            try!(self.bump());
+            try!(self.parse_whitespace());
 
-                let value = {
-                    try!(visitor.visit(&mut *self))
-                };
+            let value = {
+                try!(visitor.visit(&mut *self))
+            };
 
-                try!(self.parse_whitespace());
+            try!(self.parse_whitespace());
 
-                match try!(self.next_char_or_null()) {
-                    b'}' => {
-                        Ok(value)
-                    }
-                    _ => {
-                        Err(self.error(ErrorCode::ExpectedSomeValue))
-                    }
-                }
-            }
-            _ => {
+            if self.ch_is(b'}') {
+                try!(self.bump());
+                Ok(value)
+            } else {
                 Err(self.error(ErrorCode::ExpectedSomeValue))
             }
+        } else {
+            Err(self.error(ErrorCode::ExpectedSomeValue))
         }
     }
 
@@ -614,27 +505,24 @@ impl<'a, Iter> de::SeqVisitor for SeqVisitor<'a, Iter>
 {
     type Error = Error;
 
-    fn visit<T>(&mut self) -> Result<Option<T>>
+    fn visit<T>(&mut self) -> Result<Option<T>, Error>
         where T: de::Deserialize,
     {
         try!(self.de.parse_whitespace());
 
-        match try!(self.de.peek()) {
-            Some(b']') => {
-                return Ok(None);
-            }
-            Some(b',') if !self.first => {
-                self.de.eat_char();
-            }
-            Some(_) => {
-                if self.first {
-                    self.first = false;
-                } else {
-                    return Err(self.de.error(ErrorCode::ExpectedListCommaOrEnd));
-                }
-            }
-            None => {
+        if self.de.ch_is(b']') {
+            return Ok(None);
+        }
+
+        if self.first {
+            self.first = false;
+        } else {
+            if self.de.ch_is(b',') {
+                try!(self.de.bump());
+            } else if self.de.eof() {
                 return Err(self.de.error(ErrorCode::EOFWhileParsingList));
+            } else {
+                return Err(self.de.error(ErrorCode::ExpectedListCommaOrEnd));
             }
         }
 
@@ -642,17 +530,15 @@ impl<'a, Iter> de::SeqVisitor for SeqVisitor<'a, Iter>
         Ok(Some(value))
     }
 
-    fn end(&mut self) -> Result<()> {
+    fn end(&mut self) -> Result<(), Error> {
         try!(self.de.parse_whitespace());
 
-        match try!(self.de.next_char()) {
-            Some(b']') => { Ok(()) }
-            Some(_) => {
-                Err(self.de.error(ErrorCode::TrailingCharacters))
-            }
-            None => {
-                Err(self.de.error(ErrorCode::EOFWhileParsingList))
-            }
+        if self.de.ch_is(b']') {
+            self.de.bump()
+        } else if self.de.eof() {
+            Err(self.de.error(ErrorCode::EOFWhileParsingList))
+        } else {
+            Err(self.de.error(ErrorCode::TrailingCharacters))
         }
     }
 }
@@ -676,45 +562,40 @@ impl<'a, Iter> de::MapVisitor for MapVisitor<'a, Iter>
 {
     type Error = Error;
 
-    fn visit_key<K>(&mut self) -> Result<Option<K>>
+    fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
         where K: de::Deserialize,
     {
         try!(self.de.parse_whitespace());
 
-        match try!(self.de.peek()) {
-            Some(b'}') => {
-                return Ok(None);
-            }
-            Some(b',') if !self.first => {
-                self.de.eat_char();
+        if self.de.ch_is(b'}') {
+            return Ok(None);
+        }
+
+        if self.first {
+            self.first = false;
+        } else {
+            if self.de.ch_is(b',') {
+                try!(self.de.bump());
                 try!(self.de.parse_whitespace());
-            }
-            Some(_) => {
-                if self.first {
-                    self.first = false;
-                } else {
-                    return Err(self.de.error(ErrorCode::ExpectedObjectCommaOrEnd));
-                }
-            }
-            None => {
+            } else if self.de.eof() {
                 return Err(self.de.error(ErrorCode::EOFWhileParsingObject));
+            } else {
+                return Err(self.de.error(ErrorCode::ExpectedObjectCommaOrEnd));
             }
         }
 
-        match try!(self.de.peek()) {
-            Some(b'"') => {
-                Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-            }
-            Some(_) => {
-                Err(self.de.error(ErrorCode::KeyMustBeAString))
-            }
-            None => {
-                Err(self.de.error(ErrorCode::EOFWhileParsingValue))
-            }
+        if self.de.eof() {
+            return Err(self.de.error(ErrorCode::EOFWhileParsingValue));
         }
+
+        if !self.de.ch_is(b'"') {
+            return Err(self.de.error(ErrorCode::KeyMustBeAString));
+        }
+
+        Ok(Some(try!(de::Deserialize::deserialize(self.de))))
     }
 
-    fn visit_value<V>(&mut self) -> Result<V>
+    fn visit_value<V>(&mut self) -> Result<V, Error>
         where V: de::Deserialize,
     {
         try!(self.de.parse_object_colon());
@@ -722,21 +603,20 @@ impl<'a, Iter> de::MapVisitor for MapVisitor<'a, Iter>
         Ok(try!(de::Deserialize::deserialize(self.de)))
     }
 
-    fn end(&mut self) -> Result<()> {
+    fn end(&mut self) -> Result<(), Error> {
         try!(self.de.parse_whitespace());
 
-        match try!(self.de.next_char()) {
-            Some(b'}') => { Ok(()) }
-            Some(_) => {
-                Err(self.de.error(ErrorCode::TrailingCharacters))
-            }
-            None => {
-                Err(self.de.error(ErrorCode::EOFWhileParsingObject))
-            }
+        if self.de.ch_is(b'}') {
+            try!(self.de.bump());
+            Ok(())
+        } else if self.de.eof() {
+            Err(self.de.error(ErrorCode::EOFWhileParsingObject))
+        } else {
+            Err(self.de.error(ErrorCode::TrailingCharacters))
         }
     }
 
-    fn missing_field<V>(&mut self, _field: &'static str) -> Result<V>
+    fn missing_field<V>(&mut self, _field: &'static str) -> Result<V, Error>
         where V: de::Deserialize,
     {
         let mut de = de::value::ValueDeserializer::into_deserializer(());
@@ -749,47 +629,41 @@ impl<Iter> de::VariantVisitor for Deserializer<Iter>
 {
     type Error = Error;
 
-    fn visit_variant<V>(&mut self) -> Result<V>
+    fn visit_variant<V>(&mut self) -> Result<V, Error>
         where V: de::Deserialize
     {
-        let val = try!(de::Deserialize::deserialize(self));
+        de::Deserialize::deserialize(self)
+    }
+
+    fn visit_unit(&mut self) -> Result<(), Error> {
         try!(self.parse_object_colon());
-        Ok(val)
-    }
 
-    fn visit_unit(&mut self) -> Result<()> {
         de::Deserialize::deserialize(self)
     }
 
-    fn visit_newtype<T>(&mut self) -> Result<T>
-        where T: de::Deserialize,
-    {
-        de::Deserialize::deserialize(self)
-    }
-
-    fn visit_tuple<V>(&mut self,
-                      _len: usize,
-                      visitor: V) -> Result<V::Value>
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
+        try!(self.parse_object_colon());
+
         de::Deserializer::visit(self, visitor)
     }
 
-    fn visit_struct<V>(&mut self,
-                       _fields: &'static [&'static str],
-                       visitor: V) -> Result<V::Value>
+    fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
+        try!(self.parse_object_colon());
+
         de::Deserializer::visit(self, visitor)
     }
 }
 
 /// Decodes a json value from a `std::io::Read`.
-pub fn from_iter<I, T>(iter: I) -> Result<T>
+pub fn from_iter<I, T>(iter: I) -> Result<T, Error>
     where I: Iterator<Item=io::Result<u8>>,
           T: de::Deserialize,
 {
-    let mut de = Deserializer::new(iter);
+    let mut de = try!(Deserializer::new(iter));
     let value = try!(de::Deserialize::deserialize(&mut de));
 
     // Make sure the whole stream has been consumed.
@@ -798,7 +672,7 @@ pub fn from_iter<I, T>(iter: I) -> Result<T>
 }
 
 /// Decodes a json value from a `std::io::Read`.
-pub fn from_reader<R, T>(rdr: R) -> Result<T>
+pub fn from_reader<R, T>(rdr: R) -> Result<T, Error>
     where R: io::Read,
           T: de::Deserialize,
 {
@@ -806,14 +680,14 @@ pub fn from_reader<R, T>(rdr: R) -> Result<T>
 }
 
 /// Decodes a json value from a `&str`.
-pub fn from_slice<T>(v: &[u8]) -> Result<T>
+pub fn from_slice<T>(v: &[u8]) -> Result<T, Error>
     where T: de::Deserialize
 {
     from_iter(v.iter().map(|byte| Ok(*byte)))
 }
 
 /// Decodes a json value from a `&str`.
-pub fn from_str<T>(s: &str) -> Result<T>
+pub fn from_str<T>(s: &str) -> Result<T, Error>
     where T: de::Deserialize
 {
     from_slice(s.as_bytes())

serde/src/json/error.rs

@@ -1,9 +1,8 @@
 use std::error;
 use std::fmt;
 use std::io;
-use std::result;
 
-use serde::de;
+use de;
 
 /// The errors that can arise while parsing a JSON stream.
 #[derive(Clone, PartialEq)]
@@ -152,38 +151,35 @@ impl From<de::value::Error> for Error {
     fn from(error: de::value::Error) -> Error {
         match error {
             de::value::Error::SyntaxError => {
-                Error::SyntaxError(ErrorCode::ExpectedSomeValue, 0, 0)
+                de::Error::syntax_error()
             }
             de::value::Error::EndOfStreamError => {
-                de::Error::end_of_stream()
+                de::Error::end_of_stream_error()
             }
             de::value::Error::UnknownFieldError(field) => {
                 Error::SyntaxError(ErrorCode::UnknownField(field), 0, 0)
             }
             de::value::Error::MissingFieldError(field) => {
-                de::Error::missing_field(field)
+                de::Error::missing_field_error(field)
             }
         }
     }
 }
 
 impl de::Error for Error {
-    fn syntax(_: &str) -> Error {
+    fn syntax_error() -> Error {
         Error::SyntaxError(ErrorCode::ExpectedSomeValue, 0, 0)
     }
 
-    fn end_of_stream() -> Error {
+    fn end_of_stream_error() -> Error {
         Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 0, 0)
     }
 
-    fn unknown_field(field: &str) -> Error {
+    fn unknown_field_error(field: &str) -> Error {
         Error::SyntaxError(ErrorCode::UnknownField(field.to_string()), 0, 0)
     }
 
-    fn missing_field(field: &'static str) -> Error {
+    fn missing_field_error(field: &'static str) -> Error {
         Error::MissingFieldError(field)
     }
 }
-
-/// Helper alias for `Result` objects that return a JSON `Error`.
-pub type Result<T> = result::Result<T, Error>;

serde/src/json/mod.rs

@@ -6,7 +6,7 @@
 //! encode structured data in a text format that can be easily read by humans.  Its simple syntax
 //! and native compatibility with JavaScript have made it a widely used format.
 //!
-//! Data types that can be encoded are JavaScript types (see the `serde_json:Value` enum for more
+//! Data types that can be encoded are JavaScript types (see the `serde::json:Value` enum for more
 //! details):
 //!
 //! * `Boolean`: equivalent to rust's `bool`
@@ -16,7 +16,7 @@
 //! * `String`: equivalent to rust's `String`
 //! * `Array`: equivalent to rust's `Vec<T>`, but also allowing objects of different types in the
 //!    same array
-//! * `Object`: equivalent to rust's `BTreeMap<String, serde_json::Value>`
+//! * `Object`: equivalent to rust's `BTreeMap<String, serde::json::Value>`
 //! * `Null`
 //!
 //! An object is a series of string keys mapping to values, in `"key": value` format.  Arrays are
@@ -48,8 +48,8 @@
 //! `serde::Deserialize` trait.  Serde provides provides an annotation to automatically generate
 //! the code for these traits: `#[derive(Serialize, Deserialize)]`.
 //!
-//! The JSON API also provides an enum `serde_json::Value` and a method `to_value` to serialize
-//! objects.  A `serde_json::Value` value can be serialized as a string or buffer using the
+//! The JSON API also provides an enum `serde::json::Value` and a method `to_value` to serialize
+//! objects.  A `serde::json::Value` value can be serialized as a string or buffer using the
 //! functions described above.  You can also use the `json::Serializer` object, which implements the
 //! `Serializer` trait.
 //!
@@ -61,12 +61,12 @@
 //! //#![feature(custom_derive, plugin)]
 //! //#![plugin(serde_macros)]
 //!
-//! extern crate serde_json;
+//! extern crate serde;
 //!
-//! use serde_json::Value;
+//! use serde::json::{self, Value};
 //!
 //! fn main() {
-//!     let data: Value = serde_json::from_str("{\"foo\": 13, \"bar\": \"baz\"}").unwrap();
+//!     let data: Value = json::from_str("{\"foo\": 13, \"bar\": \"baz\"}").unwrap();
 //!     println!("data: {:?}", data);
 //!     // data: {"bar":"baz","foo":13}
 //!     println!("object? {}", data.is_object());
@@ -92,17 +92,8 @@
 //! }
 //! ```
 
-extern crate num;
-extern crate serde;
-
-pub use self::de::{
-    Deserializer,
-    from_iter,
-    from_reader,
-    from_slice,
-    from_str,
-};
-pub use self::error::{Error, ErrorCode, Result};
+pub use self::de::{Deserializer, from_str};
+pub use self::error::{Error, ErrorCode};
 pub use self::ser::{
     Serializer,
     to_writer,

serde/src/json/ser.rs

@@ -2,7 +2,7 @@ use std::io;
 use std::num::FpCategory;
 use std::string::FromUtf8Error;
 
-use serde::ser;
+use ser;
 
 /// A structure for implementing serialization to JSON.
 pub struct Serializer<W, F=CompactFormatter> {
@@ -158,21 +158,8 @@ impl<W, F> ser::Serializer for Serializer<W, F>
         self.writer.write_all(b"null")
     }
 
-    /// Override `visit_newtype_struct` to serialize newtypes without an object wrapper.
     #[inline]
-    fn visit_newtype_struct<T>(&mut self,
-                               _name: &'static str,
-                               value: T) -> Result<(), Self::Error>
-        where T: ser::Serialize,
-    {
-        value.serialize(self)
-    }
-
-    #[inline]
-    fn visit_unit_variant(&mut self,
-                          _name: &str,
-                          _variant_index: usize,
-                          variant: &str) -> io::Result<()> {
+    fn visit_enum_unit(&mut self, _name: &str, variant: &str) -> io::Result<()> {
         try!(self.formatter.open(&mut self.writer, b'{'));
         try!(self.formatter.comma(&mut self.writer, true));
         try!(self.visit_str(variant));
@@ -181,22 +168,6 @@ impl<W, F> ser::Serializer for Serializer<W, F>
         self.formatter.close(&mut self.writer, b'}')
     }
 
-    #[inline]
-    fn visit_newtype_variant<T>(&mut self,
-                                _name: &str,
-                                _variant_index: usize,
-                                variant: &str,
-                                value: T) -> io::Result<()>
-        where T: ser::Serialize,
-    {
-        try!(self.formatter.open(&mut self.writer, b'{'));
-        try!(self.formatter.comma(&mut self.writer, true));
-        try!(self.visit_str(variant));
-        try!(self.formatter.colon(&mut self.writer));
-        try!(value.serialize(self));
-        self.formatter.close(&mut self.writer, b'}')
-    }
-
     #[inline]
     fn visit_seq<V>(&mut self, mut visitor: V) -> io::Result<()>
         where V: ser::SeqVisitor,
@@ -219,11 +190,7 @@ impl<W, F> ser::Serializer for Serializer<W, F>
     }
 
     #[inline]
-    fn visit_tuple_variant<V>(&mut self,
-                              _name: &str,
-                              _variant_index: usize,
-                              variant: &str,
-                              visitor: V) -> io::Result<()>
+    fn visit_enum_seq<V>(&mut self, _name: &str, variant: &str, visitor: V) -> io::Result<()>
         where V: ser::SeqVisitor,
     {
         try!(self.formatter.open(&mut self.writer, b'{'));
@@ -239,11 +206,9 @@ impl<W, F> ser::Serializer for Serializer<W, F>
         where T: ser::Serialize,
     {
         try!(self.formatter.comma(&mut self.writer, self.first));
-        try!(value.serialize(self));
-
         self.first = false;
 
-        Ok(())
+        value.serialize(self)
     }
 
     #[inline]
@@ -267,11 +232,7 @@ impl<W, F> ser::Serializer for Serializer<W, F>
     }
 
     #[inline]
-    fn visit_struct_variant<V>(&mut self,
-                               _name: &str,
-                               _variant_index: usize,
-                               variant: &str,
-                               visitor: V) -> io::Result<()>
+    fn visit_enum_map<V>(&mut self, _name: &str, variant: &str, visitor: V) -> io::Result<()>
         where V: ser::MapVisitor,
     {
         try!(self.formatter.open(&mut self.writer, b'{'));
@@ -289,14 +250,11 @@ impl<W, F> ser::Serializer for Serializer<W, F>
               V: ser::Serialize,
     {
         try!(self.formatter.comma(&mut self.writer, self.first));
+        self.first = false;
 
         try!(key.serialize(self));
         try!(self.formatter.colon(&mut self.writer));
-        try!(value.serialize(self));
-
-        self.first = false;
-
-        Ok(())
+        value.serialize(self)
     }
 
     #[inline]
@@ -465,7 +423,12 @@ fn fmt_f32_or_null<W>(wr: &mut W, value: f32) -> io::Result<()>
     match value.classify() {
         FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null"),
         _ => {
-            write!(wr, "{:?}", value)
+            let s = format!("{:?}", value);
+            try!(wr.write_all(s.as_bytes()));
+            if !s.contains('.') {
+                try!(wr.write_all(b".0"))
+            }
+            Ok(())
         }
     }
 }
@@ -476,7 +439,12 @@ fn fmt_f64_or_null<W>(wr: &mut W, value: f64) -> io::Result<()>
     match value.classify() {
         FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null"),
         _ => {
-            write!(wr, "{:?}", value)
+            let s = format!("{:?}", value);
+            try!(wr.write_all(s.as_bytes()));
+            if !s.contains('.') {
+                try!(wr.write_all(b".0"))
+            }
+            Ok(())
         }
     }
 }

serde/src/json/value.rs

@@ -6,10 +6,9 @@ use std::vec;
 
 use num::NumCast;
 
-use serde::de;
-use serde::ser;
-
-use error::Error;
+use de;
+use ser;
+use super::error::Error;
 
 #[derive(Clone, PartialEq)]
 pub enum Value {
@@ -459,10 +458,7 @@ impl ser::Serializer for Serializer {
     }
 
     #[inline]
-    fn visit_unit_variant(&mut self,
-                          _name: &str,
-                          _variant_index: usize,
-                          variant: &str) -> Result<(), ()> {
+    fn visit_enum_unit(&mut self, _name: &str, variant: &str) -> Result<(), ()> {
         let mut values = BTreeMap::new();
         values.insert(variant.to_string(), Value::Array(vec![]));
 
@@ -471,22 +467,6 @@ impl ser::Serializer for Serializer {
         Ok(())
     }
 
-    #[inline]
-    fn visit_newtype_variant<T>(&mut self,
-                                _name: &str,
-                                _variant_index: usize,
-                                variant: &str,
-                                value: T) -> Result<(), ()>
-        where T: ser::Serialize,
-    {
-        let mut values = BTreeMap::new();
-        values.insert(variant.to_string(), to_value(&value));
-
-        self.state.push(State::Value(Value::Object(values)));
-
-        Ok(())
-    }
-
     #[inline]
     fn visit_seq<V>(&mut self, mut visitor: V) -> Result<(), ()>
         where V: ser::SeqVisitor,
@@ -509,11 +489,7 @@ impl ser::Serializer for Serializer {
     }
 
     #[inline]
-    fn visit_tuple_variant<V>(&mut self,
-                              _name: &str,
-                              _variant_index: usize,
-                              variant: &str,
-                              visitor: V) -> Result<(), ()>
+    fn visit_enum_seq<V>(&mut self, _name: &str, variant: &str, visitor: V) -> Result<(), ()>
         where V: ser::SeqVisitor,
     {
         try!(self.visit_seq(visitor));
@@ -572,11 +548,7 @@ impl ser::Serializer for Serializer {
     }
 
     #[inline]
-    fn visit_struct_variant<V>(&mut self,
-                               _name: &str,
-                               _variant_index: usize,
-                               variant: &str,
-                               visitor: V) -> Result<(), ()>
+    fn visit_enum_map<V>(&mut self, _name: &str, variant: &str, visitor: V) -> Result<(), ()>
         where V: ser::MapVisitor,
     {
         try!(self.visit_map(visitor));
@@ -650,7 +622,7 @@ impl de::Deserializer for Deserializer {
     {
         let value = match self.value.take() {
             Some(value) => value,
-            None => { return Err(de::Error::end_of_stream()); }
+            None => { return Err(de::Error::end_of_stream_error()); }
         };
 
         match value {
@@ -687,121 +659,58 @@ impl de::Deserializer for Deserializer {
         match self.value {
             Some(Value::Null) => visitor.visit_none(),
             Some(_) => visitor.visit_some(self),
-            None => Err(de::Error::end_of_stream()),
+            None => Err(de::Error::end_of_stream_error()),
         }
     }
 
     #[inline]
-    fn visit_enum<V>(&mut self,
-                     _name: &str,
-                     _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
+    fn visit_enum<V>(&mut self, _name: &str, mut visitor: V) -> Result<V::Value, Error>
         where V: de::EnumVisitor,
     {
         let value = match self.value.take() {
             Some(Value::Object(value)) => value,
-            Some(_) => { return Err(de::Error::syntax("expected an enum")); }
-            None => { return Err(de::Error::end_of_stream()); }
+            Some(_) => { return Err(de::Error::syntax_error()); }
+            None => { return Err(de::Error::end_of_stream_error()); }
         };
 
         let mut iter = value.into_iter();
 
-        let (variant, value) = match iter.next() {
-            Some(v) => v,
-            None => return Err(de::Error::syntax("expected a variant name")),
+        let value = match iter.next() {
+            Some((variant, Value::Array(fields))) => {
+                self.value = Some(Value::String(variant));
+
+                let len = fields.len();
+                try!(visitor.visit(SeqDeserializer {
+                    de: self,
+                    iter: fields.into_iter(),
+                    len: len,
+                }))
+            }
+            Some((variant, Value::Object(fields))) => {
+                let len = fields.len();
+                try!(visitor.visit(MapDeserializer {
+                    de: self,
+                    iter: fields.into_iter(),
+                    value: Some(Value::String(variant)),
+                    len: len,
+                }))
+            }
+            Some(_) => { return Err(de::Error::syntax_error()); }
+            None => { return Err(de::Error::syntax_error()); }
         };
 
-        // enums are encoded in json as maps with a single key:value pair
         match iter.next() {
-            Some(_) => Err(de::Error::syntax("expected map")),
-            None => visitor.visit(VariantDeserializer {
-                de: self,
-                val: Some(value),
-                variant: Some(Value::String(variant)),
-            }),
+            Some(_) => Err(de::Error::syntax_error()),
+            None => Ok(value)
         }
     }
 
-    #[inline]
-    fn visit_newtype_struct<V>(&mut self,
-                               _name: &'static str,
-                               mut visitor: V) -> Result<V::Value, Self::Error>
-        where V: de::Visitor,
-    {
-        visitor.visit_newtype_struct(self)
-    }
-
     #[inline]
     fn format() -> &'static str {
         "json"
     }
 }
 
-struct VariantDeserializer<'a> {
-    de: &'a mut Deserializer,
-    val: Option<Value>,
-    variant: Option<Value>,
-}
-
-impl<'a> de::VariantVisitor for VariantDeserializer<'a> {
-    type Error = Error;
-
-    fn visit_variant<V>(&mut self) -> Result<V, Error>
-        where V: de::Deserialize,
-    {
-        de::Deserialize::deserialize(&mut Deserializer::new(self.variant.take().unwrap()))
-    }
-
-    fn visit_unit(&mut self) -> Result<(), Error> {
-        de::Deserialize::deserialize(&mut Deserializer::new(self.val.take().unwrap()))
-    }
-
-    fn visit_newtype<T>(&mut self) -> Result<T, Error>
-        where T: de::Deserialize,
-    {
-        de::Deserialize::deserialize(&mut Deserializer::new(self.val.take().unwrap()))
-    }
-
-    fn visit_tuple<V>(&mut self,
-                      _len: usize,
-                      visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        if let Value::Array(fields) = self.val.take().unwrap() {
-            de::Deserializer::visit(
-                &mut SeqDeserializer {
-                    de: self.de,
-                    len: fields.len(),
-                    iter: fields.into_iter(),
-                },
-                visitor,
-            )
-        } else {
-            Err(de::Error::syntax("expected a tuple"))
-        }
-    }
-
-    fn visit_struct<V>(&mut self,
-                       _fields: &'static[&'static str],
-                       visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        if let Value::Object(fields) = self.val.take().unwrap() {
-            de::Deserializer::visit(
-                &mut MapDeserializer {
-                    de: self.de,
-                    len: fields.len(),
-                    iter: fields.into_iter(),
-                    value: None,
-                },
-                visitor,
-            )
-        } else {
-            Err(de::Error::syntax("expected a struct"))
-        }
-    }
-}
-
 struct SeqDeserializer<'a> {
     de: &'a mut Deserializer,
     iter: vec::IntoIter<Value>,
@@ -843,7 +752,7 @@ impl<'a> de::SeqVisitor for SeqDeserializer<'a> {
         if self.len == 0 {
             Ok(())
         } else {
-            Err(de::Error::length_mismatch(self.len))
+            Err(de::Error::end_of_stream_error())
         }
     }
 
@@ -852,6 +761,33 @@ impl<'a> de::SeqVisitor for SeqDeserializer<'a> {
     }
 }
 
+impl<'a> de::VariantVisitor for SeqDeserializer<'a> {
+    type Error = Error;
+
+    fn visit_variant<V>(&mut self) -> Result<V, Error>
+        where V: de::Deserialize,
+    {
+        de::Deserialize::deserialize(self.de)
+    }
+
+    fn visit_unit(&mut self) -> Result<(), Error>
+    {
+        de::Deserialize::deserialize(self)
+    }
+
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, Error>
+        where V: de::Visitor,
+    {
+        de::Deserializer::visit(self, visitor)
+    }
+
+    fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, Error>
+        where V: de::Visitor,
+    {
+        de::Deserializer::visit(self, visitor)
+    }
+}
+
 struct MapDeserializer<'a> {
     de: &'a mut Deserializer,
     iter: btree_map::IntoIter<String, Value>,
@@ -888,7 +824,7 @@ impl<'a> de::MapVisitor for MapDeserializer<'a> {
         if self.len == 0 {
             Ok(())
         } else {
-            Err(de::Error::length_mismatch(self.len))
+            Err(de::Error::end_of_stream_error())
         }
     }
 
@@ -929,10 +865,38 @@ impl<'a> de::Deserializer for MapDeserializer<'a> {
     fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
+        println!("MapDeserializer!");
         visitor.visit_map(self)
     }
 }
 
+impl<'a> de::VariantVisitor for MapDeserializer<'a> {
+    type Error = Error;
+
+    fn visit_variant<V>(&mut self) -> Result<V, Error>
+        where V: de::Deserialize,
+    {
+        self.de.value = self.value.take();
+        de::Deserialize::deserialize(self.de)
+    }
+
+    fn visit_unit(&mut self) -> Result<(), Error> {
+        de::Deserialize::deserialize(self)
+    }
+
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, Error>
+        where V: de::Visitor,
+    {
+        de::Deserializer::visit(self, visitor)
+    }
+
+    fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, Error>
+        where V: de::Visitor,
+    {
+        de::Deserializer::visit(self, visitor)
+    }
+}
+
 /// Shortcut function to encode a `T` into a JSON `Value`
 pub fn to_value<T>(value: &T) -> Value
     where T: ser::Serialize

serde/src/lib.rs

@@ -5,21 +5,15 @@
 //! handshake protocol between serializers and serializees can be completely optimized away,
 //! leaving serde to perform roughly the same speed as a hand written serializer for a specific
 //! type.
-#![doc(html_root_url="https://serde-rs.github.io/serde/serde")]
-#![cfg_attr(feature = "nightly", feature(collections, core, enumset, nonzero, step_trait, zero_one))]
+#![doc(html_root_url="http://erickt.github.io/rust-serde")]
 
 extern crate num;
 
-#[cfg(feature = "nightly")]
-extern crate collections;
-
-#[cfg(feature = "nightly")]
-extern crate core;
-
 pub use ser::{Serialize, Serializer};
 pub use de::{Deserialize, Deserializer, Error};
 
 pub mod bytes;
 pub mod de;
 pub mod iter;
+pub mod json;
 pub mod ser;

serde/src/ser/impls.rs

@@ -1,29 +1,9 @@
-use std::borrow::Cow;
-use std::collections::{
-    BinaryHeap,
-    BTreeMap,
-    BTreeSet,
-    LinkedList,
-    HashMap,
-    HashSet,
-    VecDeque,
-};
-#[cfg(feature = "nightly")]
-use collections::enum_set::{CLike, EnumSet};
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::hash::Hash;
-#[cfg(feature = "nightly")]
-use std::iter;
-#[cfg(feature = "nightly")]
-use std::num;
-#[cfg(feature = "nightly")]
-use std::ops;
 use std::path;
 use std::rc::Rc;
 use std::sync::Arc;
 
-#[cfg(feature = "nightly")]
-use core::nonzero::{NonZero, Zeroable};
-
 use super::{
     Serialize,
     Serializer,
@@ -95,26 +75,6 @@ impl<T> Serialize for Option<T> where T: Serialize {
     }
 }
 
-impl<T> SeqVisitor for Option<T> where T: Serialize {
-    #[inline]
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: Serializer,
-    {
-        match self.take() {
-            Some(value) => {
-                try!(serializer.visit_seq_elt(value));
-                Ok(Some(()))
-            }
-            None => Ok(None),
-        }
-    }
-
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        Some(if self.is_some() { 1 } else { 0 })
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 pub struct SeqIteratorVisitor<Iter> {
@@ -144,8 +104,8 @@ impl<T, Iter> SeqVisitor for SeqIteratorVisitor<Iter>
     {
         match self.iter.next() {
             Some(value) => {
-                try!(serializer.visit_seq_elt(value));
-                Ok(Some(()))
+                let value = try!(serializer.visit_seq_elt(value));
+                Ok(Some(value))
             }
             None => Ok(None),
         }
@@ -159,7 +119,7 @@ impl<T, Iter> SeqVisitor for SeqIteratorVisitor<Iter>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<T> Serialize for [T]
+impl<'a, T> Serialize for &'a [T]
     where T: Serialize,
 {
     #[inline]
@@ -217,16 +177,12 @@ array_impls!(30);
 array_impls!(31);
 array_impls!(32);
 
-///////////////////////////////////////////////////////////////////////////////
-
-impl<T> Serialize for BinaryHeap<T>
-    where T: Serialize + Ord
-{
+impl<T> Serialize for Vec<T> where T: Serialize {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
+        (&self[..]).serialize(serializer)
     }
 }
 
@@ -241,18 +197,6 @@ impl<T> Serialize for BTreeSet<T>
     }
 }
 
-#[cfg(feature = "nightly")]
-impl<T> Serialize for EnumSet<T>
-    where T: Serialize + CLike
-{
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
-}
-
 impl<T> Serialize for HashSet<T>
     where T: Serialize + Eq + Hash,
 {
@@ -264,49 +208,6 @@ impl<T> Serialize for HashSet<T>
     }
 }
 
-impl<T> Serialize for LinkedList<T>
-    where T: Serialize,
-{
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
-}
-
-#[cfg(feature = "nightly")]
-impl<A> Serialize for ops::Range<A>
-    where A: Serialize + Clone + iter::Step + num::One,
-          for<'a> &'a A: ops::Add<&'a A, Output = A>,
-{
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        let len = iter::Step::steps_between(&self.start, &self.end, &A::one());
-        serializer.visit_seq(SeqIteratorVisitor::new(self.clone(), len))
-    }
-}
-
-impl<T> Serialize for Vec<T> where T: Serialize {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        (&self[..]).serialize(serializer)
-    }
-}
-
-impl<T> Serialize for VecDeque<T> where T: Serialize {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 impl Serialize for () {
@@ -356,7 +257,7 @@ macro_rules! tuple_impls {
                         $(
                             $state => {
                                 self.state += 1;
-                                Ok(Some(try!(serializer.visit_tuple_elt(&e!(self.tuple.$idx)))))
+                                Ok(Some(try!(serializer.visit_seq_elt(&e!(self.tuple.$idx)))))
                             }
                         )+
                         _ => {
@@ -375,7 +276,7 @@ macro_rules! tuple_impls {
             {
                 #[inline]
                 fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error> {
-                    serializer.visit_tuple($TupleVisitor::new(self))
+                    serializer.visit_seq($TupleVisitor::new(self))
                 }
             }
         )+
@@ -556,6 +457,20 @@ impl<K, V> Serialize for HashMap<K, V>
     }
 }
 
+// FIXME: `VecMap` is unstable.
+/*
+impl<V> Serialize for VecMap<V>
+    where V: Serialize,
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        serializer.visit_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
+    }
+}
+*/
+
 ///////////////////////////////////////////////////////////////////////////////
 
 impl<'a, T: ?Sized> Serialize for &'a T where T: Serialize {
@@ -603,30 +518,6 @@ impl<T> Serialize for Arc<T> where T: Serialize, {
     }
 }
 
-impl<'a, T: ?Sized> Serialize for Cow<'a, T> where T: Serialize + ToOwned, {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        (**self).serialize(serializer)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
-        match *self {
-            Result::Ok(ref value) => {
-                serializer.visit_newtype_variant("Result", 0, "Ok", value)
-            }
-            Result::Err(ref value) => {
-                serializer.visit_newtype_variant("Result", 1, "Err", value)
-            }
-        }
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 impl Serialize for path::Path {
@@ -644,10 +535,3 @@ impl Serialize for path::PathBuf {
         self.to_str().unwrap().serialize(serializer)
     }
 }
-
-#[cfg(feature = "nightly")]
-impl<T> Serialize for NonZero<T> where T: Serialize + Zeroable {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
-        (**self).serialize(serializer)
-    }
-}

serde/src/ser/mod.rs

@@ -113,48 +113,17 @@ pub trait Serializer {
     fn visit_unit(&mut self) -> Result<(), Self::Error>;
 
     #[inline]
-    fn visit_unit_struct(&mut self, _name: &'static str) -> Result<(), Self::Error> {
+    fn visit_named_unit(&mut self, _name: &str) -> Result<(), Self::Error> {
         self.visit_unit()
     }
 
     #[inline]
-    fn visit_unit_variant(&mut self,
-                          _name: &'static str,
-                          _variant_index: usize,
-                          _variant: &'static str) -> Result<(), Self::Error> {
+    fn visit_enum_unit(&mut self,
+                       _name: &str,
+                       _variant: &str) -> Result<(), Self::Error> {
         self.visit_unit()
     }
 
-    /// The `visit_newtype_struct` allows a tuple struct with a single element, also known as a
-    /// newtyped value, to be more efficiently serialized than a tuple struct with multiple items.
-    /// By default it just serializes the value as a tuple struct sequence.
-    #[inline]
-    fn visit_newtype_struct<T>(&mut self,
-                               name: &'static str,
-                               value: T) -> Result<(), Self::Error>
-        where T: Serialize,
-    {
-        self.visit_tuple_struct(name, Some(value))
-    }
-
-    /// The `visit_newtype_variant` allows a variant with a single item to be more efficiently
-    /// serialized than a variant with multiple items. By default it just serializes the value as a
-    /// tuple variant sequence.
-    #[inline]
-    fn visit_newtype_variant<T>(&mut self,
-                                name: &'static str,
-                                variant_index: usize,
-                                variant: &'static str,
-                                value: T) -> Result<(), Self::Error>
-        where T: Serialize,
-    {
-        self.visit_tuple_variant(
-            name,
-            variant_index,
-            variant,
-            Some(value))
-    }
-
     fn visit_none(&mut self) -> Result<(), Self::Error>;
 
     fn visit_some<V>(&mut self, value: V) -> Result<(), Self::Error>
@@ -163,101 +132,53 @@ pub trait Serializer {
     fn visit_seq<V>(&mut self, visitor: V) -> Result<(), Self::Error>
         where V: SeqVisitor;
 
-    fn visit_seq_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize;
-
     #[inline]
-    fn visit_tuple<V>(&mut self, visitor: V) -> Result<(), Self::Error>
+    fn visit_named_seq<V>(&mut self,
+                          _name: &'static str,
+                          visitor: V) -> Result<(), Self::Error>
         where V: SeqVisitor,
     {
         self.visit_seq(visitor)
     }
 
     #[inline]
-    fn visit_tuple_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize
-    {
-        self.visit_seq_elt(value)
-    }
-
-    #[inline]
-    fn visit_tuple_struct<V>(&mut self,
-                             _name: &'static str,
-                             visitor: V) -> Result<(), Self::Error>
+    fn visit_enum_seq<V>(&mut self,
+                         _name: &'static str,
+                         _variant: &'static str,
+                         visitor: V) -> Result<(), Self::Error>
         where V: SeqVisitor,
     {
-        self.visit_tuple(visitor)
+        self.visit_seq(visitor)
     }
 
-    #[inline]
-    fn visit_tuple_struct_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize
-    {
-        self.visit_tuple_elt(value)
-    }
-
-    #[inline]
-    fn visit_tuple_variant<V>(&mut self,
-                              _name: &'static str,
-                              _variant_index: usize,
-                              variant: &'static str,
-                              visitor: V) -> Result<(), Self::Error>
-        where V: SeqVisitor,
-    {
-        self.visit_tuple_struct(variant, visitor)
-    }
-
-    #[inline]
-    fn visit_tuple_variant_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize
-    {
-        self.visit_tuple_struct_elt(value)
-    }
+    fn visit_seq_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
+        where T: Serialize;
 
     fn visit_map<V>(&mut self, visitor: V) -> Result<(), Self::Error>
         where V: MapVisitor;
 
-    fn visit_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Self::Error>
-        where K: Serialize,
-              V: Serialize;
-
     #[inline]
-    fn visit_struct<V>(&mut self,
-                       _name: &'static str,
-                       visitor: V) -> Result<(), Self::Error>
+    fn visit_named_map<V>(&mut self,
+                          _name: &'static str,
+                          visitor: V) -> Result<(), Self::Error>
         where V: MapVisitor,
     {
         self.visit_map(visitor)
     }
 
     #[inline]
-    fn visit_struct_elt<V>(&mut self,
-                           key: &'static str,
-                           value: V) -> Result<(), Self::Error>
-        where V: Serialize,
-    {
-        self.visit_map_elt(key, value)
-    }
-
-    #[inline]
-    fn visit_struct_variant<V>(&mut self,
-                               _name: &'static str,
-                               _variant_index: usize,
-                               variant: &'static str,
-                               visitor: V) -> Result<(), Self::Error>
+    fn visit_enum_map<V>(&mut self,
+                          _name: &'static str,
+                          _variant: &'static str,
+                          visitor: V) -> Result<(), Self::Error>
         where V: MapVisitor,
     {
-        self.visit_struct(variant, visitor)
+        self.visit_map(visitor)
     }
 
-    #[inline]
-    fn visit_struct_variant_elt<V>(&mut self,
-                                   key: &'static str,
-                                   value: V) -> Result<(), Self::Error>
-        where V: Serialize,
-    {
-        self.visit_struct_elt(key, value)
-    }
+    fn visit_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Self::Error>
+        where K: Serialize,
+              V: Serialize;
 
     /// Specify a format string for the serializer.
     ///

serde_codegen/Cargo.toml

@@ -1,18 +1,16 @@
 [package]
 name = "serde_codegen"
-version = "0.5.1"
+version = "0.4.2"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
-repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde-rs.github.io/serde/serde_codegen/serde_codegen/index.html"
+repository = "https://github.com/erickt/rust-serde"
 build = "build.rs"
-keywords = ["serde", "serialization"]
 
 [features]
 default = ["with-syntex"]
 nightly = ["quasi_macros"]
-with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
+with-syntex = ["quasi/with-syntex", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
 
 [build-dependencies]
 quasi_codegen = { verision = "*", optional = true }

serde_codegen/src/attr.rs

@@ -16,20 +16,15 @@ pub enum FieldNames {
 
 /// Represents field attribute information
 pub struct FieldAttrs {
-    skip_serializing_field: bool,
     names: FieldNames,
     use_default: bool,
 }
 
 impl FieldAttrs {
+
     /// Create a FieldAttr with a single default field name
-    pub fn new(
-        skip_serializing_field: bool,
-        default_value: bool,
-        name: P<ast::Expr>,
-    ) -> FieldAttrs {
+    pub fn new(default_value: bool, name: P<ast::Expr>) -> FieldAttrs {
         FieldAttrs {
-            skip_serializing_field: skip_serializing_field,
             names: FieldNames::Global(name),
             use_default: default_value,
         }
@@ -37,14 +32,12 @@ impl FieldAttrs {
 
     /// Create a FieldAttr with format specific field names
     pub fn new_with_formats(
-        skip_serializing_field: bool,
         default_value: bool,
         default_name: P<ast::Expr>,
         formats: HashMap<P<ast::Expr>, P<ast::Expr>>,
-    ) -> FieldAttrs {
+        ) -> FieldAttrs {
         FieldAttrs {
-            skip_serializing_field: skip_serializing_field,
-            names: FieldNames::Format {
+            names:  FieldNames::Format {
                 formats: formats,
                 default: default_name,
             },
@@ -112,9 +105,4 @@ impl FieldAttrs {
     pub fn use_default(&self) -> bool {
         self.use_default
     }
-
-    /// Predicate for ignoring a field when serializing a value
-    pub fn skip_serializing_field(&self) -> bool {
-        self.skip_serializing_field
-    }
 }

serde_codegen/src/de.rs

@@ -129,24 +129,15 @@ fn deserialize_item_struct(
         }
     }
 
-    match (named_fields.is_empty(), unnamed_fields) {
-        (true, 0) => {
+    match (named_fields.is_empty(), unnamed_fields == 0) {
+        (true, true) => {
             deserialize_unit_struct(
                 cx,
                 &builder,
                 item.ident,
             )
         }
-        (true, 1) => {
-            deserialize_newtype_struct(
-                cx,
-                &builder,
-                item.ident,
-                impl_generics,
-                ty,
-            )
-        }
-        (true, _) => {
+        (true, false) => {
             deserialize_tuple_struct(
                 cx,
                 &builder,
@@ -156,7 +147,7 @@ fn deserialize_item_struct(
                 unnamed_fields,
             )
         }
-        (false, 0) => {
+        (false, true) => {
             deserialize_struct(
                 cx,
                 &builder,
@@ -166,7 +157,7 @@ fn deserialize_item_struct(
                 struct_def,
             )
         }
-        (false, _) => {
+        (false, false) => {
             cx.bug("struct has named and unnamed fields")
         }
     }
@@ -199,25 +190,11 @@ fn deserialize_visitor(
         (
             builder.item().tuple_struct("__Visitor")
                 .generics().with(trait_generics.clone()).build()
-                .with_tys({
-                    let lifetimes = trait_generics.lifetimes.iter()
-                        .map(|lifetime_def| {
-                            builder.ty()
-                                .phantom_data()
-                                .ref_().lifetime(lifetime_def.lifetime.name)
-                                .ty()
-                                .unit()
-                        });
-
-                    let ty_params = trait_generics.ty_params.iter()
-                        .map(|ty_param| {
-                            builder.ty()
-                                .phantom_data()
-                                .id(ty_param.ident)
-                        });
-
-                    lifetimes.chain(ty_params)
-                })
+                .with_tys(
+                    trait_generics.ty_params.iter().map(|ty_param| {
+                        builder.ty().phantom_data().id(ty_param.ident)
+                    })
+                )
                 .build(),
             builder.ty().path()
                 .segment("__Visitor").with_generics(trait_generics.clone()).build()
@@ -227,11 +204,11 @@ fn deserialize_visitor(
                 .with_tys(forward_tys)
                 .with_tys(placeholders)
                 .build().build()
-                .with_args({
-                    let len = trait_generics.lifetimes.len() + trait_generics.ty_params.len();
-
-                    (0 .. len).map(|_| builder.expr().phantom_data())
-                })
+                .with_args(
+                    trait_generics.ty_params.iter().map(|_| {
+                        builder.expr().phantom_data()
+                    })
+                )
                 .build(),
             trait_generics,
         )
@@ -283,59 +260,7 @@ fn deserialize_unit_struct(
             }
         }
 
-        deserializer.visit_unit_struct($type_name, __Visitor)
-    })
-}
-
-fn deserialize_newtype_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    type_ident: Ident,
-    impl_generics: &ast::Generics,
-    ty: P<ast::Ty>,
-) -> P<ast::Expr> {
-    let where_clause = &impl_generics.where_clause;
-
-    let (visitor_item, visitor_ty, visitor_expr, visitor_generics) =
-        deserialize_visitor(
-            builder,
-            impl_generics,
-            vec![deserializer_ty_param(builder)],
-            vec![deserializer_ty_arg(builder)],
-        );
-
-    let visit_seq_expr = deserialize_seq(
-        cx,
-        builder,
-        builder.path().id(type_ident).build(),
-        1,
-    );
-
-    let type_name = builder.expr().str(type_ident);
-
-    quote_expr!(cx, {
-        $visitor_item
-
-        impl $visitor_generics ::serde::de::Visitor for $visitor_ty $where_clause {
-            type Value = $ty;
-
-            #[inline]
-            fn visit_newtype_struct<D>(&mut self, deserializer: &mut D) -> ::std::result::Result<Self::Value, D::Error>
-                where D: ::serde::de::Deserializer,
-            {
-                let value = try!(::serde::de::Deserialize::deserialize(deserializer));
-                Ok($type_ident(value))
-            }
-
-            #[inline]
-            fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
-                where __V: ::serde::de::SeqVisitor,
-            {
-                $visit_seq_expr
-            }
-        }
-
-        deserializer.visit_newtype_struct($type_name, $visitor_expr)
+        deserializer.visit_named_unit($type_name, __Visitor)
     })
 }
 
@@ -372,7 +297,6 @@ fn deserialize_tuple_struct(
         impl $visitor_generics ::serde::de::Visitor for $visitor_ty $where_clause {
             type Value = $ty;
 
-            #[inline]
             fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
                 where __V: ::serde::de::SeqVisitor,
             {
@@ -380,7 +304,7 @@ fn deserialize_tuple_struct(
             }
         }
 
-        deserializer.visit_tuple_struct($type_name, $fields, $visitor_expr)
+        deserializer.visit_named_seq($type_name, $visitor_expr)
     })
 }
 
@@ -397,7 +321,7 @@ fn deserialize_seq(
                 let $name = match try!(visitor.visit()) {
                     Some(value) => { value },
                     None => {
-                        return Err(::serde::de::Error::end_of_stream());
+                        return Err(::serde::de::Error::end_of_stream_error());
                     }
                 };
             ).unwrap()
@@ -418,51 +342,6 @@ fn deserialize_seq(
     })
 }
 
-fn deserialize_struct_as_seq(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    struct_path: ast::Path,
-    struct_def: &StructDef,
-) -> P<ast::Expr> {
-    let let_values: Vec<P<ast::Stmt>> = (0 .. struct_def.fields.len())
-        .map(|i| {
-            let name = builder.id(format!("__field{}", i));
-            quote_stmt!(cx,
-                let $name = match try!(visitor.visit()) {
-                    Some(value) => { value },
-                    None => {
-                        return Err(::serde::de::Error::end_of_stream());
-                    }
-                };
-            ).unwrap()
-        })
-        .collect();
-
-    let result = builder.expr().struct_path(struct_path)
-        .with_id_exprs(
-            struct_def.fields.iter()
-                .enumerate()
-                .map(|(i, field)| {
-                    (
-                        match field.node.kind {
-                            ast::NamedField(name, _) => name.clone(),
-                            ast::UnnamedField(_) => panic!("struct contains unnamed fields"),
-                        },
-                        builder.expr().id(format!("__field{}", i)),
-                    )
-                })
-        )
-        .build();
-
-    quote_expr!(cx, {
-        $let_values
-
-        try!(visitor.end());
-
-        Ok($result)
-    })
-}
-
 fn deserialize_struct(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
@@ -473,27 +352,19 @@ fn deserialize_struct(
 ) -> P<ast::Expr> {
     let where_clause = &impl_generics.where_clause;
 
-    let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = deserialize_visitor(
-        builder,
-        &impl_generics,
-        vec![deserializer_ty_param(builder)],
-        vec![deserializer_ty_arg(builder)],
-    );
+    let (visitor_item, visitor_ty, visitor_expr, visitor_generics) =
+        deserialize_visitor(
+            builder,
+            &impl_generics,
+            vec![deserializer_ty_param(builder)],
+            vec![deserializer_ty_arg(builder)],
+                );
 
-    let type_path = builder.path().id(type_ident).build();
-
-    let visit_seq_expr = deserialize_struct_as_seq(
-        cx,
-        builder,
-        type_path.clone(),
-        struct_def
-    );
-
-    let (field_visitor, fields_stmt, visit_map_expr) = deserialize_struct_visitor(
+    let (field_visitor, visit_map_expr) = deserialize_struct_visitor(
         cx,
         builder,
         struct_def,
-        type_path.clone()
+        builder.path().id(type_ident).build(),
     );
 
     let type_name = builder.expr().str(type_ident);
@@ -506,13 +377,6 @@ fn deserialize_struct(
         impl $visitor_generics ::serde::de::Visitor for $visitor_ty $where_clause {
             type Value = $ty;
 
-            #[inline]
-            fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
-                where __V: ::serde::de::SeqVisitor,
-            {
-                $visit_seq_expr
-            }
-
             #[inline]
             fn visit_map<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
                 where __V: ::serde::de::MapVisitor,
@@ -521,9 +385,7 @@ fn deserialize_struct(
             }
         }
 
-        $fields_stmt
-
-        deserializer.visit_struct($type_name, FIELDS, $visitor_expr)
+        deserializer.visit_named_map($type_name, $visitor_expr)
     })
 }
 
@@ -545,25 +407,11 @@ fn deserialize_item_enum(
         enum_def.variants.iter()
             .map(|variant|
                  attr::FieldAttrs::new(
-                     false,
                      true,
                      builder.expr().str(variant.node.name)))
             .collect()
     );
 
-    let variants_expr = builder.expr().addr_of().slice()
-        .with_exprs(
-            enum_def.variants.iter()
-                .map(|variant| {
-                    builder.expr().str(variant.node.name)
-                })
-        )
-        .build();
-
-    let variants_stmt = quote_stmt!(cx,
-        const VARIANTS: &'static [&'static str] = $variants_expr;
-    ).unwrap();
-
     // Match arms to extract a variant from a string
     let variant_arms: Vec<_> = enum_def.variants.iter()
         .enumerate()
@@ -610,9 +458,7 @@ fn deserialize_item_enum(
             }
         }
 
-        $variants_stmt
-
-        deserializer.visit_enum($type_name, VARIANTS, $visitor_expr)
+        deserializer.visit_enum($type_name, $visitor_expr)
     })
 }
 
@@ -633,12 +479,6 @@ fn deserialize_variant(
                 Ok($type_ident::$variant_ident)
             })
         }
-        ast::TupleVariantKind(ref args) if args.len() == 1 => {
-            quote_expr!(cx, {
-                let val = try!(visitor.visit_newtype());
-                Ok($type_ident::$variant_ident(val))
-            })
-        }
         ast::TupleVariantKind(ref args) => {
             deserialize_tuple_variant(
                 cx,
@@ -703,7 +543,7 @@ fn deserialize_tuple_variant(
             }
         }
 
-        visitor.visit_tuple($fields, $visitor_expr)
+        visitor.visit_seq($visitor_expr)
     })
 }
 
@@ -718,23 +558,11 @@ fn deserialize_struct_variant(
 ) -> P<ast::Expr> {
     let where_clause = &generics.where_clause;
 
-    let type_path = builder.path()
-        .id(type_ident)
-        .id(variant_ident)
-        .build();
-
-    let visit_seq_expr = deserialize_struct_as_seq(
-        cx,
-        builder,
-        type_path.clone(),
-        struct_def
-    );
-
-    let (field_visitor, fields_stmt, field_expr) = deserialize_struct_visitor(
+    let (field_visitor, field_expr) = deserialize_struct_visitor(
         cx,
         builder,
         struct_def,
-        type_path
+        builder.path().id(type_ident).id(variant_ident).build(),
     );
 
     let (visitor_item, visitor_ty, visitor_expr, visitor_generics) =
@@ -753,14 +581,6 @@ fn deserialize_struct_variant(
         impl $visitor_generics ::serde::de::Visitor for $visitor_ty $where_clause {
             type Value = $ty;
 
-            #[inline]
-            fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
-                where __V: ::serde::de::SeqVisitor,
-            {
-                $visit_seq_expr
-            }
-
-            #[inline]
             fn visit_map<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
                 where __V: ::serde::de::MapVisitor,
             {
@@ -768,9 +588,7 @@ fn deserialize_struct_variant(
             }
         }
 
-        $fields_stmt
-
-        visitor.visit_struct(FIELDS, $visitor_expr)
+        visitor.visit_map($visitor_expr)
     })
 }
 
@@ -794,20 +612,6 @@ fn deserialize_field_visitor(
         )
         .build();
 
-    let index_field_arms: Vec<_> = field_idents.iter()
-        .enumerate()
-        .map(|(field_index, field_ident)| {
-            quote_arm!(cx, $field_index => { Ok(__Field::$field_ident) })
-        })
-        .collect();
-
-    let index_body = quote_expr!(cx,
-        match value {
-            $index_field_arms
-            _ => { Err(::serde::de::Error::syntax("expected a field")) }
-        }
-    );
-
     // A set of all the formats that have specialized field attributes
     let formats = field_attrs.iter()
         .fold(HashSet::new(), |mut set, field_expr| {
@@ -824,15 +628,15 @@ fn deserialize_field_visitor(
         })
         .collect();
 
-    let str_body = if formats.is_empty() {
+    let body = if formats.is_empty() {
         // No formats specific attributes, so no match on format required
         quote_expr!(cx,
-            match value {
-                $default_field_arms
-                _ => { Err(::serde::de::Error::unknown_field(value)) }
-            })
+                    match value {
+                        $default_field_arms
+                        _ => { Err(::serde::de::Error::unknown_field_error(value)) }
+                    })
     } else {
-        let field_arms: Vec<_> = formats.iter()
+        let field_arms : Vec<_> = formats.iter()
             .map(|fmt| {
                 field_idents.iter()
                     .zip(field_attrs.iter())
@@ -844,28 +648,27 @@ fn deserialize_field_visitor(
             })
             .collect();
 
-        let fmt_matches: Vec<_> = formats.iter()
+        let fmt_matches : Vec<_> = formats.iter()
             .zip(field_arms.iter())
             .map(|(ref fmt, ref arms)| {
                 quote_arm!(cx, $fmt => {
                     match value {
                         $arms
                         _ => {
-                            Err(::serde::de::Error::unknown_field(value))
+                            Err(::serde::de::Error::unknown_field_error(value))
                         }
                     }})
             })
             .collect();
 
         quote_expr!(cx,
-            match __D::format() {
-                $fmt_matches
-                _ => match value {
-                    $default_field_arms
-                    _ => { Err(::serde::de::Error::unknown_field(value)) }
-                }
-            }
-        )
+                    match __D::format() {
+                        $fmt_matches
+                        _ => match value {
+                            $default_field_arms
+                            _ => { Err(::serde::de::Error::unknown_field_error(value)) }
+                        }
+                    })
     };
 
     let impl_item = quote_item!(cx,
@@ -885,16 +688,10 @@ fn deserialize_field_visitor(
                 {
                     type Value = __Field;
 
-                    fn visit_usize<E>(&mut self, value: usize) -> ::std::result::Result<__Field, E>
-                        where E: ::serde::de::Error,
-                    {
-                        $index_body
-                    }
-
                     fn visit_str<E>(&mut self, value: &str) -> ::std::result::Result<__Field, E>
                         where E: ::serde::de::Error,
                     {
-                        $str_body
+                        $body
                     }
 
                     fn visit_bytes<E>(&mut self, value: &[u8]) -> ::std::result::Result<__Field, E>
@@ -903,18 +700,13 @@ fn deserialize_field_visitor(
                         // TODO: would be better to generate a byte string literal match
                         match ::std::str::from_utf8(value) {
                             Ok(s) => self.visit_str(s),
-                            _ => {
-                                Err(
-                                    ::serde::de::Error::syntax(
-                                        "could not convert a byte string to a String"
-                                    )
-                                )
-                            }
+                            _ => Err(::serde::de::Error::syntax_error()),
                         }
                     }
                 }
 
-                deserializer.visit(__FieldVisitor::<D>{ phantom: PhantomData })
+                deserializer.visit(
+                    __FieldVisitor::<D>{ phantom: PhantomData })
             }
         }
     ).unwrap();
@@ -927,7 +719,7 @@ fn deserialize_struct_visitor(
     builder: &aster::AstBuilder,
     struct_def: &ast::StructDef,
     struct_path: ast::Path,
-) -> (Vec<P<ast::Item>>, P<ast::Stmt>, P<ast::Expr>) {
+) -> (Vec<P<ast::Item>>, P<ast::Expr>) {
     let field_visitor = deserialize_field_visitor(
         cx,
         builder,
@@ -941,23 +733,7 @@ fn deserialize_struct_visitor(
         struct_def,
     );
 
-    let fields_expr = builder.expr().addr_of().slice()
-        .with_exprs(
-            struct_def.fields.iter()
-                .map(|field| {
-                    match field.node.kind {
-                        ast::NamedField(name, _) => builder.expr().str(name),
-                        ast::UnnamedField(_) => panic!("struct contains unnamed fields"),
-                    }
-                })
-        )
-        .build();
-
-    let fields_stmt = quote_stmt!(cx,
-        const FIELDS: &'static [&'static str] = $fields_expr;
-    ).unwrap();
-
-    (field_visitor, fields_stmt, visit_map_expr)
+    (field_visitor, visit_map_expr)
 }
 
 fn deserialize_map(

serde_codegen/src/field.rs

@@ -58,18 +58,10 @@ fn default_value(mi: &ast::MetaItem) -> bool {
     }
 }
 
-fn skip_serializing_field(mi: &ast::MetaItem) -> bool {
-    if let ast::MetaItem_::MetaWord(ref n) = mi.node {
-        n == &"skip_serializing"
-    } else {
-        false
-    }
-}
-
 fn field_attrs<'a>(
     builder: &aster::AstBuilder,
     field: &'a ast::StructField,
-) -> (Rename<'a>, bool, bool) {
+) -> (Rename<'a>, bool) {
     field.node.attrs.iter()
         .find(|sa| {
             if let ast::MetaList(ref n, _) = sa.node.value.node {
@@ -81,18 +73,15 @@ fn field_attrs<'a>(
         .and_then(|sa| {
             if let ast::MetaList(_, ref vals) = sa.node.value.node {
                 attr::mark_used(&sa);
-                Some((
-                    vals.iter()
-                        .fold(None, |v, mi| v.or(rename(builder, mi)))
-                        .unwrap_or(Rename::None),
-                    vals.iter().any(|mi| default_value(mi)),
-                    vals.iter().any(|mi| skip_serializing_field(mi)),
-                ))
+                Some((vals.iter()
+                      .fold(None, |v, mi| v.or(rename(builder, mi)))
+                      .unwrap_or(Rename::None),
+                      vals.iter().any(|mi| default_value(mi))))
             } else {
-                Some((Rename::None, false, false))
+                Some((Rename::None, false))
             }
         })
-        .unwrap_or((Rename::None, false, false))
+        .unwrap_or((Rename::None, false))
 }
 
 pub fn struct_field_attrs(
@@ -103,26 +92,23 @@ pub fn struct_field_attrs(
     struct_def.fields.iter()
         .map(|field| {
             match field_attrs(builder, field) {
-                (Rename::Global(rename), default_value, skip_serializing_field) =>
+                (Rename::Global(rename), default_value) =>
                     FieldAttrs::new(
-                        skip_serializing_field,
                         default_value,
                         builder.expr().build_lit(P(rename.clone()))),
-                (Rename::Format(renames), default_value, skip_serializing_field) => {
+                (Rename::Format(renames), default_value) => {
                     let mut res = HashMap::new();
                     res.extend(
                         renames.into_iter()
                             .map(|(k,v)|
                                  (k, builder.expr().build_lit(P(v.clone())))));
                     FieldAttrs::new_with_formats(
-                        skip_serializing_field,
                         default_value,
                         default_field_name(cx, builder, field.node.kind),
                         res)
                 },
-                (Rename::None, default_value, skip_serializing_field) => {
+                (Rename::None, default_value) => {
                     FieldAttrs::new(
-                        skip_serializing_field,
                         default_value,
                         default_field_name(cx, builder, field.node.kind))
                 }

serde_codegen/src/ser.rs

@@ -55,7 +55,10 @@ pub fn expand_derive_serialize(
         &builder,
         &item,
         &impl_generics,
-        ty.clone(),
+        builder.ty()
+            .ref_()
+            .lifetime("'__a")
+            .build_ty(ty.clone()),
     );
 
     let where_clause = &impl_generics.where_clause;
@@ -124,22 +127,15 @@ fn serialize_item_struct(
         }
     }
 
-    match (named_fields.is_empty(), unnamed_fields) {
-        (true, 0) => {
+    match (named_fields.is_empty(), unnamed_fields == 0) {
+        (true, true) => {
             serialize_unit_struct(
                 cx,
                 &builder,
                 item.ident,
             )
         }
-        (true, 1) => {
-            serialize_newtype_struct(
-                cx,
-                &builder,
-                item.ident,
-            )
-        }
-        (true, _) => {
+        (true, false) => {
             serialize_tuple_struct(
                 cx,
                 &builder,
@@ -149,7 +145,7 @@ fn serialize_item_struct(
                 unnamed_fields,
             )
         }
-        (false, 0) => {
+        (false, true) => {
             serialize_struct(
                 cx,
                 &builder,
@@ -160,7 +156,7 @@ fn serialize_item_struct(
                 named_fields,
             )
         }
-        (false, _) => {
+        (false, false) => {
             cx.bug("struct has named and unnamed fields")
         }
     }
@@ -173,17 +169,7 @@ fn serialize_unit_struct(
 ) -> P<ast::Expr> {
     let type_name = builder.expr().str(type_ident);
 
-    quote_expr!(cx, serializer.visit_unit_struct($type_name))
-}
-
-fn serialize_newtype_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    type_ident: Ident
-) -> P<ast::Expr> {
-    let type_name = builder.expr().str(type_ident);
-
-    quote_expr!(cx, serializer.visit_newtype_struct($type_name, &self.0))
+    quote_expr!(cx, serializer.visit_named_unit($type_name))
 }
 
 fn serialize_tuple_struct(
@@ -198,10 +184,7 @@ fn serialize_tuple_struct(
         cx,
         builder,
         ty.clone(),
-        builder.ty()
-            .ref_()
-            .lifetime("'__a")
-            .build_ty(ty.clone()),
+        ty,
         fields,
         impl_generics,
     );
@@ -211,10 +194,10 @@ fn serialize_tuple_struct(
     quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
-        serializer.visit_tuple_struct($type_name, Visitor {
+        serializer.visit_named_seq($type_name, Visitor {
             value: self,
             state: 0,
-            _structure_ty: ::std::marker::PhantomData::<&$ty>,
+            _structure_ty: ::std::marker::PhantomData,
         })
     })
 }
@@ -232,10 +215,7 @@ fn serialize_struct(
         cx,
         builder,
         ty.clone(),
-        builder.ty()
-            .ref_()
-            .lifetime("'__a")
-            .build_ty(ty.clone()),
+        ty,
         struct_def,
         impl_generics,
         fields.iter().map(|field| quote_expr!(cx, &self.value.$field)),
@@ -246,10 +226,10 @@ fn serialize_struct(
     quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
-        serializer.visit_struct($type_name, Visitor {
+        serializer.visit_named_map($type_name, Visitor {
             value: self,
             state: 0,
-            _structure_ty: ::std::marker::PhantomData::<&$ty>,
+            _structure_ty: ::std::marker::PhantomData,
         })
     })
 }
@@ -263,8 +243,7 @@ fn serialize_item_enum(
     enum_def: &ast::EnumDef,
 ) -> P<ast::Expr> {
     let arms: Vec<ast::Arm> = enum_def.variants.iter()
-        .enumerate()
-        .map(|(variant_index, variant)| {
+        .map(|variant| {
             serialize_variant(
                 cx,
                 builder,
@@ -272,7 +251,6 @@ fn serialize_item_enum(
                 impl_generics,
                 ty.clone(),
                 variant,
-                variant_index,
             )
         })
         .collect();
@@ -291,7 +269,6 @@ fn serialize_variant(
     generics: &ast::Generics,
     ty: P<ast::Ty>,
     variant: &ast::Variant,
-    variant_index: usize,
 ) -> ast::Arm {
     let type_name = builder.expr().str(type_ident);
     let variant_ident = variant.node.name;
@@ -305,34 +282,14 @@ fn serialize_variant(
 
             quote_arm!(cx,
                 $pat => {
-                    ::serde::ser::Serializer::visit_unit_variant(
+                    ::serde::ser::Serializer::visit_enum_unit(
                         serializer,
                         $type_name,
-                        $variant_index,
                         $variant_name,
                     )
                 }
             )
-        },
-        ast::TupleVariantKind(ref args) if args.len() == 1 => {
-            let field = builder.id("__simple_value");
-            let field = builder.pat().ref_id(field);
-            let pat = builder.pat().enum_()
-                .id(type_ident).id(variant_ident).build()
-                .with_pats(Some(field).into_iter())
-                .build();
-            quote_arm!(cx,
-                $pat => {
-                    ::serde::ser::Serializer::visit_newtype_variant(
-                        serializer,
-                        $type_name,
-                        $variant_index,
-                        $variant_name,
-                        __simple_value,
-                    )
-                }
-            )
-        },
+        }
         ast::TupleVariantKind(ref args) => {
             let fields: Vec<ast::Ident> = (0 .. args.len())
                 .map(|i| builder.id(format!("__field{}", i)))
@@ -347,7 +304,6 @@ fn serialize_variant(
                 cx,
                 builder,
                 type_name,
-                variant_index,
                 variant_name,
                 generics,
                 ty,
@@ -384,7 +340,6 @@ fn serialize_variant(
                 cx,
                 builder,
                 type_name,
-                variant_index,
                 variant_name,
                 generics,
                 ty,
@@ -401,7 +356,6 @@ fn serialize_tuple_variant(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
     type_name: P<ast::Expr>,
-    variant_index: usize,
     variant_name: P<ast::Expr>,
     generics: &ast::Generics,
     structure_ty: P<ast::Ty>,
@@ -422,7 +376,7 @@ fn serialize_tuple_variant(
     let (visitor_struct, visitor_impl) = serialize_tuple_struct_visitor(
         cx,
         builder,
-        structure_ty.clone(),
+        structure_ty,
         variant_ty,
         args.len(),
         generics,
@@ -431,7 +385,9 @@ fn serialize_tuple_variant(
     let value_expr = builder.expr().tuple()
         .with_exprs(
             fields.iter().map(|field| {
-                builder.expr().id(field)
+                builder.expr()
+                    .addr_of()
+                    .id(field)
             })
         )
         .build();
@@ -439,10 +395,10 @@ fn serialize_tuple_variant(
     quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
-        serializer.visit_tuple_variant($type_name, $variant_index, $variant_name, Visitor {
+        serializer.visit_enum_seq($type_name, $variant_name, Visitor {
             value: $value_expr,
             state: 0,
-            _structure_ty: ::std::marker::PhantomData::<&$structure_ty>,
+            _structure_ty: ::std::marker::PhantomData,
         })
     })
 }
@@ -451,7 +407,6 @@ fn serialize_struct_variant(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
     type_name: P<ast::Expr>,
-    variant_index: usize,
     variant_name: P<ast::Expr>,
     generics: &ast::Generics,
     structure_ty: P<ast::Ty>,
@@ -472,7 +427,9 @@ fn serialize_struct_variant(
     let value_expr = builder.expr().tuple()
         .with_exprs(
             fields.iter().map(|field| {
-                builder.expr().id(field)
+                builder.expr()
+                    .addr_of()
+                    .id(field)
             })
         )
         .build();
@@ -480,7 +437,7 @@ fn serialize_struct_variant(
     let (visitor_struct, visitor_impl) = serialize_struct_visitor(
         cx,
         builder,
-        structure_ty.clone(),
+        structure_ty,
         value_ty,
         struct_def,
         generics,
@@ -494,10 +451,10 @@ fn serialize_struct_variant(
     quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
-        serializer.visit_struct_variant($type_name, $variant_index, $variant_name, Visitor {
+        serializer.visit_enum_map($type_name, $variant_name, Visitor {
             value: $value_expr,
             state: 0,
-            _structure_ty: ::std::marker::PhantomData::<&$structure_ty>,
+            _structure_ty: ::std::marker::PhantomData,
         })
     })
 }
@@ -519,7 +476,7 @@ fn serialize_tuple_struct_visitor(
             quote_arm!(cx,
                 $i => {
                     self.state += 1;
-                    let v = try!(serializer.visit_tuple_struct_elt(&$expr));
+                    let v = try!(serializer.visit_seq_elt(&$expr));
                     Ok(Some(v))
                 }
             )
@@ -537,12 +494,19 @@ fn serialize_tuple_struct_visitor(
         .strip_bounds()
         .build();
 
+    // Variants don't necessarily reference all generic lifetimes and type parameters,
+    // so to avoid a compilation failure, we'll just add a phantom type to capture these
+    // unused values.
+    let structure_ty = builder.ty()
+        .phantom_data()
+        .build(structure_ty);
+
     (
         quote_item!(cx,
             struct Visitor $visitor_impl_generics $where_clause {
                 state: usize,
                 value: $variant_ty,
-                _structure_ty: ::std::marker::PhantomData<&'__a $structure_ty>,
+                _structure_ty: $structure_ty,
             }
         ).unwrap(),
 
@@ -586,7 +550,6 @@ fn serialize_struct_visitor<I>(
 
     let arms: Vec<ast::Arm> = field_attrs.into_iter()
         .zip(value_exprs)
-        .filter(|&(ref field, _)| !field.skip_serializing_field())
         .enumerate()
         .map(|(i, (field, value_expr))| {
             let key_expr = field.serializer_key_expr(cx);
@@ -596,7 +559,7 @@ fn serialize_struct_visitor<I>(
                     Ok(
                         Some(
                             try!(
-                                serializer.visit_struct_elt(
+                                serializer.visit_map_elt(
                                     $key_expr,
                                     $value_expr,
                                 )
@@ -619,12 +582,19 @@ fn serialize_struct_visitor<I>(
         .strip_bounds()
         .build();
 
+    // Variants don't necessarily reference all generic lifetimes and type parameters,
+    // so to avoid a compilation failure, we'll just add a phantom type to capture these
+    // unused values.
+    let structure_ty = builder.ty()
+        .phantom_data()
+        .build(structure_ty);
+
     (
         quote_item!(cx,
             struct Visitor $visitor_impl_generics $where_clause {
                 state: usize,
                 value: $variant_ty,
-                _structure_ty: ::std::marker::PhantomData<&'__a $structure_ty>,
+                _structure_ty: $structure_ty,
             }
         ).unwrap(),
 

serde_json/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "serde_json"
-version = "0.5.1"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-license = "MIT/Apache-2.0"
-description = "A JSON serialization file format"
-repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde-rs.github.io/serde/serde_json/serde_json/index.html"
-readme = "../README.md"
-keywords = ["json", "serde", "serialization"]
-
-[dependencies]
-num = "*"
-serde = { version = "*", path = "../serde" }

serde_macros/Cargo.toml

@@ -1,12 +1,10 @@
 [package]
 name = "serde_macros"
-version = "0.5.1"
+version = "0.4.2"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
-repository = "https://github.com/serde-rs/serde"
-documentation = "https://github.com/serde-rs/serde"
-keywords = ["serde", "serialization"]
+repository = "https://github.com/erickt/rust-serde"
 
 [lib]
 name = "serde_macros"
@@ -18,5 +16,4 @@ serde_codegen = { version = "*", path = "../serde_codegen", default-features = f
 [dev-dependencies]
 num = "*"
 rustc-serialize = "*"
-serde = { version = "*", path = "../serde", features = ["nightly"] }
-serde_json = { version = "*", path = "../serde_json" }
+serde = { version = "*", path = "../serde" }

serde_macros/benches/bench.rs

@@ -4,7 +4,6 @@
 extern crate num;
 extern crate rustc_serialize;
 extern crate serde;
-extern crate serde_json;
 extern crate test;
 
 include!("../../serde_tests/benches/bench.rs.in");

serde_macros/examples/json.rs

@@ -2,9 +2,9 @@
 #![plugin(serde_macros)]
 
 extern crate serde;
-extern crate serde_json;
 
 use std::collections::BTreeMap;
+use serde::json;
 
 // Creating serializable types with serde is quite simple with `serde_macros`. It implements a
 // syntax extension that automatically generates the necessary serde trait implementations.
@@ -18,7 +18,7 @@ fn main() {
     let point = Point { x: 5, y: 6 };
 
     // Serializing to JSON is pretty simple by using the `to_string` method:
-    let serialized_point = serde_json::to_string(&point).unwrap();
+    let serialized_point = json::to_string(&point).unwrap();
 
     println!("{}", serialized_point);
     // prints:
@@ -26,7 +26,7 @@ fn main() {
     // {"x":5,"y":6}
 
     // There is also support for pretty printing using `to_string_pretty`:
-    let serialized_point = serde_json::to_string_pretty(&point).unwrap();
+    let serialized_point = json::to_string_pretty(&point).unwrap();
 
     println!("{}", serialized_point);
     // prints:
@@ -37,7 +37,7 @@ fn main() {
     // }
 
     // Values can also be deserialized with the same style using `from_str`:
-    let deserialized_point: Point = serde_json::from_str(&serialized_point).unwrap();
+    let deserialized_point: Point = json::from_str(&serialized_point).unwrap();
 
     println!("{:?}", deserialized_point);
     // prints:
@@ -46,18 +46,16 @@ fn main() {
 
     // `Point`s aren't the only type that can be serialized to. Because `Point` members have the
     // same type, they can be also serialized into a map. Also, 
-    let deserialized_map: BTreeMap<String, i64> =
-        serde_json::from_str(&serialized_point).unwrap();
+    let deserialized_map: BTreeMap<String, i64> = json::from_str(&serialized_point).unwrap();
 
     println!("{:?}", deserialized_map);
     // prints:
     //
     // {"x": 5, "y": 6}
 
-    // If you need to accept arbitrary data, you can also deserialize into `serde_json::Value`,
-    // which can represent all JSON values.
-    let deserialized_value: serde_json::Value =
-        serde_json::from_str(&serialized_point).unwrap();
+    // If you need to accept arbitrary data, you can also deserialize into `json::Value`, which
+    // can represent all JSON values.
+    let deserialized_value: json::Value = json::from_str(&serialized_point).unwrap();
 
     println!("{:?}", deserialized_value);
     // prints:

serde_macros/tests/test.rs

@@ -2,7 +2,6 @@
 #![plugin(serde_macros)]
 
 extern crate serde;
-extern crate serde_json;
 extern crate test;
 
 include!("../../serde_tests/tests/test.rs.in");

serde_tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_tests"
-version = "0.5.0"
+version = "0.4.1"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
@@ -11,7 +11,7 @@ keywords = ["serialization"]
 build = "build.rs"
 
 [build-dependencies]
-syntex = { version = "*" }
+syntex = { version = "*", optional = true }
 syntex_syntax = { version = "*" }
 serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
 
@@ -19,7 +19,6 @@ serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-sy
 num = "*"
 rustc-serialize = "*"
 serde = { version = "*", path = "../serde" }
-serde_json = { version = "*", path = "../serde_json" }
 syntex = "*"
 
 [[test]]

serde_tests/benches/bench.rs

@@ -3,7 +3,6 @@
 extern crate num;
 extern crate rustc_serialize;
 extern crate serde;
-extern crate serde_json;
 extern crate test;
 
 include!(concat!(env!("OUT_DIR"), "/bench.rs"));

serde_tests/benches/bench_enum.rs

@@ -20,13 +20,13 @@ pub enum Error {
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn syntax_error() -> Error { Error::SyntaxError }
 
-    fn end_of_stream() -> Error { Error::EndOfStreamError }
+    fn end_of_stream_error() -> Error { Error::EndOfStreamError }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field_error(_: &str) -> Error { Error::SyntaxError }
 
-    fn missing_field(_: &'static str) -> Error { Error::SyntaxError }
+    fn missing_field_error(_: &'static str) -> Error { Error::SyntaxError }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -288,10 +288,7 @@ mod deserializer {
         }
 
         #[inline]
-        fn visit_enum<V>(&mut self,
-                         _name: &str,
-                         _variants: &[&str],
-                         mut visitor: V) -> Result<V::Value, Error>
+        fn visit_enum<V>(&mut self, _name: &str, mut visitor: V) -> Result<V::Value, Error>
             where V: de::EnumVisitor,
         {
             match self.stack.pop() {
@@ -353,9 +350,7 @@ mod deserializer {
             de::Deserialize::deserialize(self.de)
         }
 
-        fn visit_tuple<V>(&mut self,
-                          _len: usize,
-                          mut visitor: V) -> Result<V::Value, Error>
+        fn visit_seq<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             visitor.visit_seq(self)

serde_tests/benches/bench_log.rs

@@ -5,9 +5,9 @@ use test::Bencher;
 use rustc_serialize;
 
 use serde::de::{self, Deserialize, Deserializer};
+use serde::json::ser::escape_str;
+use serde::json;
 use serde::ser::{self, Serialize, Serializer};
-use serde_json::ser::escape_str;
-use serde_json;
 use std::str::FromStr;
 
 use rustc_serialize::Encodable;
@@ -50,7 +50,7 @@ impl rustc_serialize::Decodable for HttpProtocol {
 
 impl FromStr for HttpProtocol {
     type Err = ();
-    fn from_str(_s: &str) -> Result<HttpProtocol, ()> { unimplemented!() }
+    fn from_str(s: &str) -> Result<HttpProtocol, ()> { unimplemented!() }
 }
 
 impl FromPrimitive for HttpProtocol {
@@ -104,7 +104,7 @@ enum HttpMethod {
 
 impl FromStr for HttpMethod {
     type Err = ();
-    fn from_str(_s: &str) -> Result<HttpMethod, ()> { unimplemented!() }
+    fn from_str(s: &str) -> Result<HttpMethod, ()> { unimplemented!() }
 }
 
 impl FromPrimitive for HttpMethod {
@@ -174,7 +174,7 @@ enum CacheStatus {
 
 impl FromStr for CacheStatus {
     type Err = ();
-    fn from_str(_s: &str) -> Result<CacheStatus, ()> { unimplemented!() }
+    fn from_str(s: &str) -> Result<CacheStatus, ()> { unimplemented!() }
 }
 
 impl FromPrimitive for CacheStatus {
@@ -244,7 +244,7 @@ enum OriginProtocol {
 
 impl FromStr for OriginProtocol {
     type Err = ();
-    fn from_str(_s: &str) -> Result<OriginProtocol, ()> { unimplemented!() }
+    fn from_str(s: &str) -> Result<OriginProtocol, ()> { unimplemented!() }
 }
 
 impl FromPrimitive for OriginProtocol {
@@ -307,7 +307,7 @@ enum ZonePlan {
 
 impl FromStr for ZonePlan {
     type Err = ();
-    fn from_str(_s: &str) -> Result<ZonePlan, ()> { unimplemented!() }
+    fn from_str(s: &str) -> Result<ZonePlan, ()> { unimplemented!() }
 }
 
 impl FromPrimitive for ZonePlan {
@@ -622,7 +622,7 @@ enum Country {
 
 impl FromStr for Country {
     type Err = ();
-    fn from_str(_s: &str) -> Result<Country, ()> { unimplemented!() }
+    fn from_str(s: &str) -> Result<Country, ()> { unimplemented!() }
 }
 
 impl FromPrimitive for Country {
@@ -1123,18 +1123,18 @@ fn bench_encoder(b: &mut Bencher) {
 #[test]
 fn test_serializer() {
     let log = Log::new();
-    let json = serde_json::to_vec(&log);
+    let json = json::to_vec(&log);
     assert_eq!(json, JSON_STR.as_bytes());
 }
 
 #[bench]
 fn bench_serializer(b: &mut Bencher) {
     let log = Log::new();
-    let json = serde_json::to_vec(&log);
+    let json = json::to_vec(&log);
     b.bytes = json.len() as u64;
 
     b.iter(|| {
-        let _ = serde_json::to_vec(&log);
+        let _ = json::to_vec(&log);
     });
 }
 
@@ -1142,7 +1142,7 @@ fn bench_serializer(b: &mut Bencher) {
 fn test_serializer_vec() {
     let log = Log::new();
     let wr = Vec::with_capacity(1024);
-    let mut serializer = serde_json::Serializer::new(wr);
+    let mut serializer = json::Serializer::new(wr);
     log.serialize(&mut serializer).unwrap();
 
     let json = serializer.into_inner();
@@ -1152,7 +1152,7 @@ fn test_serializer_vec() {
 #[bench]
 fn bench_serializer_vec(b: &mut Bencher) {
     let log = Log::new();
-    let json = serde_json::to_vec(&log);
+    let json = json::to_vec(&log);
     b.bytes = json.len() as u64;
 
     let mut wr = Vec::with_capacity(1024);
@@ -1160,7 +1160,7 @@ fn bench_serializer_vec(b: &mut Bencher) {
     b.iter(|| {
         wr.clear();
 
-        let mut serializer = serde_json::Serializer::new(wr.by_ref());
+        let mut serializer = json::Serializer::new(wr.by_ref());
         log.serialize(&mut serializer).unwrap();
         let _json = serializer.into_inner();
     });
@@ -1169,7 +1169,7 @@ fn bench_serializer_vec(b: &mut Bencher) {
 #[bench]
 fn bench_serializer_slice(b: &mut Bencher) {
     let log = Log::new();
-    let json = serde_json::to_vec(&log);
+    let json = json::to_vec(&log);
     b.bytes = json.len() as u64;
 
     let mut buf = [0; 1024];
@@ -1178,7 +1178,7 @@ fn bench_serializer_slice(b: &mut Bencher) {
         for item in buf.iter_mut(){ *item = 0; }
         let mut wr = &mut buf[..];
 
-        let mut serializer = serde_json::Serializer::new(wr.by_ref());
+        let mut serializer = json::Serializer::new(wr.by_ref());
         log.serialize(&mut serializer).unwrap();
         let _json = serializer.into_inner();
     });
@@ -1191,7 +1191,7 @@ fn test_serializer_my_mem_writer0() {
     let mut wr = MyMemWriter0::with_capacity(1024);
 
     {
-        let mut serializer = serde_json::Serializer::new(wr.by_ref());
+        let mut serializer = json::Serializer::new(wr.by_ref());
         log.serialize(&mut serializer).unwrap();
         let _json = serializer.into_inner();
     }
@@ -1202,7 +1202,7 @@ fn test_serializer_my_mem_writer0() {
 #[bench]
 fn bench_serializer_my_mem_writer0(b: &mut Bencher) {
     let log = Log::new();
-    let json = serde_json::to_vec(&log);
+    let json = json::to_vec(&log);
     b.bytes = json.len() as u64;
 
     let mut wr = MyMemWriter0::with_capacity(1024);
@@ -1210,7 +1210,7 @@ fn bench_serializer_my_mem_writer0(b: &mut Bencher) {
     b.iter(|| {
         wr.buf.clear();
 
-        let mut serializer = serde_json::Serializer::new(wr.by_ref());
+        let mut serializer = json::Serializer::new(wr.by_ref());
         log.serialize(&mut serializer).unwrap();
         let _json = serializer.into_inner();
     });
@@ -1223,7 +1223,7 @@ fn test_serializer_my_mem_writer1() {
     let mut wr = MyMemWriter1::with_capacity(1024);
 
     {
-        let mut serializer = serde_json::Serializer::new(wr.by_ref());
+        let mut serializer = json::Serializer::new(wr.by_ref());
         log.serialize(&mut serializer).unwrap();
         let _json = serializer.into_inner();
     }
@@ -1234,7 +1234,7 @@ fn test_serializer_my_mem_writer1() {
 #[bench]
 fn bench_serializer_my_mem_writer1(b: &mut Bencher) {
     let log = Log::new();
-    let json = serde_json::to_vec(&log);
+    let json = json::to_vec(&log);
     b.bytes = json.len() as u64;
 
     let mut wr = MyMemWriter1::with_capacity(1024);
@@ -1242,7 +1242,7 @@ fn bench_serializer_my_mem_writer1(b: &mut Bencher) {
     b.iter(|| {
         wr.buf.clear();
 
-        let mut serializer = serde_json::Serializer::new(wr.by_ref());
+        let mut serializer = json::Serializer::new(wr.by_ref());
         log.serialize(&mut serializer).unwrap();
         let _json = serializer.into_inner();
     });
@@ -1593,6 +1593,6 @@ fn bench_deserializer(b: &mut Bencher) {
     b.bytes = JSON_STR.len() as u64;
 
     b.iter(|| {
-        let _log: Log = serde_json::from_str(JSON_STR).unwrap();
+        let _log: Log = json::from_str(JSON_STR).unwrap();
     });
 }

serde_tests/benches/bench_map.rs

@@ -17,13 +17,13 @@ pub enum Error {
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn syntax_error() -> Error { Error::SyntaxError }
 
-    fn end_of_stream() -> Error { Error::EndOfStream }
+    fn end_of_stream_error() -> Error { Error::EndOfStream }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field_error(_: &str) -> Error { Error::SyntaxError }
 
-    fn missing_field(_: &'static str) -> Error {
+    fn missing_field_error(_: &'static str) -> Error {
         Error::MissingField
     }
 }
@@ -347,17 +347,17 @@ mod deserializer {
 
     impl de::Deserializer<Error> for IsizeDeserializer {
         #[inline]
-        fn end_of_stream(&mut self) -> Error {
+        fn end_of_stream_error(&mut self) -> Error {
             EndOfStream
         }
 
         #[inline]
-        fn syntax(&mut self, _token: de::Token, _expected: &[de::TokenKind]) -> Error {
+        fn syntax_error(&mut self, _token: de::Token, _expected: &[de::TokenKind]) -> Error {
             SyntaxError
         }
 
         #[inline]
-        fn unexpected_name(&mut self, _token: de::Token) -> Error {
+        fn unexpected_name_error(&mut self, _token: de::Token) -> Error {
             SyntaxError
         }
 

serde_tests/benches/bench_struct.rs

@@ -33,13 +33,13 @@ pub enum Error {
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn syntax_error() -> Error { Error::SyntaxError }
 
-    fn end_of_stream() -> Error { Error::EndOfStream }
+    fn end_of_stream_error() -> Error { Error::EndOfStream }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field_error(_: &str) -> Error { Error::SyntaxError }
 
-    fn missing_field(_: &'static str) -> Error {
+    fn missing_field_error(_: &'static str) -> Error {
         Error::MissingField
     }
 }
@@ -398,10 +398,7 @@ mod deserializer {
             }
         }
 
-        fn visit_struct<V>(&mut self,
-                           name: &str,
-                           _fields: &'static [&'static str],
-                           mut visitor: V) -> Result<V::Value, Error>
+        fn visit_named_map<V>(&mut self, name: &str, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.stack.pop() {

serde_tests/benches/bench_vec.rs

@@ -15,13 +15,13 @@ pub enum Error {
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn syntax_error() -> Error { Error::SyntaxError }
 
-    fn end_of_stream() -> Error { Error::EndOfStreamError }
+    fn end_of_stream_error() -> Error { Error::EndOfStreamError }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field_error(_: &str) -> Error { Error::SyntaxError }
 
-    fn missing_field(_: &'static str) -> Error { Error::SyntaxError }
+    fn missing_field_error(_: &'static str) -> Error { Error::SyntaxError }
 }
 
 //////////////////////////////////////////////////////////////////////////////

serde_tests/tests/test.rs

@@ -1,4 +1,3 @@
 extern crate serde;
-extern crate serde_json;
 
 include!(concat!(env!("OUT_DIR"), "/test.rs"));

serde_tests/tests/test.rs.in

@@ -1,7 +1,11 @@
+/*
 mod test_annotations;
 mod test_bytes;
 mod test_de;
 mod test_json;
 mod test_json_builder;
+*/
 mod test_macros;
+/*
 mod test_ser;
+*/

serde_tests/tests/test_annotations.rs

@@ -1,5 +1,4 @@
-use std::default;
-use serde_json;
+use serde::json;
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Default {
@@ -31,39 +30,33 @@ enum SerEnum<A> {
     },
 }
 
-#[derive(Debug, PartialEq, Deserialize, Serialize)]
-struct SkipSerializingFields<A: default::Default> {
-    a: i8,
-    #[serde(skip_serializing, default)]
-    b: A,
-}
 
 #[test]
 fn test_default() {
-    let deserialized_value: Default = serde_json::from_str(&"{\"a1\":1,\"a2\":2}").unwrap();
+    let deserialized_value: Default = json::from_str(&"{\"a1\":1,\"a2\":2}").unwrap();
     assert_eq!(deserialized_value, Default { a1: 1, a2: 2 });
 
-    let deserialized_value: Default = serde_json::from_str(&"{\"a1\":1}").unwrap();
+    let deserialized_value: Default = json::from_str(&"{\"a1\":1}").unwrap();
     assert_eq!(deserialized_value, Default { a1: 1, a2: 0 });
 }
 
 #[test]
 fn test_rename() {
     let value = Rename { a1: 1, a2: 2 };
-    let serialized_value = serde_json::to_string(&value).unwrap();
+    let serialized_value = json::to_string(&value).unwrap();
     assert_eq!(serialized_value, "{\"a1\":1,\"a3\":2}");
 
-    let deserialized_value: Rename = serde_json::from_str(&serialized_value).unwrap();
+    let deserialized_value: Rename = json::from_str(&serialized_value).unwrap();
     assert_eq!(value, deserialized_value);
 }
 
 #[test]
 fn test_format_rename() {
     let value = FormatRename { a1: 1, a2: 2 };
-    let serialized_value = serde_json::to_string(&value).unwrap();
+    let serialized_value = json::to_string(&value).unwrap();
     assert_eq!(serialized_value, "{\"a1\":1,\"a5\":2}");
 
-    let deserialized_value = serde_json::from_str("{\"a1\":1,\"a5\":2}").unwrap();
+    let deserialized_value = json::from_str("{\"a1\":1,\"a5\":2}").unwrap();
     assert_eq!(value, deserialized_value);
 }
 
@@ -71,20 +64,10 @@ fn test_format_rename() {
 fn test_enum_format_rename() {
     let s1 = String::new();
     let value = SerEnum::Map { a: 0i8, b: s1 };
-    let serialized_value = serde_json::to_string(&value).unwrap();
+    let serialized_value = json::to_string(&value).unwrap();
     let ans = "{\"Map\":{\"a\":0,\"d\":\"\"}}";
     assert_eq!(serialized_value, ans);
 
-    let deserialized_value = serde_json::from_str(ans).unwrap();
+    let deserialized_value = json::from_str(ans).unwrap();
     assert_eq!(value, deserialized_value);
 }
-
-#[test]
-fn test_skip_serializing_fields() {
-    let value = SkipSerializingFields { a: 1, b: 2 };
-    let serialized_value = serde_json::to_string(&value).unwrap();
-    assert_eq!(serialized_value, "{\"a\":1}");
-
-    let deserialized_value: SkipSerializingFields<_> = serde_json::from_str(&serialized_value).unwrap();
-    assert_eq!(SkipSerializingFields { a: 1, b: 0 }, deserialized_value);
-}

serde_tests/tests/test_bytes.rs

@@ -1,7 +1,7 @@
 use serde;
 use serde::Serialize;
 use serde::bytes::{ByteBuf, Bytes};
-use serde_json;
+use serde::json;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -9,13 +9,13 @@ use serde_json;
 struct Error;
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error }
+    fn syntax_error() -> Error { Error }
 
-    fn end_of_stream() -> Error { Error }
+    fn end_of_stream_error() -> Error { Error }
 
-    fn unknown_field(_field: &str) -> Error { Error }
+    fn unknown_field_error(_field: &str) -> Error { Error }
 
-    fn missing_field(_field: &'static str) -> Error { Error }
+    fn missing_field_error(_field: &'static str) -> Error { Error }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -144,11 +144,11 @@ impl serde::Deserializer for BytesDeserializer {
 fn test_bytes_ser_json() {
     let buf = vec![];
     let bytes = Bytes::from(&buf);
-    assert_eq!(serde_json::to_string(&bytes).unwrap(), "[]".to_string());
+    assert_eq!(json::to_string(&bytes).unwrap(), "[]".to_string());
 
     let buf = vec![1, 2, 3];
     let bytes = Bytes::from(&buf);
-    assert_eq!(serde_json::to_string(&bytes).unwrap(), "[1,2,3]".to_string());
+    assert_eq!(json::to_string(&bytes).unwrap(), "[1,2,3]".to_string());
 }
 
 #[test]
@@ -167,10 +167,10 @@ fn test_bytes_ser_bytes() {
 #[test]
 fn test_byte_buf_ser_json() {
     let bytes = ByteBuf::new();
-    assert_eq!(serde_json::to_string(&bytes).unwrap(), "[]".to_string());
+    assert_eq!(json::to_string(&bytes).unwrap(), "[]".to_string());
 
     let bytes = ByteBuf::from(vec![1, 2, 3]);
-    assert_eq!(serde_json::to_string(&bytes).unwrap(), "[1,2,3]".to_string());
+    assert_eq!(json::to_string(&bytes).unwrap(), "[1,2,3]".to_string());
 }
 
 #[test]
@@ -189,11 +189,11 @@ fn test_byte_buf_ser_bytes() {
 #[test]
 fn test_byte_buf_de_json() {
     let bytes = ByteBuf::new();
-    let v: ByteBuf = serde_json::from_str("[]").unwrap();
+    let v: ByteBuf = json::from_str("[]").unwrap();
     assert_eq!(v, bytes);
 
     let bytes = ByteBuf::from(vec![1, 2, 3]);
-    let v: ByteBuf = serde_json::from_str("[1, 2, 3]").unwrap();
+    let v: ByteBuf = json::from_str("[1, 2, 3]").unwrap();
     assert_eq!(v, bytes);
 }
 

serde_tests/tests/test_de.rs

@@ -22,7 +22,6 @@ enum Token {
     Char(char),
     Str(&'static str),
     String(String),
-    Bytes(&'static [u8]),
 
     Option(bool),
 
@@ -39,10 +38,6 @@ enum Token {
     MapEnd,
 
     EnumStart(&'static str),
-    EnumUnit,
-    EnumNewtype,
-    EnumSeq,
-    EnumMap,
     EnumEnd,
 }
 
@@ -68,15 +63,15 @@ enum Error {
 }
 
 impl de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn syntax_error() -> Error { Error::SyntaxError }
 
-    fn end_of_stream() -> Error { Error::EndOfStreamError }
+    fn end_of_stream_error() -> Error { Error::EndOfStreamError }
 
-    fn unknown_field(field: &str) -> Error {
+    fn unknown_field_error(field: &str) -> Error {
         Error::UnknownFieldError(field.to_string())
     }
 
-    fn missing_field(field: &'static str) -> Error {
+    fn missing_field_error(field: &'static str) -> Error {
         Error::MissingFieldError(field)
     }
 }
@@ -104,7 +99,6 @@ impl Deserializer for TokenDeserializer {
             Some(Token::Char(v)) => visitor.visit_char(v),
             Some(Token::Str(v)) => visitor.visit_str(v),
             Some(Token::String(v)) => visitor.visit_string(v),
-            Some(Token::Bytes(v)) => visitor.visit_bytes(v),
             Some(Token::Option(false)) => visitor.visit_none(),
             Some(Token::Option(true)) => visitor.visit_some(self),
             Some(Token::Unit) => visitor.visit_unit(),
@@ -149,10 +143,7 @@ impl Deserializer for TokenDeserializer {
         }
     }
 
-    fn visit_enum<V>(&mut self,
-                     name: &str,
-                     _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
+    fn visit_enum<V>(&mut self, name: &str, mut visitor: V) -> Result<V::Value, Error>
         where V: de::EnumVisitor,
     {
         match self.tokens.next() {
@@ -170,7 +161,7 @@ impl Deserializer for TokenDeserializer {
         }
     }
 
-    fn visit_unit_struct<V>(&mut self, name: &str, visitor: V) -> Result<V::Value, Error>
+    fn visit_named_unit<V>(&mut self, name: &str, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         match self.tokens.peek() {
@@ -187,10 +178,7 @@ impl Deserializer for TokenDeserializer {
         }
     }
 
-    fn visit_tuple_struct<V>(&mut self,
-                             name: &str,
-                             _len: usize,
-                             visitor: V) -> Result<V::Value, Error>
+    fn visit_named_seq<V>(&mut self, name: &str, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         match self.tokens.peek() {
@@ -207,10 +195,7 @@ impl Deserializer for TokenDeserializer {
         }
     }
 
-    fn visit_struct<V>(&mut self,
-                       name: &str,
-                       _fields: &'static [&'static str],
-                       visitor: V) -> Result<V::Value, Error>
+    fn visit_named_map<V>(&mut self, name: &str, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         match self.tokens.peek() {
@@ -330,66 +315,32 @@ impl<'a> de::VariantVisitor for TokenDeserializerVariantVisitor<'a> {
     }
 
     fn visit_unit(&mut self) -> Result<(), Error> {
-        match self.de.tokens.next() {
-            Some(Token::EnumUnit) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            Some(_) => Err(Error::SyntaxError),
-            None => Err(Error::EndOfStreamError),
-        }
+        de::Deserialize::deserialize(self.de)
     }
 
-    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
-        where T: de::Deserialize,
-    {
-        match self.de.tokens.next() {
-            Some(Token::EnumNewtype) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            Some(_) => Err(Error::SyntaxError),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_tuple<V>(&mut self,
-                      _len: usize,
-                      visitor: V) -> Result<V::Value, Error>
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
-        match self.de.tokens.next() {
-            Some(Token::EnumSeq) => {
-                de::Deserializer::visit(self.de, visitor)
-            }
-            Some(_) => Err(Error::SyntaxError),
-            None => Err(Error::EndOfStreamError),
-        }
+        de::Deserializer::visit(self.de, visitor)
     }
 
-    fn visit_struct<V>(&mut self,
-                       _fields: &'static [&'static str],
-                       visitor: V) -> Result<V::Value, Error>
+    fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
-        match self.de.tokens.next() {
-            Some(Token::EnumMap) => {
-                de::Deserializer::visit(self.de, visitor)
-            }
-            Some(_) => Err(Error::SyntaxError),
-            None => Err(Error::EndOfStreamError),
-        }
+        de::Deserializer::visit(self.de, visitor)
     }
 }
 
 //////////////////////////////////////////////////////////////////////////
 
 #[derive(Copy, Clone, PartialEq, Debug, Deserialize)]
-struct UnitStruct;
+struct NamedUnit;
 
 #[derive(PartialEq, Debug, Deserialize)]
-struct TupleStruct(i32, i32, i32);
+struct NamedSeq(i32, i32, i32);
 
 #[derive(PartialEq, Debug, Deserialize)]
-struct Struct {
+struct NamedMap {
     a: i32,
     b: i32,
     c: i32,
@@ -398,7 +349,6 @@ struct Struct {
 #[derive(PartialEq, Debug, Deserialize)]
 enum Enum {
     Unit,
-    Simple(i32),
     Seq(i32, i32, i32),
     Map { a: i32, b: i32, c: i32 }
 }
@@ -536,24 +486,6 @@ declare_tests! {
             Token::I32(1),
         ],
     }
-    test_result {
-        Ok::<i32, i32>(0) => vec![
-            Token::EnumStart("Result"),
-                Token::Str("Ok"),
-
-                Token::EnumNewtype,
-                Token::I32(0),
-            Token::SeqEnd,
-        ],
-        Err::<i32, i32>(1) => vec![
-            Token::EnumStart("Result"),
-                Token::Str("Err"),
-
-                Token::EnumNewtype,
-                Token::I32(1),
-            Token::SeqEnd,
-        ],
-    }
     test_unit {
         () => vec![Token::Unit],
         () => vec![
@@ -566,19 +498,19 @@ declare_tests! {
             Token::SeqEnd,
         ],
     }
-    test_unit_struct {
-        UnitStruct => vec![Token::Unit],
-        UnitStruct => vec![
-            Token::Name("UnitStruct"),
+    test_named_unit {
+        NamedUnit => vec![Token::Unit],
+        NamedUnit => vec![
+            Token::Name("NamedUnit"),
             Token::Unit,
         ],
-        UnitStruct => vec![
+        NamedUnit => vec![
             Token::SeqStart(0),
             Token::SeqEnd,
         ],
     }
-    test_tuple_struct {
-        TupleStruct(1, 2, 3) => vec![
+    test_named_seq {
+        NamedSeq(1, 2, 3) => vec![
             Token::SeqStart(3),
                 Token::SeqSep,
                 Token::I32(1),
@@ -590,8 +522,8 @@ declare_tests! {
                 Token::I32(3),
             Token::SeqEnd,
         ],
-        TupleStruct(1, 2, 3) => vec![
-            Token::Name("TupleStruct"),
+        NamedSeq(1, 2, 3) => vec![
+            Token::Name("NamedSeq"),
             Token::SeqStart(3),
                 Token::SeqSep,
                 Token::I32(1),
@@ -886,8 +818,8 @@ declare_tests! {
             Token::MapEnd,
         ],
     }
-    test_struct {
-        Struct { a: 1, b: 2, c: 3 } => vec![
+    test_named_map {
+        NamedMap { a: 1, b: 2, c: 3 } => vec![
             Token::MapStart(3),
                 Token::MapSep,
                 Token::Str("a"),
@@ -902,8 +834,8 @@ declare_tests! {
                 Token::I32(3),
             Token::MapEnd,
         ],
-        Struct { a: 1, b: 2, c: 3 } => vec![
-            Token::Name("Struct"),
+        NamedMap { a: 1, b: 2, c: 3 } => vec![
+            Token::Name("NamedMap"),
             Token::MapStart(3),
                 Token::MapSep,
                 Token::Str("a"),
@@ -923,28 +855,14 @@ declare_tests! {
         Enum::Unit => vec![
             Token::EnumStart("Enum"),
                 Token::Str("Unit"),
-
-                Token::EnumUnit,
                 Token::Unit,
             Token::EnumEnd,
         ],
     }
-    test_enum_simple {
-        Enum::Simple(1) => vec![
-            Token::EnumStart("Enum"),
-                Token::Str("Simple"),
-
-                Token::EnumNewtype,
-                Token::I32(1),
-            Token::EnumEnd,
-        ],
-    }
     test_enum_seq {
         Enum::Seq(1, 2, 3) => vec![
             Token::EnumStart("Enum"),
                 Token::Str("Seq"),
-
-                Token::EnumSeq,
                 Token::SeqStart(3),
                     Token::SeqSep,
                     Token::I32(1),
@@ -962,8 +880,6 @@ declare_tests! {
         Enum::Map { a: 1, b: 2, c: 3 } => vec![
             Token::EnumStart("Enum"),
                 Token::Str("Map"),
-
-                Token::EnumMap,
                 Token::MapStart(3),
                     Token::MapSep,
                     Token::Str("a"),
@@ -980,24 +896,4 @@ declare_tests! {
             Token::EnumEnd,
         ],
     }
-    test_enum_unit_usize {
-        Enum::Unit => vec![
-            Token::EnumStart("Enum"),
-                Token::Usize(0),
-
-                Token::EnumUnit,
-                Token::Unit,
-            Token::EnumEnd,
-        ],
-    }
-    test_enum_unit_bytes {
-        Enum::Unit => vec![
-            Token::EnumStart("Enum"),
-                Token::Bytes(b"Unit"),
-
-                Token::EnumUnit,
-                Token::Unit,
-            Token::EnumEnd,
-        ],
-    }
 }

serde_tests/tests/test_json.rs

@@ -1,14 +1,10 @@
-use std::collections::BTreeMap;
-use std::f64;
 use std::fmt::Debug;
-use std::i64;
-use std::marker::PhantomData;
-use std::u64;
+use std::collections::BTreeMap;
 
 use serde::de;
 use serde::ser;
 
-use serde_json::{
+use serde::json::{
     self,
     Value,
     from_str,
@@ -16,7 +12,7 @@ use serde_json::{
     to_value,
 };
 
-use serde_json::error::{Error, ErrorCode};
+use serde::json::error::{Error, ErrorCode};
 
 macro_rules! treemap {
     ($($k:expr => $v:expr),*) => ({
@@ -31,7 +27,7 @@ enum Animal {
     Dog,
     Frog(String, Vec<isize>),
     Cat { age: usize, name: String },
-    AntHive(Vec<String>),
+
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -52,11 +48,11 @@ fn test_encode_ok<T>(errors: &[(T, &str)])
     for &(ref value, out) in errors {
         let out = out.to_string();
 
-        let s = serde_json::to_string(value).unwrap();
+        let s = json::to_string(value).unwrap();
         assert_eq!(s, out);
 
         let v = to_value(&value);
-        let s = serde_json::to_string(&v).unwrap();
+        let s = json::to_string(&v).unwrap();
         assert_eq!(s, out);
     }
 }
@@ -67,11 +63,11 @@ fn test_pretty_encode_ok<T>(errors: &[(T, &str)])
     for &(ref value, out) in errors {
         let out = out.to_string();
 
-        let s = serde_json::to_string_pretty(value).unwrap();
+        let s = json::to_string_pretty(value).unwrap();
         assert_eq!(s, out);
 
         let v = to_value(&value);
-        let s = serde_json::to_string_pretty(&v).unwrap();
+        let s = json::to_string_pretty(&v).unwrap();
         assert_eq!(s, out);
     }
 }
@@ -85,23 +81,12 @@ fn test_write_null() {
     test_pretty_encode_ok(tests);
 }
 
-#[test]
-fn test_write_u64() {
-    let tests = &[
-        (3u64, "3"),
-        (u64::MAX, &u64::MAX.to_string()),
-    ];
-    test_encode_ok(tests);
-    test_pretty_encode_ok(tests);
-}
-
 #[test]
 fn test_write_i64() {
     let tests = &[
         (3i64, "3"),
         (-2i64, "-2"),
         (-1234i64, "-1234"),
-        (i64::MIN, &i64::MIN.to_string()),
     ];
     test_encode_ok(tests);
     test_pretty_encode_ok(tests);
@@ -109,18 +94,11 @@ fn test_write_i64() {
 
 #[test]
 fn test_write_f64() {
-    let min_string = format!("{:?}", f64::MIN);
-    let max_string = format!("{:?}", f64::MAX);
-    let epsilon_string = format!("{:?}", f64::EPSILON);
-
     let tests = &[
-        (3.0, "3"),
+        (3.0, "3.0"),
         (3.1, "3.1"),
         (-1.5, "-1.5"),
         (0.5, "0.5"),
-        (f64::MIN, &min_string),
-        (f64::MAX, &max_string),
-        (f64::EPSILON, &epsilon_string),
     ];
     test_encode_ok(tests);
     test_pretty_encode_ok(tests);
@@ -555,10 +533,6 @@ fn test_write_enum() {
             Animal::Cat { age: 5, name: "Kate".to_string() },
             "{\"Cat\":{\"age\":5,\"name\":\"Kate\"}}"
         ),
-        (
-            Animal::AntHive(vec!["Bob".to_string(), "Stuart".to_string()]),
-            "{\"AntHive\":[\"Bob\",\"Stuart\"]}",
-        ),
     ]);
 
     test_pretty_encode_ok(&[
@@ -642,7 +616,7 @@ fn test_write_option() {
     ]);
 }
 
-fn test_parse_ok<T>(errors: Vec<(&str, T)>)
+fn test_parse_ok<T>(errors: Vec<(&'static str, T)>)
     where T: Clone + Debug + PartialEq + ser::Serialize + de::Deserialize,
 {
     for (s, value) in errors {
@@ -728,6 +702,7 @@ fn test_parse_number_errors() {
         ("1e", Error::SyntaxError(ErrorCode::InvalidNumber, 1, 2)),
         ("1e+", Error::SyntaxError(ErrorCode::InvalidNumber, 1, 3)),
         ("1a", Error::SyntaxError(ErrorCode::TrailingCharacters, 1, 2)),
+        ("777777777777777777777777777", Error::SyntaxError(ErrorCode::InvalidNumber, 1, 20)),
         ("1e777777777777777777777777777", Error::SyntaxError(ErrorCode::InvalidNumber, 1, 22)),
     ]);
 }
@@ -738,44 +713,28 @@ fn test_parse_i64() {
         ("-2", -2),
         ("-1234", -1234),
         (" -1234 ", -1234),
-        (&i64::MIN.to_string(), i64::MIN),
-        (&i64::MAX.to_string(), i64::MAX),
     ]);
 }
 
 #[test]
 fn test_parse_u64() {
     test_parse_ok(vec![
-        ("0", 0u64),
         ("3", 3u64),
         ("1234", 1234),
-        (&u64::MAX.to_string(), u64::MAX),
     ]);
 }
 
 #[test]
 fn test_parse_f64() {
     test_parse_ok(vec![
-        ("0.0", 0.0f64),
         ("3.0", 3.0f64),
-        ("3.00", 3.0f64),
         ("3.1", 3.1),
         ("-1.2", -1.2),
         ("0.4", 0.4),
         ("0.4e5", 0.4e5),
-        ("0.4e+5", 0.4e5),
         ("0.4e15", 0.4e15),
-        ("0.4e+15", 0.4e15),
-        ("0.4e-01", 0.4e-1),
-        (" 0.4e-01 ", 0.4e-1),
-        ("0.4e-001", 0.4e-1),
-        ("0.4e-0", 0.4e0),
-        ("0.00e00", 0.0),
-        ("0.00e+00", 0.0),
-        ("0.00e-00", 0.0),
-        (&format!("{:?}", (i64::MIN as f64) - 1.0), (i64::MIN as f64) - 1.0),
-        (&format!("{:?}", (u64::MAX as f64) + 1.0), (u64::MAX as f64) + 1.0),
-        (&format!("{:?}", f64::EPSILON), f64::EPSILON),
+        ("0.4e-01", 0.4e-01),
+        (" 0.4e-01 ", 0.4e-01),
     ]);
 }
 
@@ -804,8 +763,8 @@ fn test_parse_string() {
 #[test]
 fn test_parse_list() {
     test_parse_err::<Vec<f64>>(vec![
-        ("[", Error::SyntaxError(ErrorCode::EOFWhileParsingList, 1, 1)),
-        ("[ ", Error::SyntaxError(ErrorCode::EOFWhileParsingList, 1, 2)),
+        ("[", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 1)),
+        ("[ ", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 2)),
         ("[1", Error::SyntaxError(ErrorCode::EOFWhileParsingList,  1, 2)),
         ("[1,", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 3)),
         ("[1,]", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 4)),
@@ -856,8 +815,8 @@ fn test_parse_list() {
 #[test]
 fn test_parse_object() {
     test_parse_err::<BTreeMap<String, u32>>(vec![
-        ("{", Error::SyntaxError(ErrorCode::EOFWhileParsingObject, 1, 1)),
-        ("{ ", Error::SyntaxError(ErrorCode::EOFWhileParsingObject, 1, 2)),
+        ("{", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 1)),
+        ("{ ", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 2)),
         ("{1", Error::SyntaxError(ErrorCode::KeyMustBeAString, 1, 2)),
         ("{ \"a\"", Error::SyntaxError(ErrorCode::EOFWhileParsingObject, 1, 5)),
         ("{\"a\"", Error::SyntaxError(ErrorCode::EOFWhileParsingObject, 1, 4)),
@@ -909,7 +868,7 @@ fn test_parse_struct() {
     test_parse_err::<Outer>(vec![
         ("5", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 1)),
         ("\"hello\"", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 7)),
-        ("{\"inner\": true}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 14)),
+        ("{\"inner\": true}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 15)),
     ]);
 
     test_parse_ok(vec![
@@ -932,7 +891,7 @@ fn test_parse_struct() {
                     Inner { a: (), b: 2, c: vec!["abc".to_string(), "xyz".to_string()] }
                 ]
             },
-        ),
+        )
     ]);
 
     let v: Outer = from_str("{}").unwrap();
@@ -943,22 +902,6 @@ fn test_parse_struct() {
             inner: vec![],
         }
     );
-
-    let v: Outer = from_str(
-        "[
-            [
-                [ null, 2, [\"abc\", \"xyz\"] ]
-            ]
-        ]").unwrap();
-
-    assert_eq!(
-        v,
-        Outer {
-            inner: vec![
-                Inner { a: (), b: 2, c: vec!["abc".to_string(), "xyz".to_string()] }
-            ],
-        }
-    );
 }
 
 #[test]
@@ -988,10 +931,10 @@ fn test_parse_enum_errors() {
         ("{}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 2)),
         ("{\"Dog\":", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 7)),
         ("{\"Dog\":}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 8)),
-        ("{\"unknown\":[]}", Error::SyntaxError(ErrorCode::UnknownField("unknown".to_string()), 1, 10)),
-        ("{\"Dog\":{}}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 8)),
-        ("{\"Frog\":{}}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 9)),
-        ("{\"Cat\":[]}", Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 1, 9)),
+        ("{\"unknown\":[]}", Error::SyntaxError(ErrorCode::UnknownField("unknown".to_string()), 1, 11)),
+        ("{\"Dog\":{}}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 9)),
+        ("{\"Frog\":{}}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 10)),
+        ("{\"Cat\":[]}", Error::SyntaxError(ErrorCode::ExpectedSomeValue, 1, 9)),
     ]);
 }
 
@@ -1016,10 +959,6 @@ fn test_parse_enum() {
             " { \"Cat\" : { \"age\" : 5 , \"name\" : \"Kate\" } } ",
             Animal::Cat { age: 5, name: "Kate".to_string() },
         ),
-        (
-            " { \"AntHive\" : [\"Bob\", \"Stuart\"] } ",
-            Animal::AntHive(vec!["Bob".to_string(), "Stuart".to_string()]),
-        ),
     ]);
 
     test_parse_ok(vec![
@@ -1125,7 +1064,7 @@ fn test_missing_fmt_renamed_field() {
 
 #[test]
 fn test_find_path() {
-    let obj: Value = serde_json::from_str(r#"{"x": {"a": 1}, "y": 2}"#).unwrap();
+    let obj: Value = json::from_str(r#"{"x": {"a": 1}, "y": 2}"#).unwrap();
 
     assert!(obj.find_path(&["x", "a"]).unwrap() == &Value::U64(1));
     assert!(obj.find_path(&["y"]).unwrap() == &Value::U64(2));
@@ -1134,217 +1073,9 @@ fn test_find_path() {
 
 #[test]
 fn test_lookup() {
-    let obj: Value = serde_json::from_str(r#"{"x": {"a": 1}, "y": 2}"#).unwrap();
+    let obj: Value = json::from_str(r#"{"x": {"a": 1}, "y": 2}"#).unwrap();
 
     assert!(obj.lookup("x.a").unwrap() == &Value::U64(1));
     assert!(obj.lookup("y").unwrap() == &Value::U64(2));
     assert!(obj.lookup("z").is_none());
 }
-
-#[test]
-fn test_serialize_seq_with_no_len() {
-    #[derive(Clone, Debug, PartialEq)]
-    struct MyVec<T>(Vec<T>);
-
-    impl<T> ser::Serialize for MyVec<T>
-        where T: ser::Serialize,
-    {
-        #[inline]
-        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-            where S: ser::Serializer,
-        {
-            serializer.visit_seq(ser::impls::SeqIteratorVisitor::new(self.0.iter(), None))
-        }
-    }
-
-    struct Visitor<T> {
-        marker: PhantomData<MyVec<T>>,
-    }
-
-    impl<T> de::Visitor for Visitor<T>
-        where T: de::Deserialize,
-    {
-        type Value = MyVec<T>;
-
-        #[inline]
-        fn visit_unit<E>(&mut self) -> Result<MyVec<T>, E>
-            where E: de::Error,
-        {
-            Ok(MyVec(Vec::new()))
-        }
-
-        #[inline]
-        fn visit_seq<V>(&mut self, mut visitor: V) -> Result<MyVec<T>, V::Error>
-            where V: de::SeqVisitor,
-        {
-            let mut values = Vec::new();
-
-            while let Some(value) = try!(visitor.visit()) {
-                values.push(value);
-            }
-
-            try!(visitor.end());
-
-            Ok(MyVec(values))
-        }
-    }
-
-    impl<T> de::Deserialize for MyVec<T>
-        where T: de::Deserialize,
-    {
-        fn deserialize<D>(deserializer: &mut D) -> Result<MyVec<T>, D::Error>
-            where D: de::Deserializer,
-        {
-            deserializer.visit_map(Visitor { marker: PhantomData })
-        }
-    }
-
-    let mut vec = Vec::new();
-    vec.push(MyVec(Vec::new()));
-    vec.push(MyVec(Vec::new()));
-    let vec: MyVec<MyVec<u32>> = MyVec(vec);
-
-    test_encode_ok(&[
-        (
-            vec.clone(),
-            "[[],[]]",
-        ),
-    ]);
-
-    let s = serde_json::to_string_pretty(&vec).unwrap();
-    assert_eq!(
-        s,
-        concat!(
-            "[\n",
-            "  [\n",
-            "  ],\n",
-            "  [\n",
-            "  ]\n",
-            "]"
-        )
-    );
-}
-
-#[test]
-fn test_serialize_map_with_no_len() {
-    #[derive(Clone, Debug, PartialEq)]
-    struct Map<K, V>(BTreeMap<K, V>);
-
-    impl<K, V> ser::Serialize for Map<K, V>
-        where K: ser::Serialize + Ord,
-              V: ser::Serialize,
-    {
-        #[inline]
-        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-            where S: ser::Serializer,
-        {
-            serializer.visit_map(ser::impls::MapIteratorVisitor::new(self.0.iter(), None))
-        }
-    }
-
-    struct Visitor<K, V> {
-        marker: PhantomData<Map<K, V>>,
-    }
-
-    impl<K, V> de::Visitor for Visitor<K, V>
-        where K: de::Deserialize + Eq + Ord,
-              V: de::Deserialize,
-    {
-        type Value = Map<K, V>;
-
-        #[inline]
-        fn visit_unit<E>(&mut self) -> Result<Map<K, V>, E>
-            where E: de::Error,
-        {
-            Ok(Map(BTreeMap::new()))
-        }
-
-        #[inline]
-        fn visit_map<Visitor>(&mut self, mut visitor: Visitor) -> Result<Map<K, V>, Visitor::Error>
-            where Visitor: de::MapVisitor,
-        {
-            let mut values = BTreeMap::new();
-
-            while let Some((key, value)) = try!(visitor.visit()) {
-                values.insert(key, value);
-            }
-
-            try!(visitor.end());
-
-            Ok(Map(values))
-        }
-    }
-
-    impl<K, V> de::Deserialize for Map<K, V>
-        where K: de::Deserialize + Eq + Ord,
-              V: de::Deserialize,
-    {
-        fn deserialize<D>(deserializer: &mut D) -> Result<Map<K, V>, D::Error>
-            where D: de::Deserializer,
-        {
-            deserializer.visit_map(Visitor { marker: PhantomData })
-        }
-    }
-
-    let mut map = BTreeMap::new();
-    map.insert("a", Map(BTreeMap::new()));
-    map.insert("b", Map(BTreeMap::new()));
-    let map: Map<_, Map<u32, u32>> = Map(map);
-
-    test_encode_ok(&[
-        (
-            map.clone(),
-            "{\"a\":{},\"b\":{}}",
-        ),
-    ]);
-
-    let s = serde_json::to_string_pretty(&map).unwrap();
-    assert_eq!(
-        s,
-        concat!(
-            "{\n",
-            "  \"a\": {\n",
-            "  },\n",
-            "  \"b\": {\n",
-            "  }\n",
-            "}"
-        )
-    );
-}
-
-#[test]
-fn test_deserialize_from_stream() {
-    use std::net;
-    use std::io::Read;
-    use std::thread;
-    use serde::Deserialize;
-
-    #[derive(Debug, PartialEq, Serialize, Deserialize)]
-    struct Message {
-        message: String,
-    }
-
-    let l = net::TcpListener::bind("localhost:20000").unwrap();
-
-    thread::spawn(|| {
-        let l = l;
-        for stream in l.incoming() {
-            let mut stream = stream.unwrap();
-            let read_stream = stream.try_clone().unwrap();
-
-            let mut de = serde_json::Deserializer::new(read_stream.bytes());
-            let request = Message::deserialize(&mut de).unwrap();
-            let response = Message { message: request.message };
-            serde_json::to_writer(&mut stream, &response).unwrap();
-        }
-    });
-
-    let mut stream = net::TcpStream::connect("localhost:20000").unwrap();
-    let request = Message { message: "hi there".to_string() };
-    serde_json::to_writer(&mut stream, &request).unwrap();
-
-    let mut de = serde_json::Deserializer::new(stream.bytes());
-    let response = Message::deserialize(&mut de).unwrap();
-
-    assert_eq!(request, response);
-}

serde_tests/tests/test_json_builder.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
-use serde_json::value::Value;
-use serde_json::builder::{ArrayBuilder, ObjectBuilder};
+use serde::json::value::Value;
+use serde::json::builder::{ArrayBuilder, ObjectBuilder};
 
 #[test]
 fn test_array_builder() {

serde_tests/tests/test_macros.rs

@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use serde_json::{self, Value};
+use serde::json::{self, Value};
 
 macro_rules! btreemap {
     () => {
@@ -131,43 +131,24 @@ enum Lifetimes<'a> {
     NoLifetimeMap { a: i32 },
 }
 
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct GenericStruct<T> {
-    x: T,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct GenericNewtypeStruct<T>(T);
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct GenericTupleStruct<T, U>(T, U);
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub enum GenericEnum<T, U> {
-    Unit,
-    Newtype(T),
-    Seq(T, U),
-    Map { x: T, y: U },
-}
-
 #[test]
 fn test_named_unit() {
     let named_unit = NamedUnit;
 
     assert_eq!(
-        serde_json::to_string(&named_unit).unwrap(),
+        json::to_string(&named_unit).unwrap(),
         "null".to_string()
     );
 
     assert_eq!(
-        serde_json::to_value(&named_unit),
+        json::to_value(&named_unit),
         Value::Null
     );
 
-    let v: NamedUnit = serde_json::from_str("null").unwrap();
+    let v: NamedUnit = json::from_str("null").unwrap();
     assert_eq!(v, named_unit);
 
-    let v: NamedUnit = serde_json::from_value(Value::Null).unwrap();
+    let v: NamedUnit = json::from_value(Value::Null).unwrap();
     assert_eq!(v, named_unit);
 }
 
@@ -179,25 +160,25 @@ fn test_ser_named_tuple() {
     let named_tuple = SerNamedTuple(&a, &mut b, c);
 
     assert_eq!(
-        serde_json::to_string(&named_tuple).unwrap(),
+        json::to_string(&named_tuple).unwrap(),
         "[5,6,7]"
     );
 
     assert_eq!(
-        serde_json::to_value(&named_tuple),
+        json::to_value(&named_tuple),
         Value::Array(vec![Value::U64(5), Value::U64(6), Value::U64(7)])
     );
 }
 
 #[test]
 fn test_de_named_tuple() {
-    let v: DeNamedTuple<i32, i32, i32> = serde_json::from_str("[1,2,3]").unwrap();
+    let v: DeNamedTuple<i32, i32, i32> = json::from_str("[1,2,3]").unwrap();
     assert_eq!(
         v,
         DeNamedTuple(1, 2, 3)
     );
 
-    let v: Value = serde_json::from_str("[1,2,3]").unwrap();
+    let v: Value = json::from_str("[1,2,3]").unwrap();
     assert_eq!(
         v,
         Value::Array(vec![
@@ -220,12 +201,12 @@ fn test_ser_named_map() {
     };
 
     assert_eq!(
-        serde_json::to_string(&named_map).unwrap(),
+        json::to_string(&named_map).unwrap(),
         "{\"a\":5,\"b\":6,\"c\":7}"
     );
 
     assert_eq!(
-        serde_json::to_value(&named_map),
+        json::to_value(&named_map),
         Value::Object(btreemap![
             "a".to_string() => Value::U64(5),
             "b".to_string() => Value::U64(6),
@@ -242,12 +223,12 @@ fn test_de_named_map() {
         c: 7,
     };
 
-    let v2: DeNamedMap<i32, i32, i32> = serde_json::from_str(
+    let v2: DeNamedMap<i32, i32, i32> = json::from_str(
         "{\"a\":5,\"b\":6,\"c\":7}"
     ).unwrap();
     assert_eq!(v, v2);
 
-    let v2 = serde_json::from_value(Value::Object(btreemap![
+    let v2 = json::from_value(Value::Object(btreemap![
         "a".to_string() => Value::U64(5),
         "b".to_string() => Value::U64(6),
         "c".to_string() => Value::U64(7)
@@ -258,12 +239,12 @@ fn test_de_named_map() {
 #[test]
 fn test_ser_enum_unit() {
     assert_eq!(
-        serde_json::to_string(&SerEnum::Unit::<u32, u32, u32>).unwrap(),
+        json::to_string(&SerEnum::Unit::<u32, u32, u32>).unwrap(),
         "{\"Unit\":[]}"
     );
 
     assert_eq!(
-        serde_json::to_value(&SerEnum::Unit::<u32, u32, u32>),
+        json::to_value(&SerEnum::Unit::<u32, u32, u32>),
         Value::Object(btreemap!(
             "Unit".to_string() => Value::Array(vec![]))
         )
@@ -280,7 +261,7 @@ fn test_ser_enum_seq() {
     //let f = 6;
 
     assert_eq!(
-        serde_json::to_string(&SerEnum::Seq(
+        json::to_string(&SerEnum::Seq(
             a,
             b,
             &c,
@@ -292,7 +273,7 @@ fn test_ser_enum_seq() {
     );
 
     assert_eq!(
-        serde_json::to_value(&SerEnum::Seq(
+        json::to_value(&SerEnum::Seq(
             a,
             b,
             &c,
@@ -323,7 +304,7 @@ fn test_ser_enum_map() {
     //let f = 6;
 
     assert_eq!(
-        serde_json::to_string(&SerEnum::Map {
+        json::to_string(&SerEnum::Map {
             a: a,
             b: b,
             c: &c,
@@ -335,7 +316,7 @@ fn test_ser_enum_map() {
     );
 
     assert_eq!(
-        serde_json::to_value(&SerEnum::Map {
+        json::to_value(&SerEnum::Map {
             a: a,
             b: b,
             c: &c,
@@ -358,13 +339,13 @@ fn test_ser_enum_map() {
 
 #[test]
 fn test_de_enum_unit() {
-    let v: DeEnum<_, _, _> = serde_json::from_str("{\"Unit\":[]}").unwrap();
+    let v: DeEnum<_, _, _> = json::from_str("{\"Unit\":[]}").unwrap();
     assert_eq!(
         v,
         DeEnum::Unit::<u32, u32, u32>
     );
 
-    let v: DeEnum<_, _, _> = serde_json::from_value(Value::Object(btreemap!(
+    let v: DeEnum<_, _, _> = json::from_value(Value::Object(btreemap!(
         "Unit".to_string() => Value::Array(vec![]))
     )).unwrap();
     assert_eq!(
@@ -382,7 +363,7 @@ fn test_de_enum_seq() {
     let e = 5;
     //let f = 6;
 
-    let v: DeEnum<_, _, _> = serde_json::from_str("{\"Seq\":[1,2,3,5]}").unwrap();
+    let v: DeEnum<_, _, _> = json::from_str("{\"Seq\":[1,2,3,5]}").unwrap();
     assert_eq!(
         v,
         DeEnum::Seq(
@@ -395,7 +376,7 @@ fn test_de_enum_seq() {
         )
     );
 
-    let v: DeEnum<_, _, _> = serde_json::from_value(Value::Object(btreemap!(
+    let v: DeEnum<_, _, _> = json::from_value(Value::Object(btreemap!(
         "Seq".to_string() => Value::Array(vec![
             Value::U64(1),
             Value::U64(2),
@@ -427,7 +408,7 @@ fn test_de_enum_map() {
     let e = 5;
     //let f = 6;
 
-    let v: DeEnum<_, _, _> = serde_json::from_str(
+    let v: DeEnum<_, _, _> = json::from_str(
         "{\"Map\":{\"a\":1,\"b\":2,\"c\":3,\"e\":5}}"
     ).unwrap();
     assert_eq!(
@@ -442,7 +423,7 @@ fn test_de_enum_map() {
         }
     );
 
-    let v: DeEnum<_, _, _> = serde_json::from_value(Value::Object(btreemap!(
+    let v: DeEnum<_, _, _> = json::from_value(Value::Object(btreemap!(
         "Map".to_string() => Value::Object(btreemap![
             "a".to_string() => Value::U64(1),
             "b".to_string() => Value::U64(2),
@@ -471,66 +452,26 @@ fn test_lifetimes() {
     let value = 5;
     let lifetime = Lifetimes::LifetimeSeq(&value);
     assert_eq!(
-        serde_json::to_string(&lifetime).unwrap(),
-        "{\"LifetimeSeq\":5}"
+        json::to_string(&lifetime).unwrap(),
+        "{\"LifetimeSeq\":[5]}"
     );
 
     let lifetime = Lifetimes::NoLifetimeSeq(5);
     assert_eq!(
-        serde_json::to_string(&lifetime).unwrap(),
-        "{\"NoLifetimeSeq\":5}"
+        json::to_string(&lifetime).unwrap(),
+        "{\"NoLifetimeSeq\":[5]}"
     );
 
     let value = 5;
     let lifetime = Lifetimes::LifetimeMap { a: &value };
     assert_eq!(
-        serde_json::to_string(&lifetime).unwrap(),
+        json::to_string(&lifetime).unwrap(),
         "{\"LifetimeMap\":{\"a\":5}}"
     );
 
     let lifetime = Lifetimes::NoLifetimeMap { a: 5 };
     assert_eq!(
-        serde_json::to_string(&lifetime).unwrap(),
+        json::to_string(&lifetime).unwrap(),
         "{\"NoLifetimeMap\":{\"a\":5}}"
     );
 }
-
-macro_rules! declare_tests {
-    ($($name:ident { $($ty:ty : $value:expr => $str:expr,)+ })+) => {
-        $(
-            #[test]
-            fn $name() {
-                $(
-                    let value: $ty = $value;
-
-                    let string = serde_json::to_string(&value).unwrap();
-                    assert_eq!(string, $str);
-
-                    let expected: $ty = serde_json::from_str(&string).unwrap();
-                    assert_eq!(value, expected);
-                )+
-            }
-        )+
-    }
-}
-
-declare_tests! {
-    test_generic_struct {
-        GenericStruct<u32> : GenericStruct { x: 5 } => "{\"x\":5}",
-    }
-    test_generic_newtype_struct {
-        GenericNewtypeStruct<u32> : GenericNewtypeStruct(5) => "5",
-    }
-    test_generic_tuple_struct {
-        GenericTupleStruct<u32, u32> : GenericTupleStruct(5, 6) => "[5,6]",
-    }
-    test_generic_enum_newtype {
-        GenericEnum<u32, u32> : GenericEnum::Newtype(5) => "{\"Newtype\":5}",
-    }
-    test_generic_enum_seq {
-        GenericEnum<u32, u32> : GenericEnum::Seq(5, 6) => "{\"Seq\":[5,6]}",
-    }
-    test_generic_enum_map {
-        GenericEnum<u32, u32> : GenericEnum::Map { x: 5, y: 6 } => "{\"Map\":{\"x\":5,\"y\":6}}",
-    }
-}

serde_tests/tests/test_ser.rs

@@ -24,19 +24,17 @@ pub enum Token<'a> {
     Option(bool),
 
     Unit,
-    UnitStruct(&'a str),
+    NamedUnit(&'a str),
     EnumUnit(&'a str, &'a str),
 
-    EnumNewtype(&'a str, &'a str),
-
     SeqStart(Option<usize>),
-    TupleStructStart(&'a str, Option<usize>),
+    NamedSeqStart(&'a str, Option<usize>),
     EnumSeqStart(&'a str, &'a str, Option<usize>),
     SeqSep,
     SeqEnd,
 
     MapStart(Option<usize>),
-    StructStart(&'a str, Option<usize>),
+    NamedMapStart(&'a str, Option<usize>),
     EnumMapStart(&'a str, &'a str, Option<usize>),
     MapSep,
     MapEnd,
@@ -82,31 +80,13 @@ impl<'a> Serializer for AssertSerializer<'a> {
         Ok(())
     }
 
-    fn visit_newtype_variant<T>(&mut self,
-                                name: &str,
-                                _variant_index: usize,
-                                variant: &str,
-                                value: T) -> Result<(), ()>
-        where T: Serialize,
-    {
-        assert_eq!(self.iter.next(), Some(Token::EnumNewtype(name, variant)));
-        value.serialize(self)
-    }
-
-    fn visit_unit_struct(&mut self, name: &str) -> Result<(), ()> {
-        assert_eq!(self.iter.next().unwrap(), Token::UnitStruct(name));
+    fn visit_named_unit(&mut self, name: &str) -> Result<(), ()> {
+        assert_eq!(self.iter.next().unwrap(), Token::NamedUnit(name));
         Ok(())
     }
 
-    fn visit_unit_variant(&mut self,
-                          name: &str,
-                          _variant_index: usize,
-                          variant: &str) -> Result<(), ()> {
-        assert_eq!(
-            self.iter.next().unwrap(),
-            Token::EnumUnit(name, variant)
-        );
-
+    fn visit_enum_unit(&mut self, name: &str, variant: &str) -> Result<(), ()> {
+        assert_eq!(self.iter.next().unwrap(), Token::EnumUnit(name, variant));
         Ok(())
     }
 
@@ -208,32 +188,25 @@ impl<'a> Serializer for AssertSerializer<'a> {
         self.visit_sequence(visitor)
     }
 
-    fn visit_tuple_struct<V>(&mut self, name: &str, visitor: V) -> Result<(), ()>
+    fn visit_named_seq<V>(&mut self, name: &str, visitor: V) -> Result<(), ()>
         where V: SeqVisitor
     {
         let len = visitor.len();
 
-        assert_eq!(
-            self.iter.next().unwrap(),
-            Token::TupleStructStart(name, len)
-        );
+        assert_eq!(self.iter.next().unwrap(), Token::NamedSeqStart(name, len));
 
         self.visit_sequence(visitor)
     }
 
-    fn visit_tuple_variant<V>(&mut self,
-                              name: &str,
-                              _variant_index: usize,
-                              variant: &str,
-                              visitor: V) -> Result<(), ()>
+    fn visit_enum_seq<V>(&mut self,
+                         name: &str,
+                         variant: &str,
+                         visitor: V) -> Result<(), ()>
         where V: SeqVisitor
     {
         let len = visitor.len();
 
-        assert_eq!(
-            self.iter.next().unwrap(),
-            Token::EnumSeqStart(name, variant, len)
-        );
+        assert_eq!(self.iter.next().unwrap(), Token::EnumSeqStart(name, variant, len));
 
         self.visit_sequence(visitor)
     }
@@ -255,32 +228,22 @@ impl<'a> Serializer for AssertSerializer<'a> {
         self.visit_mapping(visitor)
     }
 
-    fn visit_struct<V>(&mut self, name: &str, visitor: V) -> Result<(), ()>
+    fn visit_named_map<V>(&mut self, name: &str, visitor: V) -> Result<(), ()>
         where V: MapVisitor
     {
         let len = visitor.len();
 
-        assert_eq!(
-            self.iter.next().unwrap(),
-            Token::StructStart(name, len)
-        );
+        assert_eq!(self.iter.next().unwrap(), Token::NamedMapStart(name, len));
 
         self.visit_mapping(visitor)
     }
 
-    fn visit_struct_variant<V>(&mut self,
-                               name: &str,
-                               _variant_index: usize,
-                               variant: &str,
-                               visitor: V) -> Result<(), ()>
+    fn visit_enum_map<V>(&mut self, name: &str, variant: &str, visitor: V) -> Result<(), ()>
         where V: MapVisitor
     {
         let len = visitor.len();
 
-        assert_eq!(
-            self.iter.next().unwrap(),
-            Token::EnumMapStart(name, variant, len)
-        );
+        assert_eq!(self.iter.next().unwrap(), Token::EnumMapStart(name, variant, len));
 
         self.visit_mapping(visitor)
     }
@@ -299,13 +262,13 @@ impl<'a> Serializer for AssertSerializer<'a> {
 //////////////////////////////////////////////////////////////////////////
 
 #[derive(Serialize)]
-struct UnitStruct;
+struct NamedUnit;
 
 #[derive(Serialize)]
-struct TupleStruct(i32, i32, i32);
+struct NamedSeq(i32, i32, i32);
 
 #[derive(Serialize)]
-struct Struct {
+struct NamedMap {
     a: i32,
     b: i32,
     c: i32,
@@ -314,7 +277,6 @@ struct Struct {
 #[derive(Serialize)]
 enum Enum {
     Unit,
-    One(i32),
     Seq(i32, i32),
     Map { a: i32, b: i32 },
 }
@@ -394,16 +356,6 @@ declare_tests! {
             Token::I32(1),
         ],
     }
-    test_result {
-        Ok::<i32, i32>(0) => vec![
-            Token::EnumNewtype("Result", "Ok"),
-            Token::I32(0),
-        ],
-        Err::<i32, i32>(1) => vec![
-            Token::EnumNewtype("Result", "Err"),
-            Token::I32(1),
-        ],
-    }
     test_slice {
         &[0][..0] => vec![
             Token::SeqStart(Some(0)),
@@ -528,12 +480,12 @@ declare_tests! {
             Token::MapEnd,
         ],
     }
-    test_unit_struct {
-        UnitStruct => vec![Token::UnitStruct("UnitStruct")],
+    test_named_unit {
+        NamedUnit => vec![Token::NamedUnit("NamedUnit")],
     }
-    test_tuple_struct {
-        TupleStruct(1, 2, 3) => vec![
-            Token::TupleStructStart("TupleStruct", Some(3)),
+    test_named_seq {
+        NamedSeq(1, 2, 3) => vec![
+            Token::NamedSeqStart("NamedSeq", Some(3)),
                 Token::SeqSep,
                 Token::I32(1),
 
@@ -545,9 +497,9 @@ declare_tests! {
             Token::SeqEnd,
         ],
     }
-    test_struct {
-        Struct { a: 1, b: 2, c: 3 } => vec![
-            Token::StructStart("Struct", Some(3)),
+    test_named_map {
+        NamedMap { a: 1, b: 2, c: 3 } => vec![
+            Token::NamedMapStart("NamedMap", Some(3)),
                 Token::MapSep,
                 Token::Str("a"),
                 Token::I32(1),
@@ -564,7 +516,6 @@ declare_tests! {
     }
     test_enum {
         Enum::Unit => vec![Token::EnumUnit("Enum", "Unit")],
-        Enum::One(42) => vec![Token::EnumNewtype("Enum", "One"), Token::I32(42)],
         Enum::Seq(1, 2) => vec![
             Token::EnumSeqStart("Enum", "Seq", Some(2)),
                 Token::SeqSep,