Release 0.8.3

Re-enable clippy

.gitignore

@@ -1,2 +1,3 @@
-target
 Cargo.lock
+target
+*.sw[po]

.travis.yml

@@ -1,41 +1,35 @@
-language: rust
 sudo: false
-
+language: rust
 rust:
-  - stable
-  - beta
-  - nightly
-
+- stable
+- nightly
+- 1.8.0
+- 1.9.0
+- beta
 addons:
   apt:
     packages:
     - libcurl4-openssl-dev
     - libelf-dev
     - libdw-dev
-
 before_script:
-- |
-    pip install 'travis-cargo<0.2' --user &&
-    export PATH=$HOME/.local/bin:$PATH
-
+- pip install 'travis-cargo<0.2' --user
+- export PATH=$HOME/.local/bin:$PATH
 script:
-- |
-    (cd serde && travis-cargo build) &&
-    (cd serde && travis-cargo test) &&
-    (cd serde_tests && travis-cargo test) &&
-    (cd serde_macros && travis-cargo --only nightly test) &&
-    (cd serde_macros && travis-cargo --only nightly bench) &&
-    (cd serde && travis-cargo --only stable doc) &&
-    (cd serde_codegen && travis-cargo --only stable doc)
-
+- (cd serde && travis-cargo build)
+- (cd serde && travis-cargo --skip nightly test)
+- (cd serde && travis-cargo --only nightly test -- --features unstable-testing)
+- (cd serde && travis-cargo build -- --no-default-features)
+- (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc)
+- (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
+- (cd testing && travis-cargo --skip nightly test)
+- (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
+- (cd serde_macros && travis-cargo --only nightly test -- --features unstable-testing)
+- (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
+- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
+- (cd serde && travis-cargo --only stable doc)
 after_success:
-- (cd serde && travis-cargo --only stable doc-upload)
-- (cd serde_tests && travis-cargo coveralls --no-sudo)
-
+- (cd testing && travis-cargo --only stable coveralls --no-sudo)
 env:
   global:
-    # override the default `--features unstable` used for the nightly branch (optional)
-    - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-
-    # encrypted github token for doc upload (see `GH_TOKEN` link above)
-    - secure: HO41LMpMXkF2In9+1sxWVu7fgolL+y9+4Q5PI6wZX2L5pDwpPJCjxaQarQXCEnoIxED1PlP03JuF7ULNz0zw1ylYhAOfOSdkxFZRnE2wMZqq6qvXBHwyMiDrAociIzoPKSGv7JVrKPsjsnd+96K6xxueIodQZrmAdyq7N/M82Mc=
+  - TRAVIS_CARGO_NIGHTLY_FEATURE=""

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+# Contributing to Serde
+
+Serde welcomes contribution from everyone. Here are the guidelines if you are
+thinking of helping us:
+
+## Contributions
+
+Contributions to Serde or its dependencies should be made in the form of GitHub
+pull requests. Each pull request will be reviewed by a core contributor
+(someone with permission to land patches) and either landed in the main tree or
+given feedback for changes that would be required. All contributions should
+follow this format, even those from core contributors.
+
+Should you wish to work on an issue, please claim it first by commenting on
+the GitHub issue that you want to work on it. This is to prevent duplicated
+efforts from contributors on the same issue.
+
+## Pull Request Checklist
+
+- Branch from the master branch and, if needed, rebase to the current master
+  branch before submitting your pull request. If it doesn't merge cleanly with
+  master you may be asked to rebase your changes.
+
+- Commits should be as small as possible, while ensuring that each commit is
+  correct independently (i.e., each commit should compile and pass tests). 
+
+- If your patch is not getting reviewed or you need a specific person to review
+  it, you can @-reply a reviewer asking for a review in the pull request or a
+  comment, or you can ask for a review in `#serde` on `irc.mozilla.org`.
+
+- Add tests relevant to the fixed bug or new feature.
+
+## Conduct
+
+In all Serde-related forums, we follow the [Rust Code of
+Conduct](https://www.rust-lang.org/conduct.html).  For escalation or moderation
+issues, please contact Erick (erick.tryzelaar@gmail.com) instead of the Rust
+moderation team.
+
+## Communication
+
+Beyond opening tickets on the
+[serde-rs/serde](https://github.com/serde-rs/serde) project, Serde contributors
+frequent the `#serde` channel on
+[`irc.mozilla.org`](https://wiki.mozilla.org/IRC).

README.md

@@ -1,53 +1,23 @@
-Serde Rust Serialization Framework
-==================================
+# Serde   [![Build Status](https://api.travis-ci.org/serde-rs/serde.svg?branch=master)](https://travis-ci.org/serde-rs/serde) [![Coverage Status](https://coveralls.io/repos/serde-rs/serde/badge.svg?branch=master&service=github)](https://coveralls.io/github/serde-rs/serde?branch=master) [![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde) [![Clippy Linting Result](https://clippy.bashy.io/github/serde-rs/serde/master/badge.svg)](https://clippy.bashy.io/github/serde-rs/serde/master/log)
 
-[![Build Status](https://api.travis-ci.org/serde-rs/serde.png?branch=master)](https://travis-ci.org/serde-rs/serde)
-[![Coverage Status](https://coveralls.io/repos/serde-rs/serde/badge.svg?branch=master&service=github)](https://coveralls.io/github/serde-rs/serde?branch=master)
-[![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde)
+**Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
 
-Serde is a powerful framework that enables serialization libraries to
-generically serialize Rust data structures without the overhead of runtime type
-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:
+You may be looking for:
 
-* [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)
+- [An overview of Serde](https://serde.rs/)
+- [Data formats supported by Serde](https://serde.rs/#data-formats)
+- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/codegen.html)
+- [Examples](https://serde.rs/examples.html)
+- [API documentation](https://docs.serde.rs/serde/)
 
-Using Serde with Nightly Rust and serde\_macros
-===============================================
-
-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`
+## Serde in action
 
 ```rust
-#![feature(custom_derive, plugin)]
+#![feature(plugin, custom_derive)]
 #![plugin(serde_macros)]
 
-extern crate serde;
 extern crate serde_json;
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -58,549 +28,42 @@ struct Point {
 
 fn main() {
     let point = Point { x: 1, y: 2 };
+
+    // Convert the Point to a JSON string.
     let serialized = serde_json::to_string(&point).unwrap();
 
-    println!("{}", serialized);
+    // Prints serialized = {"x":1,"y":2}
+    println!("serialized = {}", serialized);
 
+    // Convert the JSON string back to a Point.
     let deserialized: Point = serde_json::from_str(&serialized).unwrap();
 
-    println!("{:?}", deserialized);
+    // Prints deserialized = Point { x: 1, y: 2 }
+    println!("deserialized = {:?}", deserialized);
 }
 ```
 
-When run, it produces:
+## Getting help
 
-```
-% cargo run
-{"x":1,"y":2}
-Point { x: 1, y: 2 }
-```
+Serde developers live in the #serde channel on
+[`irc.mozilla.org`](https://wiki.mozilla.org/IRC). The #rust channel is also a
+good resource with generally faster response time but less specific knowledge
+about Serde. If IRC is not your thing, we are happy to respond to [GitHub
+issues](https://github.com/serde-rs/serde/issues/new) as well.
 
-Using Serde with Stable Rust, syntex, and serde\_codegen
-========================================================
+## License
 
-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:
+Serde is licensed under either of
 
-```toml
-[package]
-name = "serde_example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-build = "build.rs"
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   http://opensource.org/licenses/MIT)
 
-[build-dependencies]
-serde_codegen = "*"
-syntex = "*"
+at your option.
 
-[dependencies]
-serde = "*"
-serde_json = "*"
-```
+### Contribution
 
-`src/main.rs`:
-
-```rust
-extern crate serde;
-extern crate serde_json;
-
-include!(concat!(env!("OUT_DIR"), "/main.rs"));
-```
-
-`src/main.rs.in`:
-
-```rust
-#[derive(Serialize, Deserialize, Debug)]
-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).unwrap();
-
-    println!("{:?}", deserialized);
-}
-```
-
-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.
-
-Then to run with stable:
-
-```
-% cargo build
-...
-```
-
-Or with nightly:
-
-```rust
-% cargo build --features nightly --no-default-features
-...
-```
-
-Serialization without Macros
-============================
-
-Under the covers, Serde extensively uses the Visitor pattern to thread state
-between the
-[Serializer](http://serde-rs.github.io/serde/serde/ser/trait.Serializer.html)
-and
-[Serialize](http://serde-rs.github.io/serde/serde/ser/trait.Serialize.html)
-without the two having specific information about each other's concrete type.
-This has many of the same benefits as frameworks that use runtime type
-information without the overhead.  In fact, when compiling with optimizations,
-Rust is able to remove most or all the visitor state, and generate code that's
-nearly as fast as a hand written serializer format for a specific type.
-
-To see it in action, lets look at how a simple type like `i32` is serialized.
-The
-[Serializer](http://serde-rs.github.io/serde/serde/ser/trait.Serializer.html)
-is threaded through the type:
-
-```rust
-impl serde::Serialize for i32 {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: serde::Serializer,
-    {
-        serializer.visit_i32(*self)
-    }
-}
-```
-
-As you can see it's pretty simple. More complex types like `BTreeMap` need to
-pass a
-[MapVisitor](http://serde-rs.github.io/serde/serde/ser/trait.MapVisitor.html)
-to the 
-[Serializer](http://serde-rs.github.io/serde/serde/ser/trait.Serializer.html)
-in order to walk through the type:
-
-```rust
-impl<K, V> Serialize for BTreeMap<K, V>
-    where K: Serialize + Ord,
-          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())))
-    }
-}
-
-pub struct MapIteratorVisitor<Iter> {
-    iter: Iter,
-    len: Option<usize>,
-}
-
-impl<K, V, Iter> MapIteratorVisitor<Iter>
-    where Iter: Iterator<Item=(K, V)>
-{
-    #[inline]
-    pub fn new(iter: Iter, len: Option<usize>) -> MapIteratorVisitor<Iter> {
-        MapIteratorVisitor {
-            iter: iter,
-            len: len,
-        }
-    }
-}
-
-impl<K, V, I> MapVisitor for MapIteratorVisitor<I>
-    where K: Serialize,
-          V: Serialize,
-          I: Iterator<Item=(K, V)>,
-{
-    #[inline]
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: Serializer,
-    {
-        match self.iter.next() {
-            Some((key, value)) => {
-                let value = try!(serializer.visit_map_elt(key, value));
-                Ok(Some(value))
-            }
-            None => Ok(None)
-        }
-    }
-
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        self.len
-    }
-}
-```
-
-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
-the fields:
-
-```rust
-extern crate serde;
-
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-impl serde::Serialize for Point {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: serde::Serializer
-    {
-        serializer.visit_struct("Point", PointMapVisitor {
-            value: self,
-            state: 0,
-        })
-    }
-}
-
-struct PointMapVisitor<'a> {
-    value: &'a Point,
-    state: u8,
-}
-
-impl<'a> serde::ser::MapVisitor for PointMapVisitor<'a> {
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: serde::Serializer
-    {
-        match self.state {
-            0 => {
-                self.state += 1;
-                Ok(Some(try!(serializer.visit_struct_elt("x", &self.value.x))))
-            }
-            1 => {
-                self.state += 1;
-                Ok(Some(try!(serializer.visit_struct_elt("y", &self.value.y))))
-            }
-            _ => {
-                Ok(None)
-            }
-        }
-    }
-}
-```
-
-Deserialization without Macros
-==============================
-
-Deserialization is a little more complicated since there's a bit more error
-handling that needs to occur. Let's start with the simple `i32`
-[Deserialize](http://serde-rs.github.io/serde/serde/de/trait.Deserialize.html)
-implementation. It passes a
-[Visitor](http://serde-rs.github.io/serde/serde/de/trait.Visitor.html) to the
-[Deserializer](http://serde-rs.github.io/serde/serde/de/trait.Deserializer.html).
-The [Visitor](http://serde-rs.github.io/serde/serde/de/trait.Visitor.html)
-can create the `i32` from a variety of different types:
-
-```rust
-impl Deserialize for i32 {
-    fn deserialize<D>(deserializer: &mut D) -> Result<i32, D::Error>
-        where D: serde::Deserializer,
-    {
-        deserializer.visit(I32Visitor)
-    }
-}
-
-struct I32Visitor;
-
-impl serde::de::Visitor for I32Visitor {
-    type Value = i32;
-
-    fn visit_i16<E>(&mut self, value: i16) -> Result<i16, E>
-        where E: Error,
-    {
-        self.visit_i32(value as i32)
-    }
-
-    fn visit_i32<E>(&mut self, value: i32) -> Result<i32, E>
-        where E: Error,
-    {
-        Ok(value)
-    }
-
-    ...
-
-```
-
-Since it's possible for this type to get passed an unexpected type, we need a
-way to error out. This is done by way of the
-[Error](http://serde-rs.github.io/serde/serde/de/trait.Error.html) trait,
-which allows a 
-[Deserialize](http://serde-rs.github.io/serde/serde/de/trait.Deserialize.html)
-to generate an error for a few common error conditions. Here's how it could be used:
-
-```rust
-    ...
-
-    fn visit_string<E>(&mut self, _: String) -> Result<i32, E>
-        where E: Error,
-    {
-        Err(serde::de::Error::syntax("expect a string"))
-    }
-
-    ...
-
-```
-
-Maps follow a similar pattern as before, and use a
-[MapVisitor](http://serde-rs.github.io/serde/serde/de/trait.MapVisitor.html)
-to walk through the values generated by the 
-[Deserializer](http://serde-rs.github.io/serde/serde/de/trait.Deserializer.html).
-
-```rust
-impl<K, V> serde::Deserialize for BTreeMap<K, V>
-    where K: serde::Deserialize + Eq + Ord,
-          V: serde::Deserialize,
-{
-    fn deserialize<D>(deserializer: &mut D) -> Result<BTreeMap<K, V>, D::Error>
-        where D: serde::Deserializer,
-    {
-        deserializer.visit(BTreeMapVisitor::new())
-    }
-}
-
-pub struct BTreeMapVisitor<K, V> {
-    marker: PhantomData<BTreeMap<K, V>>,
-}
-
-impl<K, V> BTreeMapVisitor<K, V> {
-    pub fn new() -> Self {
-        BTreeMapVisitor {
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<K, V> serde::de::Visitor for BTreeMapVisitor<K, V>
-    where K: serde::de::Deserialize + Ord,
-          V: serde::de::Deserialize
-{
-    type Value = BTreeMap<K, V>;
-
-    fn visit_unit<E>(&mut self) -> Result<BTreeMap<K, V>, E>
-        where E: Error,
-    {
-        Ok(BTreeMap::new())
-    }
-
-    fn visit_map<V_>(&mut self, mut visitor: V_) -> Result<BTreeMap<K, V>, V_::Error>
-        where V_: MapVisitor,
-    {
-        let mut values = BTreeMap::new();
-
-        while let Some((key, value)) = try!(visitor.visit()) {
-            values.insert(key, value);
-        }
-
-        try!(visitor.end());
-
-        Ok(values)
-    }
-}
-
-```
-
-Deserializing structs goes a step further in order to support not allocating a
-`String` to hold the field names. This is done by custom field enum that
-deserializes an enum variant from a string. So for our `Point` example from
-before, we need to generate:
-
-```rust
-extern crate serde;
-
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-enum PointField {
-    X,
-    Y,
-}
-
-impl serde::Deserialize for PointField {
-    fn deserialize<D>(deserializer: &mut D) -> Result<PointField, D::Error>
-        where D: serde::de::Deserializer
-    {
-        struct PointFieldVisitor;
-
-        impl serde::de::Visitor for PointFieldVisitor {
-            type Value = PointField;
-
-            fn visit_str<E>(&mut self, value: &str) -> Result<PointField, E>
-                where E: serde::de::Error
-            {
-                match value {
-                    "x" => Ok(PointField::X),
-                    "y" => Ok(PointField::Y),
-                    _ => Err(serde::de::Error::syntax("expected x or y")),
-                }
-            }
-        }
-
-        deserializer.visit(PointFieldVisitor)
-    }
-}
-
-impl serde::Deserialize for Point {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Point, D::Error>
-        where D: serde::de::Deserializer
-    {
-        static FIELDS: &'static [&'static str] = &["x", "y"];
-        deserializer.visit_struct("Point", FIELDS, PointVisitor)
-    }
-}
-
-struct PointVisitor;
-
-impl serde::de::Visitor for PointVisitor {
-    type Value = Point;
-
-    fn visit_map<V>(&mut self, mut visitor: V) -> Result<Point, V::Error>
-        where V: serde::de::MapVisitor
-    {
-        let mut x = None;
-        let mut y = None;
-
-        loop {
-            match try!(visitor.visit_key()) {
-                Some(PointField::X) => { x = Some(try!(visitor.visit_value())); }
-                Some(PointField::Y) => { y = Some(try!(visitor.visit_value())); }
-                None => { break; }
-            }
-        }
-
-        let x = match x {
-            Some(x) => x,
-            None => try!(visitor.missing_field("x")),
-        };
-
-        let y = match y {
-            Some(y) => y,
-            None => try!(visitor.missing_field("y")),
-        };
-
-        try!(visitor.end());
-
-        Ok(Point{ x: x, y: y })
-    }
-}
-```
-
-Annotations
-===========
-
-`serde_codegen` and `serde_macros` support annotations that help to customize
-how types are serialized. Here are the supported annotations:
-
-| Annotation                                   | Function                                                       |
-| ----------                                   | --------                                                       |
-| `#[serde(rename(json="name1", xml="name2"))` | Serialize this field with the given name for the given formats |
-| `#[serde(default)`                           | If the value is not specified, use the `Default::default()`    |
-| `#[serde(rename="name")`                     | Serialize this field with the given name                       |
-| `#[serde(skip_serializing)`                  | Do not serialize this value                                    |
-| `#[serde(skip_serializing_if_empty)`         | Do not serialize this value if `$value.is_empty()` is `true`   |
-| `#[serde(skip_serializing_if_none)`          | Do not serialize this value if `$value.is_none()` is `true`    |
-
-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/)   |
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.

examples/serde-syntex-example/Cargo.toml

@@ -6,13 +6,12 @@ build = "build.rs"
 
 [features]
 default = ["serde_codegen"]
-nightly = ["serde_macros"]
+unstable = ["serde_macros"]
 
 [build-dependencies]
-serde_codegen = { version = "^0.6.4", optional = true }
-syntex = "^0.22.0"
+serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" }
 
 [dependencies]
-serde = "^0.6.1"
-serde_json = "^0.6.0"
-serde_macros = { version = "^0.6.1", optional = true }
+serde = "^0.8"
+serde_json = "^0.8"
+serde_macros = { version = "^0.8", optional = true, path = "../../serde_macros" }

examples/serde-syntex-example/README.md

@@ -2,12 +2,12 @@ This example demonstrates how to use Serde with Syntex. On stable or nightly
 with Syntex, it can be built with:
 
 ```
-% multirust run stable cargo run
+% rustup run stable cargo run
      Running `target/debug/serde-syntex-example`
 {"x":1,"y":2}
 Point { x: 1, y: 2 }
 
-% multirust run nightly cargo run
+% rustup run nightly cargo run
      Running `target/debug/serde-syntex-example`
 {"x":1,"y":2}
 Point { x: 1, y: 2 }
@@ -16,5 +16,5 @@ Point { x: 1, y: 2 }
 On nightly, it can use a plugin with:
 
 ```
-% multirust run nightly cargo run --features nightly --no-default-features
+% rustup run nightly cargo run --features unstable --no-default-features
 ```

examples/serde-syntex-example/build.rs

@@ -1,6 +1,5 @@
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;
@@ -12,10 +11,7 @@ mod inner {
         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();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }
 

examples/serde-syntex-example/src/main.rs

@@ -1,5 +1,5 @@
-#![cfg_attr(nightly, feature(custom_derive, plugin))]
-#![cfg_attr(nightly, plugin(serde_macros))]
+#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))]
+#![cfg_attr(feature = "serde_macros", plugin(serde_macros))]
 
 extern crate serde;
 extern crate serde_json;

serde/Cargo.toml

@@ -1,16 +1,24 @@
 [package]
 name = "serde"
-version = "0.6.1"
+version = "0.8.3"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde-rs.github.io/serde/serde/serde/index.html"
+documentation = "https://docs.serde.rs/serde/"
 readme = "../README.md"
 keywords = ["serde", "serialization"]
-
-[dependencies]
-num = "^0.1.27"
+include = ["Cargo.toml", "src/**/*.rs"]
 
 [features]
-nightly = []
+default = ["std"]
+
+std = []
+unstable = []
+alloc = ["unstable"]
+collections = ["alloc"]
+unstable-testing = ["clippy", "unstable", "std"]
+
+[dependencies]
+clippy = { version = "^0.*", optional = true }

serde/src/bytes.rs

@@ -1,11 +1,15 @@
 //! Helper module to enable serializing bytes more efficiently
 
-use std::ops;
-use std::fmt;
-use std::ascii;
+use core::{ops, fmt, char, iter, slice};
+use core::fmt::Write;
 
 use ser;
-use de;
+
+#[cfg(any(feature = "std", feature = "collections"))]
+pub use self::bytebuf::{ByteBuf, ByteBufVisitor};
+
+#[cfg(feature = "collections")]
+use collections::Vec;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +21,11 @@ pub struct Bytes<'a> {
 
 impl<'a> fmt::Debug for Bytes<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "b\"{}\"", escape_bytestring(self.bytes))
+        try!(f.write_str("b\""));
+        for c in escape_bytestring(self.bytes) {
+            try!(f.write_char(c));
+        }
+        f.write_char('"')
     }
 }
 
@@ -29,10 +37,11 @@ impl<'a> From<&'a [u8]> for Bytes<'a> {
     }
 }
 
+#[cfg(any(feature = "std", feature = "collections"))]
 impl<'a> From<&'a Vec<u8>> for Bytes<'a> {
     fn from(bytes: &'a Vec<u8>) -> Self {
         Bytes {
-            bytes: &bytes,
+            bytes: bytes,
         }
     }
 }
@@ -54,163 +63,178 @@ impl<'a> ser::Serialize for Bytes<'a> {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: ser::Serializer
     {
-        serializer.visit_bytes(self.bytes)
+        serializer.serialize_bytes(self.bytes)
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// `ByteBuf` wraps a `Vec<u8>` and serializes as a byte array.
-#[derive(Clone, Eq, Hash, PartialEq, PartialOrd, Ord)]
-pub struct ByteBuf {
-    bytes: Vec<u8>,
-}
+#[cfg(any(feature = "std", feature = "collections"))]
+mod bytebuf {
+    use core::ops;
+    use core::fmt;
+    use core::fmt::Write;
 
-impl ByteBuf {
-    /// Construct a new, empty `ByteBuf`.
-    pub fn new() -> Self {
-        ByteBuf {
-            bytes: Vec::new(),
+    use ser;
+    use de;
+
+    #[cfg(feature = "collections")]
+    use collections::Vec;
+
+    /// `ByteBuf` wraps a `Vec<u8>` and serializes as a byte array.
+    #[derive(Clone, Default, Eq, Hash, PartialEq, PartialOrd, Ord)]
+    pub struct ByteBuf {
+        bytes: Vec<u8>,
+    }
+
+    impl ByteBuf {
+        /// Construct a new, empty `ByteBuf`.
+        pub fn new() -> Self {
+            ByteBuf {
+                bytes: Vec::new(),
+            }
+        }
+
+        /// Construct a new, empty `ByteBuf` with the specified capacity.
+        pub fn with_capacity(cap: usize) -> Self {
+            ByteBuf {
+                bytes: Vec::with_capacity(cap)
+            }
         }
     }
 
-    /// Construct a new, empty `ByteBuf` with the specified capacity.
-    pub fn with_capacity(cap: usize) -> Self {
-        ByteBuf {
-            bytes: Vec::with_capacity(cap)
+    impl fmt::Debug for ByteBuf {
+        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            try!(f.write_str("b\""));
+            for c in super::escape_bytestring(self.bytes.as_ref()) {
+                try!(f.write_char(c));
+            }
+            f.write_char('"')
         }
     }
-}
 
-impl fmt::Debug for ByteBuf {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "b\"{}\"", escape_bytestring(self.bytes.as_ref()))
-    }
-}
-
-impl Into<Vec<u8>> for ByteBuf {
-    fn into(self) -> Vec<u8> {
-        self.bytes
-    }
-}
-
-impl From<Vec<u8>> for ByteBuf {
-    fn from(bytes: Vec<u8>) -> Self {
-        ByteBuf {
-            bytes: bytes,
+    impl Into<Vec<u8>> for ByteBuf {
+        fn into(self) -> Vec<u8> {
+            self.bytes
         }
     }
-}
 
-impl AsRef<Vec<u8>> for ByteBuf {
-    fn as_ref(&self) -> &Vec<u8> {
-        &self.bytes
-    }
-}
-
-impl AsRef<[u8]> for ByteBuf {
-    fn as_ref(&self) -> &[u8] {
-        &self.bytes
-    }
-}
-
-impl AsMut<Vec<u8>> for ByteBuf {
-    fn as_mut(&mut self) -> &mut Vec<u8> {
-        &mut self.bytes
-    }
-}
-
-impl AsMut<[u8]> for ByteBuf {
-    fn as_mut(&mut self) -> &mut [u8] {
-        &mut self.bytes
-    }
-}
-
-impl ops::Deref for ByteBuf {
-    type Target = [u8];
-
-    fn deref(&self) -> &[u8] { &self.bytes[..] }
-}
-
-impl ops::DerefMut for ByteBuf {
-    fn deref_mut(&mut self) -> &mut [u8] { &mut self.bytes[..] }
-}
-
-impl ser::Serialize for ByteBuf {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: ser::Serializer
-    {
-        serializer.visit_bytes(&self)
-    }
-}
-
-/// This type implements the `serde::de::Visitor` trait for a `ByteBuf`.
-pub struct ByteBufVisitor;
-
-impl de::Visitor for ByteBufVisitor {
-    type Value = ByteBuf;
-
-    #[inline]
-    fn visit_unit<E>(&mut self) -> Result<ByteBuf, E>
-        where E: de::Error,
-    {
-        Ok(ByteBuf {
-            bytes: Vec::new(),
-        })
+    impl From<Vec<u8>> for ByteBuf {
+        fn from(bytes: Vec<u8>) -> Self {
+            ByteBuf {
+                bytes: bytes,
+            }
+        }
     }
 
-    #[inline]
-    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<ByteBuf, V::Error>
-        where V: de::SeqVisitor,
-    {
-        let (len, _) = visitor.size_hint();
-        let mut values = Vec::with_capacity(len);
+    impl AsRef<Vec<u8>> for ByteBuf {
+        fn as_ref(&self) -> &Vec<u8> {
+            &self.bytes
+        }
+    }
 
-        while let Some(value) = try!(visitor.visit()) {
-            values.push(value);
+    impl AsRef<[u8]> for ByteBuf {
+        fn as_ref(&self) -> &[u8] {
+            &self.bytes
+        }
+    }
+
+    impl AsMut<Vec<u8>> for ByteBuf {
+        fn as_mut(&mut self) -> &mut Vec<u8> {
+            &mut self.bytes
+        }
+    }
+
+    impl AsMut<[u8]> for ByteBuf {
+        fn as_mut(&mut self) -> &mut [u8] {
+            &mut self.bytes
+        }
+    }
+
+    impl ops::Deref for ByteBuf {
+        type Target = [u8];
+
+        fn deref(&self) -> &[u8] { &self.bytes[..] }
+    }
+
+    impl ops::DerefMut for ByteBuf {
+        fn deref_mut(&mut self) -> &mut [u8] { &mut self.bytes[..] }
+    }
+
+    impl ser::Serialize for ByteBuf {
+        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_bytes(self)
+        }
+    }
+
+    /// This type implements the `serde::de::Visitor` trait for a `ByteBuf`.
+    pub struct ByteBufVisitor;
+
+    impl de::Visitor for ByteBufVisitor {
+        type Value = ByteBuf;
+
+        #[inline]
+        fn visit_unit<E>(&mut self) -> Result<ByteBuf, E>
+            where E: de::Error,
+        {
+            Ok(ByteBuf {
+                bytes: Vec::new(),
+            })
         }
 
-        try!(visitor.end());
+        #[inline]
+        fn visit_seq<V>(&mut self, mut visitor: V) -> Result<ByteBuf, V::Error>
+            where V: de::SeqVisitor,
+        {
+            let (len, _) = visitor.size_hint();
+            let mut values = Vec::with_capacity(len);
 
-        Ok(ByteBuf {
-            bytes: values,
-        })
+            while let Some(value) = try!(visitor.visit()) {
+                values.push(value);
+            }
+
+            try!(visitor.end());
+
+            Ok(ByteBuf {
+                bytes: values,
+            })
+        }
+
+        #[inline]
+        fn visit_bytes<E>(&mut self, v: &[u8]) -> Result<ByteBuf, E>
+            where E: de::Error,
+        {
+            self.visit_byte_buf(v.to_vec())
+        }
+
+        #[inline]
+        fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<ByteBuf, E>
+            where E: de::Error,
+        {
+            Ok(ByteBuf {
+                bytes: v,
+            })
+        }
     }
 
-    #[inline]
-    fn visit_bytes<E>(&mut self, v: &[u8]) -> Result<ByteBuf, E>
-        where E: de::Error,
-    {
-        self.visit_byte_buf(v.to_vec())
-    }
-
-    #[inline]
-    fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<ByteBuf, E>
-        where E: de::Error,
-    {
-        Ok(ByteBuf {
-            bytes: v,
-        })
-    }
-}
-
-impl de::Deserialize for ByteBuf {
-    #[inline]
-    fn deserialize<D>(deserializer: &mut D) -> Result<ByteBuf, D::Error>
-        where D: de::Deserializer
-    {
-        deserializer.visit_bytes(ByteBufVisitor)
+    impl de::Deserialize for ByteBuf {
+        #[inline]
+        fn deserialize<D>(deserializer: &mut D) -> Result<ByteBuf, D::Error>
+            where D: de::Deserializer
+        {
+            deserializer.deserialize_bytes(ByteBufVisitor)
+        }
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-fn escape_bytestring(bytes: &[u8]) -> String {
-    let mut result = String::new();
-    for &b in bytes {
-        for esc in ascii::escape_default(b) {
-            result.push(esc as char);
-        }
+#[inline]
+fn escape_bytestring<'a>(bytes: &'a [u8]) -> iter::FlatMap<slice::Iter<'a, u8>, char::EscapeDefault, fn(&u8) -> char::EscapeDefault> {
+    fn f(b: &u8) -> char::EscapeDefault {
+        char::from_u32(*b as u32).unwrap().escape_default()
     }
-    result
+    bytes.iter().flat_map(f as fn(&u8) -> char::EscapeDefault)
 }

serde/src/de/from_primitive.rs

@@ -0,0 +1,409 @@
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Extracted from https://github.com/rust-num/num.
+
+// Rust 1.5 is unhappy that this private module is undocumented.
+#![allow(missing_docs)]
+
+use core::{usize, u8, u16, u32, u64};
+use core::{isize, i8, i16, i32, i64};
+use core::{f32, f64};
+use core::mem::size_of;
+
+/// Numbers which have upper and lower bounds
+pub trait Bounded {
+    // FIXME (#5527): These should be associated constants
+    /// returns the smallest finite number this type can represent
+    fn min_value() -> Self;
+    /// returns the largest finite number this type can represent
+    fn max_value() -> Self;
+}
+
+macro_rules! bounded_impl {
+    ($t:ty, $min:expr, $max:expr) => {
+        impl Bounded for $t {
+            #[inline]
+            fn min_value() -> $t { $min }
+
+            #[inline]
+            fn max_value() -> $t { $max }
+        }
+    }
+}
+
+bounded_impl!(usize, usize::MIN, usize::MAX);
+bounded_impl!(u8, u8::MIN, u8::MAX);
+bounded_impl!(u16, u16::MIN, u16::MAX);
+bounded_impl!(u32, u32::MIN, u32::MAX);
+bounded_impl!(u64, u64::MIN, u64::MAX);
+
+bounded_impl!(isize, isize::MIN, isize::MAX);
+bounded_impl!(i8, i8::MIN, i8::MAX);
+bounded_impl!(i16, i16::MIN, i16::MAX);
+bounded_impl!(i32, i32::MIN, i32::MAX);
+bounded_impl!(i64, i64::MIN, i64::MAX);
+
+bounded_impl!(f32, f32::MIN, f32::MAX);
+bounded_impl!(f64, f64::MIN, f64::MAX);
+
+/// A generic trait for converting a value to a number.
+pub trait ToPrimitive {
+    /// Converts the value of `self` to an `isize`.
+    #[inline]
+    fn to_isize(&self) -> Option<isize> {
+        self.to_i64().and_then(|x| x.to_isize())
+    }
+
+    /// Converts the value of `self` to an `i8`.
+    #[inline]
+    fn to_i8(&self) -> Option<i8> {
+        self.to_i64().and_then(|x| x.to_i8())
+    }
+
+    /// Converts the value of `self` to an `i16`.
+    #[inline]
+    fn to_i16(&self) -> Option<i16> {
+        self.to_i64().and_then(|x| x.to_i16())
+    }
+
+    /// Converts the value of `self` to an `i32`.
+    #[inline]
+    fn to_i32(&self) -> Option<i32> {
+        self.to_i64().and_then(|x| x.to_i32())
+    }
+
+    /// Converts the value of `self` to an `i64`.
+    fn to_i64(&self) -> Option<i64>;
+
+    /// Converts the value of `self` to a `usize`.
+    #[inline]
+    fn to_usize(&self) -> Option<usize> {
+        self.to_u64().and_then(|x| x.to_usize())
+    }
+
+    /// Converts the value of `self` to an `u8`.
+    #[inline]
+    fn to_u8(&self) -> Option<u8> {
+        self.to_u64().and_then(|x| x.to_u8())
+    }
+
+    /// Converts the value of `self` to an `u16`.
+    #[inline]
+    fn to_u16(&self) -> Option<u16> {
+        self.to_u64().and_then(|x| x.to_u16())
+    }
+
+    /// Converts the value of `self` to an `u32`.
+    #[inline]
+    fn to_u32(&self) -> Option<u32> {
+        self.to_u64().and_then(|x| x.to_u32())
+    }
+
+    /// Converts the value of `self` to an `u64`.
+    #[inline]
+    fn to_u64(&self) -> Option<u64>;
+
+    /// Converts the value of `self` to an `f32`.
+    #[inline]
+    fn to_f32(&self) -> Option<f32> {
+        self.to_f64().and_then(|x| x.to_f32())
+    }
+
+    /// Converts the value of `self` to an `f64`.
+    #[inline]
+    fn to_f64(&self) -> Option<f64> {
+        self.to_i64().and_then(|x| x.to_f64())
+    }
+}
+
+macro_rules! impl_to_primitive_int_to_int {
+    ($SrcT:ty, $DstT:ty, $slf:expr) => (
+        {
+            if size_of::<$SrcT>() <= size_of::<$DstT>() {
+                Some($slf as $DstT)
+            } else {
+                let n = $slf as i64;
+                let min_value: $DstT = Bounded::min_value();
+                let max_value: $DstT = Bounded::max_value();
+                if min_value as i64 <= n && n <= max_value as i64 {
+                    Some($slf as $DstT)
+                } else {
+                    None
+                }
+            }
+        }
+    )
+}
+
+macro_rules! impl_to_primitive_int_to_uint {
+    ($SrcT:ty, $DstT:ty, $slf:expr) => (
+        {
+            let zero: $SrcT = 0;
+            let max_value: $DstT = Bounded::max_value();
+            if zero <= $slf && $slf as u64 <= max_value as u64 {
+                Some($slf as $DstT)
+            } else {
+                None
+            }
+        }
+    )
+}
+
+macro_rules! impl_to_primitive_int {
+    ($T:ty) => (
+        impl ToPrimitive for $T {
+            #[inline]
+            fn to_isize(&self) -> Option<isize> { impl_to_primitive_int_to_int!($T, isize, *self) }
+            #[inline]
+            fn to_i8(&self) -> Option<i8> { impl_to_primitive_int_to_int!($T, i8, *self) }
+            #[inline]
+            fn to_i16(&self) -> Option<i16> { impl_to_primitive_int_to_int!($T, i16, *self) }
+            #[inline]
+            fn to_i32(&self) -> Option<i32> { impl_to_primitive_int_to_int!($T, i32, *self) }
+            #[inline]
+            fn to_i64(&self) -> Option<i64> { impl_to_primitive_int_to_int!($T, i64, *self) }
+
+            #[inline]
+            fn to_usize(&self) -> Option<usize> { impl_to_primitive_int_to_uint!($T, usize, *self) }
+            #[inline]
+            fn to_u8(&self) -> Option<u8> { impl_to_primitive_int_to_uint!($T, u8, *self) }
+            #[inline]
+            fn to_u16(&self) -> Option<u16> { impl_to_primitive_int_to_uint!($T, u16, *self) }
+            #[inline]
+            fn to_u32(&self) -> Option<u32> { impl_to_primitive_int_to_uint!($T, u32, *self) }
+            #[inline]
+            fn to_u64(&self) -> Option<u64> { impl_to_primitive_int_to_uint!($T, u64, *self) }
+
+            #[inline]
+            fn to_f32(&self) -> Option<f32> { Some(*self as f32) }
+            #[inline]
+            fn to_f64(&self) -> Option<f64> { Some(*self as f64) }
+        }
+    )
+}
+
+impl_to_primitive_int! { isize }
+impl_to_primitive_int! { i8 }
+impl_to_primitive_int! { i16 }
+impl_to_primitive_int! { i32 }
+impl_to_primitive_int! { i64 }
+
+macro_rules! impl_to_primitive_uint_to_int {
+    ($DstT:ty, $slf:expr) => (
+        {
+            let max_value: $DstT = Bounded::max_value();
+            if $slf as u64 <= max_value as u64 {
+                Some($slf as $DstT)
+            } else {
+                None
+            }
+        }
+    )
+}
+
+macro_rules! impl_to_primitive_uint_to_uint {
+    ($SrcT:ty, $DstT:ty, $slf:expr) => (
+        {
+            if size_of::<$SrcT>() <= size_of::<$DstT>() {
+                Some($slf as $DstT)
+            } else {
+                let zero: $SrcT = 0;
+                let max_value: $DstT = Bounded::max_value();
+                if zero <= $slf && $slf as u64 <= max_value as u64 {
+                    Some($slf as $DstT)
+                } else {
+                    None
+                }
+            }
+        }
+    )
+}
+
+macro_rules! impl_to_primitive_uint {
+    ($T:ty) => (
+        impl ToPrimitive for $T {
+            #[inline]
+            fn to_isize(&self) -> Option<isize> { impl_to_primitive_uint_to_int!(isize, *self) }
+            #[inline]
+            fn to_i8(&self) -> Option<i8> { impl_to_primitive_uint_to_int!(i8, *self) }
+            #[inline]
+            fn to_i16(&self) -> Option<i16> { impl_to_primitive_uint_to_int!(i16, *self) }
+            #[inline]
+            fn to_i32(&self) -> Option<i32> { impl_to_primitive_uint_to_int!(i32, *self) }
+            #[inline]
+            fn to_i64(&self) -> Option<i64> { impl_to_primitive_uint_to_int!(i64, *self) }
+
+            #[inline]
+            fn to_usize(&self) -> Option<usize> {
+                impl_to_primitive_uint_to_uint!($T, usize, *self)
+            }
+            #[inline]
+            fn to_u8(&self) -> Option<u8> { impl_to_primitive_uint_to_uint!($T, u8, *self) }
+            #[inline]
+            fn to_u16(&self) -> Option<u16> { impl_to_primitive_uint_to_uint!($T, u16, *self) }
+            #[inline]
+            fn to_u32(&self) -> Option<u32> { impl_to_primitive_uint_to_uint!($T, u32, *self) }
+            #[inline]
+            fn to_u64(&self) -> Option<u64> { impl_to_primitive_uint_to_uint!($T, u64, *self) }
+
+            #[inline]
+            fn to_f32(&self) -> Option<f32> { Some(*self as f32) }
+            #[inline]
+            fn to_f64(&self) -> Option<f64> { Some(*self as f64) }
+        }
+    )
+}
+
+impl_to_primitive_uint! { usize }
+impl_to_primitive_uint! { u8 }
+impl_to_primitive_uint! { u16 }
+impl_to_primitive_uint! { u32 }
+impl_to_primitive_uint! { u64 }
+
+macro_rules! impl_to_primitive_float_to_float {
+    ($SrcT:ident, $DstT:ident, $slf:expr) => (
+        if size_of::<$SrcT>() <= size_of::<$DstT>() {
+            Some($slf as $DstT)
+        } else {
+            let n = $slf as f64;
+            let max_value: $SrcT = ::core::$SrcT::MAX;
+            if -max_value as f64 <= n && n <= max_value as f64 {
+                Some($slf as $DstT)
+            } else {
+                None
+            }
+        }
+    )
+}
+
+macro_rules! impl_to_primitive_float {
+    ($T:ident) => (
+        impl ToPrimitive for $T {
+            #[inline]
+            fn to_isize(&self) -> Option<isize> { Some(*self as isize) }
+            #[inline]
+            fn to_i8(&self) -> Option<i8> { Some(*self as i8) }
+            #[inline]
+            fn to_i16(&self) -> Option<i16> { Some(*self as i16) }
+            #[inline]
+            fn to_i32(&self) -> Option<i32> { Some(*self as i32) }
+            #[inline]
+            fn to_i64(&self) -> Option<i64> { Some(*self as i64) }
+
+            #[inline]
+            fn to_usize(&self) -> Option<usize> { Some(*self as usize) }
+            #[inline]
+            fn to_u8(&self) -> Option<u8> { Some(*self as u8) }
+            #[inline]
+            fn to_u16(&self) -> Option<u16> { Some(*self as u16) }
+            #[inline]
+            fn to_u32(&self) -> Option<u32> { Some(*self as u32) }
+            #[inline]
+            fn to_u64(&self) -> Option<u64> { Some(*self as u64) }
+
+            #[inline]
+            fn to_f32(&self) -> Option<f32> { impl_to_primitive_float_to_float!($T, f32, *self) }
+            #[inline]
+            fn to_f64(&self) -> Option<f64> { impl_to_primitive_float_to_float!($T, f64, *self) }
+        }
+    )
+}
+
+impl_to_primitive_float! { f32 }
+impl_to_primitive_float! { f64 }
+
+pub trait FromPrimitive: Sized {
+    #[inline]
+    fn from_isize(n: isize) -> Option<Self> {
+        FromPrimitive::from_i64(n as i64)
+    }
+
+    #[inline]
+    fn from_i8(n: i8) -> Option<Self> {
+        FromPrimitive::from_i64(n as i64)
+    }
+
+    #[inline]
+    fn from_i16(n: i16) -> Option<Self> {
+        FromPrimitive::from_i64(n as i64)
+    }
+
+    #[inline]
+    fn from_i32(n: i32) -> Option<Self> {
+        FromPrimitive::from_i64(n as i64)
+    }
+
+    fn from_i64(n: i64) -> Option<Self>;
+
+    #[inline]
+    fn from_usize(n: usize) -> Option<Self> {
+        FromPrimitive::from_u64(n as u64)
+    }
+
+    #[inline]
+    fn from_u8(n: u8) -> Option<Self> {
+        FromPrimitive::from_u64(n as u64)
+    }
+
+    #[inline]
+    fn from_u16(n: u16) -> Option<Self> {
+        FromPrimitive::from_u64(n as u64)
+    }
+
+    #[inline]
+    fn from_u32(n: u32) -> Option<Self> {
+        FromPrimitive::from_u64(n as u64)
+    }
+
+    fn from_u64(n: u64) -> Option<Self>;
+
+    #[inline]
+    fn from_f32(n: f32) -> Option<Self> {
+        FromPrimitive::from_f64(n as f64)
+    }
+
+    #[inline]
+    fn from_f64(n: f64) -> Option<Self> {
+        FromPrimitive::from_i64(n as i64)
+    }
+}
+
+macro_rules! impl_from_primitive {
+    ($T:ty, $to_ty:ident) => (
+        impl FromPrimitive for $T {
+            #[inline] fn from_i8(n: i8) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_i16(n: i16) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_i32(n: i32) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_i64(n: i64) -> Option<$T> { n.$to_ty() }
+
+            #[inline] fn from_u8(n: u8) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_u16(n: u16) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_u32(n: u32) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_u64(n: u64) -> Option<$T> { n.$to_ty() }
+
+            #[inline] fn from_f32(n: f32) -> Option<$T> { n.$to_ty() }
+            #[inline] fn from_f64(n: f64) -> Option<$T> { n.$to_ty() }
+        }
+    )
+}
+
+impl_from_primitive! { isize, to_isize }
+impl_from_primitive! { i8, to_i8 }
+impl_from_primitive! { i16, to_i16 }
+impl_from_primitive! { i32, to_i32 }
+impl_from_primitive! { i64, to_i64 }
+impl_from_primitive! { usize, to_usize }
+impl_from_primitive! { u8, to_u8 }
+impl_from_primitive! { u16, to_u16 }
+impl_from_primitive! { u32, to_u32 }
+impl_from_primitive! { u64, to_u64 }
+impl_from_primitive! { f32, to_f32 }
+impl_from_primitive! { f64, to_f64 }

serde/src/de/mod.rs

@@ -1,38 +1,145 @@
 //! Generic deserialization framework.
 
+#[cfg(feature = "std")]
+use std::error;
+#[cfg(not(feature = "std"))]
+use error;
+
+#[cfg(all(not(feature = "std"), feature = "collections"))]
+use collections::{String, Vec};
+
+use core::fmt;
+
+///////////////////////////////////////////////////////////////////////////////
+/// Macro helper to not have to re-implement all the defaulted methods.
+/// Every given method ignores all arguments and forwards to `deserialize`.
+/// Note that `deserialize_enum` simply returns an `Error::invalid_type`.
+macro_rules! de_forward_to_deserialize {
+    ($($func:ident),*) => {
+        $(de_forward_to_deserialize!{func: $func})*
+    };
+    (func: deserialize_unit_struct) => {
+        de_forward_to_deserialize!{named: deserialize_unit_struct}
+    };
+    (func: deserialize_newtype_struct) => {
+        de_forward_to_deserialize!{named: deserialize_newtype_struct}
+    };
+    (func: deserialize_tuple) => {
+        de_forward_to_deserialize!{tup_fn: deserialize_tuple}
+    };
+    (func: deserialize_seq_fixed_size) => {
+        de_forward_to_deserialize!{tup_fn: deserialize_seq_fixed_size}
+    };
+    (func: deserialize_tuple_struct) => {
+        #[inline]
+        fn deserialize_tuple_struct<__V>(&mut self, _: &str, _: usize, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (func: deserialize_struct) => {
+        #[inline]
+        fn deserialize_struct<__V>(&mut self, _: &str, _: &[&str], visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (func: deserialize_enum) => {
+        #[inline]
+        fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::EnumVisitor {
+            Err($crate::de::Error::invalid_type($crate::de::Type::Enum))
+        }
+    };
+    (named: $func:ident) => {
+        #[inline]
+        fn $func<__V>(&mut self, _: &str, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (tup_fn: $func: ident) => {
+        #[inline]
+        fn $func<__V>(&mut self, _: usize, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (func: $func:ident) => {
+        #[inline]
+        fn $func<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// modules come after macros
+
 pub mod impls;
 pub mod value;
+mod from_primitive;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /// `Error` is a trait that allows a `Deserialize` to generically create a
 /// `Deserializer` error.
-pub trait Error: Sized {
+pub trait Error: Sized + error::Error {
     /// Raised when there is general error when deserializing a type.
-    fn syntax(msg: &str) -> Self;
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn custom<T: Into<String>>(msg: T) -> 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")
-    }
-
-    /// Raised when a `Deserialize` was passed an incorrect type.
-    fn type_mismatch(_type: Type) -> Self {
-        Error::syntax("incorrect type")
-    }
+    /// Raised when there is general error when deserializing a type.
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    fn custom<T: Into<&'static str>>(msg: T) -> 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` was passed an incorrect type.
+    fn invalid_type(ty: Type) -> Self {
+        Error::custom(format!("Invalid type. Expected `{:?}`", ty))
+    }
 
-    /// Raised when a `Deserialize` struct type did not receive a field.
-    fn missing_field(field: &'static str) -> Self;
+    /// Raised when a `Deserialize` was passed an incorrect value.
+    fn invalid_value(msg: &str) -> Self {
+        Error::custom(format!("Invalid value: {}", msg))
+    }
+
+    /// Raised when a fixed sized sequence or map was passed in the wrong amount of arguments.
+    ///
+    /// The parameter `len` is the number of arguments found in the serialization. The sequence
+    /// may either expect more arguments or less arguments.
+    fn invalid_length(len: usize) -> Self {
+        Error::custom(format!("Invalid length: {}", len))
+    }
+
+    /// Raised when a `Deserialize` enum type received an unexpected variant.
+    fn unknown_variant(field: &str) -> Self {
+        Error::custom(format!("Unknown variant `{}`", field))
+    }
+
+    /// Raised when a `Deserialize` struct type received an unexpected struct field.
+    fn unknown_field(field: &str) -> Self {
+        Error::custom(format!("Unknown field `{}`", field))
+    }
+
+    /// raised when a `deserialize` struct type did not receive a field.
+    fn missing_field(field: &'static str) -> Self {
+        Error::custom(format!("Missing field `{}`", field))
+    }
+
+    /// Raised when a `Deserialize` struct type received more than one of the
+    /// same struct field.
+    fn duplicate_field(field: &'static str) -> Self {
+        Error::custom(format!("Duplicate field `{}`", field))
+    }
 }
 
 /// `Type` represents all the primitive types that can be deserialized. This is used by
-/// `Error::kind_mismatch`.
+/// `Error::invalid_type`.
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Type {
     /// Represents a `bool` type.
     Bool,
@@ -106,12 +213,18 @@ pub enum Type {
     /// Represents a struct type.
     Struct,
 
+    /// Represents a struct field name.
+    FieldName,
+
     /// Represents a tuple type.
     Tuple,
 
     /// Represents an `enum` type.
     Enum,
 
+    /// Represents an enum variant name.
+    VariantName,
+
     /// Represents a struct variant.
     StructVariant,
 
@@ -125,6 +238,46 @@ pub enum Type {
     Bytes,
 }
 
+impl fmt::Display for Type {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        let display = match *self {
+            Type::Bool          => "bool",
+            Type::Usize         => "usize",
+            Type::U8            => "u8",
+            Type::U16           => "u16",
+            Type::U32           => "u32",
+            Type::U64           => "u64",
+            Type::Isize         => "isize",
+            Type::I8            => "i8",
+            Type::I16           => "i16",
+            Type::I32           => "i32",
+            Type::I64           => "i64",
+            Type::F32           => "f32",
+            Type::F64           => "f64",
+            Type::Char          => "char",
+            Type::Str           => "str",
+            Type::String        => "string",
+            Type::Unit          => "unit",
+            Type::Option        => "option",
+            Type::Seq           => "seq",
+            Type::Map           => "map",
+            Type::UnitStruct    => "unit struct",
+            Type::NewtypeStruct => "newtype struct",
+            Type::TupleStruct   => "tuple struct",
+            Type::Struct        => "struct",
+            Type::FieldName     => "field name",
+            Type::Tuple         => "tuple",
+            Type::Enum          => "enum",
+            Type::VariantName   => "variant name",
+            Type::StructVariant => "struct variant",
+            Type::TupleVariant  => "tuple variant",
+            Type::UnitVariant   => "unit variant",
+            Type::Bytes         => "bytes",
+        };
+        display.fmt(formatter)
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /// `Deserialize` represents a type that can be deserialized.
@@ -139,273 +292,184 @@ pub trait Deserialize: Sized {
 /// `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
+/// 1) The `deserialize` method. File formats like JSON embed the type of its construct in its 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.
+/// 2) The `deserialize_*` methods. File formats like bincode do not embed in its format how to
+///    decode its values. It relies instead on the `Deserialize` type to hint to the `Deserializer`
+///    with the `deserialize_*` methods how it should parse the next value. One downside though to
+///    only supporting the `deserialize_*` types is that it does not allow for deserializing into a
+///    generic `json::Value`-esque type.
 pub trait Deserializer {
     /// The error type that can be returned if some error occurs during deserialization.
     type Error: Error;
 
     /// This method walks a visitor through a value as it is being deserialized.
-    fn visit<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+    fn deserialize<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)
-    }
+    fn deserialize_bool<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_u64`.
+    fn deserialize_usize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_u64`.
+    fn deserialize_u8<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_u64`.
+    fn deserialize_u16<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_u64`.
+    fn deserialize_u32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_u64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_i64`.
+    fn deserialize_isize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_i64`.
+    fn deserialize_i8<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_i64`.
+    fn deserialize_i16<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_i64`.
+    fn deserialize_i32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_i64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    /// A reasonable default is to forward to `deserialize_f64`.
+    fn deserialize_f32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_f64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_char<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_str<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_string<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)
-    }
+    fn deserialize_unit<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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)`.
-    #[inline]
-    fn visit_option<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
+    fn deserialize_option<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
-    #[inline]
-    fn visit_seq<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
+    fn deserialize_seq<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
-    #[inline]
-    fn visit_map<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 unit struct. This allows
-    /// deserializers to a unit struct that aren't tagged as a unit struct.
-    #[inline]
-    fn visit_unit_struct<V>(&mut self,
-                            _name: &'static str,
-                            visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_unit(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.
-    #[inline]
-    fn visit_newtype_struct<V>(&mut self,
-                               name: &'static str,
-                               visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_tuple_struct(name, 1, 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.
-    #[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>
-        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.
-    #[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>
-        where V: EnumVisitor,
-    {
-        Err(Error::syntax("expected an enum"))
-    }
+    /// This method hints that the `Deserialize` type is expecting a fixed size array. This allows
+    /// deserializers to parse arrays that aren't tagged as arrays.
+    fn deserialize_seq_fixed_size<V>(&mut self,
+                                     len: usize,
+                                     visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 
     /// 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.
-    #[inline]
-    fn visit_bytes<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit_seq(visitor)
-    }
+    fn deserialize_bytes<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 
-    /// Specify a format string for the deserializer.
-    ///
-    /// The deserializer format is used to determine which format
-    /// specific field attributes should be used with the
-    /// deserializer.
-    fn format() -> &'static str {
-        ""
-    }
+    /// 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.
+    fn deserialize_map<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
+    fn deserialize_unit_struct<V>(&mut self,
+                                  name: &'static str,
+                                  visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
+    /// A reasonable default is to simply deserialize the expected value directly.
+    fn deserialize_newtype_struct<V>(&mut self,
+                                     name: &'static str,
+                                     visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
+    fn deserialize_tuple_struct<V>(&mut self,
+                                   name: &'static str,
+                                   len: usize,
+                                   visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
+
+    /// This method hints that the `Deserialize` type is expecting a struct. This allows
+    /// deserializers to parse sequences that aren't tagged as maps.
+    fn deserialize_struct<V>(&mut self,
+                             name: &'static str,
+                             fields: &'static [&'static str],
+                             visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
+
+    /// This method hints that the `Deserialize` type is expecting some sort of struct field
+    /// name.  This allows deserializers to choose between &str, usize, or &[u8] to properly
+    /// deserialize a struct field.
+    fn deserialize_struct_field<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
+    fn deserialize_tuple<V>(&mut self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
+        where V: 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.
+    fn deserialize_enum<V>(&mut self,
+                           name: &'static str,
+                           variants: &'static [&'static str],
+                           visitor: V) -> Result<V::Value, Self::Error>
+        where V: EnumVisitor;
+
+    /// This method hints that the `Deserialize` type needs to deserialize a value whose type
+    /// doesn't matter because it is ignored.
+    fn deserialize_ignored_any<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -416,10 +480,11 @@ pub trait Visitor {
     type Value: Deserialize;
 
     /// `visit_bool` deserializes a `bool` into a `Value`.
-    fn visit_bool<E>(&mut self, _v: bool) -> Result<Self::Value, E>
+    fn visit_bool<E>(&mut self, v: bool) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Bool))
+        let _ = v;
+        Err(Error::invalid_type(Type::Bool))
     }
 
     /// `visit_isize` deserializes a `isize` into a `Value`.
@@ -451,10 +516,11 @@ pub trait Visitor {
     }
 
     /// `visit_i64` deserializes a `i64` into a `Value`.
-    fn visit_i64<E>(&mut self, _v: i64) -> Result<Self::Value, E>
+    fn visit_i64<E>(&mut self, v: i64) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::I64))
+        let _ = v;
+        Err(Error::invalid_type(Type::I64))
     }
 
     /// `visit_usize` deserializes a `usize` into a `Value`.
@@ -486,10 +552,11 @@ pub trait Visitor {
     }
 
     /// `visit_u64` deserializes a `u64` into a `Value`.
-    fn visit_u64<E>(&mut self, _v: u64) -> Result<Self::Value, E>
+    fn visit_u64<E>(&mut self, v: u64) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::U64))
+        let _ = v;
+        Err(Error::invalid_type(Type::U64))
     }
 
     /// `visit_f32` deserializes a `f32` into a `Value`.
@@ -500,10 +567,11 @@ pub trait Visitor {
     }
 
     /// `visit_f64` deserializes a `f64` into a `Value`.
-    fn visit_f64<E>(&mut self, _v: f64) -> Result<Self::Value, E>
+    fn visit_f64<E>(&mut self, v: f64) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::F64))
+        let _ = v;
+        Err(Error::invalid_type(Type::F64))
     }
 
     /// `visit_char` deserializes a `char` into a `Value`.
@@ -511,20 +579,22 @@ pub trait Visitor {
     fn visit_char<E>(&mut self, v: char) -> Result<Self::Value, E>
         where E: Error,
     {
-        // FIXME: this allocation is required in order to be compatible with stable rust, which
-        // doesn't support encoding a `char` into a stack buffer.
-        self.visit_string(v.to_string())
+        self.visit_str(::utils::encode_utf8(v).as_str())
     }
 
     /// `visit_str` deserializes a `&str` into a `Value`.
-    fn visit_str<E>(&mut self, _v: &str) -> Result<Self::Value, E>
+    fn visit_str<E>(&mut self, v: &str) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Str))
+        let _ = v;
+        Err(Error::invalid_type(Type::Str))
     }
 
-    /// `visit_string` deserializes a `String` into a `Value`.
+    /// `visit_string` deserializes a `String` into a `Value`.  This allows a deserializer to avoid
+    /// a copy if it is deserializing a string from a `String` type.  By default it passes a `&str`
+    /// to the `visit_str` method.
     #[inline]
+    #[cfg(any(feature = "std", feature = "collections"))]
     fn visit_string<E>(&mut self, v: String) -> Result<Self::Value, E>
         where E: Error,
     {
@@ -535,14 +605,15 @@ pub trait Visitor {
     fn visit_unit<E>(&mut self) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Unit))
+        Err(Error::invalid_type(Type::Unit))
     }
 
     /// `visit_unit_struct` deserializes a unit struct into a `Value`.
     #[inline]
-    fn visit_unit_struct<E>(&mut self, _name: &'static str) -> Result<Self::Value, E>
+    fn visit_unit_struct<E>(&mut self, name: &'static str) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = name;
         self.visit_unit()
     }
 
@@ -550,45 +621,51 @@ pub trait Visitor {
     fn visit_none<E>(&mut self) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Option))
+        Err(Error::invalid_type(Type::Option))
     }
 
     /// `visit_some` deserializes a value into a `Value`.
-    fn visit_some<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
+    fn visit_some<D>(&mut self, deserializer: &mut D) -> Result<Self::Value, D::Error>
         where D: Deserializer,
     {
-        Err(Error::type_mismatch(Type::Option))
+        let _ = deserializer;
+        Err(Error::invalid_type(Type::Option))
     }
 
     /// `visit_newtype_struct` deserializes a value into a `Value`.
-    fn visit_newtype_struct<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
+    fn visit_newtype_struct<D>(&mut self, deserializer: &mut D) -> Result<Self::Value, D::Error>
         where D: Deserializer,
     {
-        Err(Error::type_mismatch(Type::NewtypeStruct))
+        let _ = deserializer;
+        Err(Error::invalid_type(Type::NewtypeStruct))
     }
 
-    /// `visit_bool` deserializes a `SeqVisitor` into a `Value`.
-    fn visit_seq<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
+    /// `visit_seq` deserializes a `SeqVisitor` into a `Value`.
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<Self::Value, V::Error>
         where V: SeqVisitor,
     {
-        Err(Error::type_mismatch(Type::Seq))
+        let _ = visitor;
+        Err(Error::invalid_type(Type::Seq))
     }
 
     /// `visit_map` deserializes a `MapVisitor` into a `Value`.
-    fn visit_map<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
+    fn visit_map<V>(&mut self, visitor: V) -> Result<Self::Value, V::Error>
         where V: MapVisitor,
     {
-        Err(Error::type_mismatch(Type::Map))
+        let _ = visitor;
+        Err(Error::invalid_type(Type::Map))
     }
 
     /// `visit_bytes` deserializes a `&[u8]` into a `Value`.
-    fn visit_bytes<E>(&mut self, _v: &[u8]) -> Result<Self::Value, E>
+    fn visit_bytes<E>(&mut self, v: &[u8]) -> Result<Self::Value, E>
         where E: Error,
     {
-        Err(Error::type_mismatch(Type::Bytes))
+        let _ = v;
+        Err(Error::invalid_type(Type::Bytes))
     }
 
     /// `visit_byte_buf` deserializes a `Vec<u8>` into a `Value`.
+    #[cfg(any(feature = "std", feature = "collections"))]
     fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<Self::Value, E>
         where E: Error,
     {
@@ -685,7 +762,7 @@ pub trait MapVisitor {
         (0, None)
     }
 
-    /// Report that there 
+    /// Report that the struct has a field that wasn't deserialized
     fn missing_field<V>(&mut self, field: &'static str) -> Result<V, Self::Error>
         where V: Deserialize,
     {
@@ -756,36 +833,29 @@ 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::invalid_type(Type::UnitVariant))
     }
 
-    /// `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]
+    /// `visit_newtype` is called when deserializing a variant with a single value.
+    /// A good default is often to use the `visit_tuple` method to deserialize a `(value,)`.
     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)
-    }
+        where T: Deserialize;
 
     /// `visit_tuple` is called when deserializing a tuple-like variant.
+    /// If no tuple variants are expected, yield a
+    /// `Err(serde::de::Error::invalid_type(serde::de::Type::TupleVariant))`
     fn visit_tuple<V>(&mut self,
-                      _len: usize,
-                      _visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        Err(Error::type_mismatch(Type::TupleVariant))
-    }
+                      len: usize,
+                      visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 
     /// `visit_struct` is called when deserializing a struct-like variant.
+    /// If no struct variants are expected, yield a
+    /// `Err(serde::de::Error::invalid_type(serde::de::Type::StructVariant))`
     fn visit_struct<V>(&mut self,
-                       _fields: &'static [&'static str],
-                       _visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        Err(Error::type_mismatch(Type::StructVariant))
-    }
+                       fields: &'static [&'static str],
+                       visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 }
 
 impl<'a, T> VariantVisitor for &'a mut T where T: VariantVisitor {
@@ -816,8 +886,8 @@ impl<'a, T> VariantVisitor for &'a mut T where T: VariantVisitor {
     }
 
     fn visit_struct<V>(&mut self,
-                    fields: &'static [&'static str],
-                    visitor: V) -> Result<V::Value, T::Error>
+                       fields: &'static [&'static str],
+                       visitor: V) -> Result<V::Value, T::Error>
         where V: Visitor,
     {
         (**self).visit_struct(fields, visitor)

serde/src/de/value.rs

@@ -1,5 +1,6 @@
 //! This module supports deserializing from primitives with the `ValueDeserializer` trait.
 
+#[cfg(feature = "std")]
 use std::collections::{
     BTreeMap,
     BTreeSet,
@@ -10,9 +11,32 @@ use std::collections::{
     hash_map,
     hash_set,
 };
-use std::hash::Hash;
+#[cfg(feature = "std")]
 use std::vec;
 
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::{
+    BTreeMap,
+    BTreeSet,
+    Vec,
+    String,
+    btree_map,
+    btree_set,
+    vec,
+};
+
+#[cfg(all(feature = "unstable", feature = "collections"))]
+use collections::borrow::ToOwned;
+
+use core::hash::Hash;
+#[cfg(feature = "std")]
+use std::error;
+#[cfg(not(feature = "std"))]
+use error;
+
+use core::fmt;
+use core::marker::PhantomData;
+
 use de;
 use bytes;
 
@@ -21,32 +45,110 @@ use bytes;
 /// This represents all the possible errors that can occur using the `ValueDeserializer`.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Error {
-    /// The value had some syntatic error.
-    SyntaxError,
+    /// The value had some custom error.
+    #[cfg(any(feature = "std", feature = "collections"))]
+    Custom(String),
+    /// The value had some custom error.
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    Custom(&'static str),
+
+    /// The value had an incorrect type.
+    InvalidType(de::Type),
+
+    /// The value had an invalid length.
+    InvalidLength(usize),
+
+    /// The value is invalid and cannot be deserialized.
+    #[cfg(any(feature = "std", feature = "collections"))]
+    InvalidValue(String),
+    /// The value is invalid and cannot be deserialized.
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    InvalidValue(&'static str),
 
     /// EOF while deserializing a value.
-    EndOfStreamError,
+    EndOfStream,
+
+    /// Unknown variant in enum.
+    #[cfg(any(feature = "std", feature = "collections"))]
+    UnknownVariant(String),
+    /// Unknown variant in enum.
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    UnknownVariant(&'static str),
 
     /// Unknown field in struct.
-    UnknownFieldError(String),
+    #[cfg(any(feature = "std", feature = "collections"))]
+    UnknownField(String),
+    /// Unknown field in struct.
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    UnknownField(&'static str),
 
     /// Struct is missing a field.
-    MissingFieldError(&'static str),
+    MissingField(&'static str),
 }
 
 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) }
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn custom<T: Into<String>>(msg: T) -> Self { Error::Custom(msg.into()) }
+
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    fn custom<T: Into<&'static str>>(msg: T) -> Self { Error::Custom(msg.into()) }
+
+    fn end_of_stream() -> Self { Error::EndOfStream }
+    fn invalid_type(ty: de::Type) -> Self { Error::InvalidType(ty) }
+
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn invalid_value(msg: &str) -> Self { Error::InvalidValue(msg.to_owned()) }
+
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    fn invalid_value(msg: &str) -> Self { Error::InvalidValue("invalid value") }
+
+    fn invalid_length(len: usize) -> Self { Error::InvalidLength(len) }
+
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn unknown_variant(variant: &str) -> Self { Error::UnknownVariant(String::from(variant)) }
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn unknown_field(field: &str) -> Self { Error::UnknownField(String::from(field)) }
+
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    fn unknown_variant(variant: &str) -> Self { Error::UnknownVariant("unknown variant") }
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    fn unknown_field(field: &str) -> Self { Error::UnknownField("unknown field") }
+    fn missing_field(field: &'static str) -> Self { Error::MissingField(field) }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        match *self {
+            Error::Custom(ref s) => write!(formatter, "{}", s),
+            Error::EndOfStream => formatter.write_str("End of stream"),
+            Error::InvalidType(ty) => write!(formatter, "Invalid type, expected `{:?}`", ty),
+            Error::InvalidValue(ref value) => write!(formatter, "Invalid value: {}", value),
+            Error::InvalidLength(len) => write!(formatter, "Invalid length: {}", len),
+            Error::UnknownVariant(ref variant) => {
+                write!(formatter, "Unknown variant: {}", variant)
+            }
+            Error::UnknownField(ref field) => write!(formatter, "Unknown field: {}", field),
+            Error::MissingField(field) => write!(formatter, "Missing field: {}", field),
+        }
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Deserialization Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /// This trait converts primitive types into a deserializer.
-pub trait ValueDeserializer {
+pub trait ValueDeserializer<E: de::Error = Error> {
     /// The actual deserializer type.
-    type Deserializer: de::Deserializer<Error=Error>;
+    type Deserializer: de::Deserializer<Error=E>;
 
     /// Convert this value into a deserializer.
     fn into_deserializer(self) -> Self::Deserializer;
@@ -54,27 +156,47 @@ pub trait ValueDeserializer {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl ValueDeserializer for () {
-    type Deserializer = UnitDeserializer;
+impl<E> ValueDeserializer<E> for ()
+    where E: de::Error,
+{
+    type Deserializer = UnitDeserializer<E>;
 
-    fn into_deserializer(self) -> UnitDeserializer {
-        UnitDeserializer
+    fn into_deserializer(self) -> UnitDeserializer<E> {
+        UnitDeserializer(PhantomData)
     }
 }
 
 /// A helper deserializer that deserializes a `()`.
-pub struct UnitDeserializer;
+pub struct UnitDeserializer<E>(PhantomData<E>);
 
-impl de::Deserializer for UnitDeserializer {
-    type Error = Error;
+impl<E> de::Deserializer for UnitDeserializer<E>
+    where E: de::Error
+{
+    type Error = E;
 
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct
+    }
+
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         visitor.visit_unit()
     }
 
-    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    fn deserialize_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         visitor.visit_none()
@@ -86,20 +208,41 @@ impl de::Deserializer for UnitDeserializer {
 macro_rules! primitive_deserializer {
     ($ty:ty, $name:ident, $method:ident) => {
         /// A helper deserializer that deserializes a number.
-        pub struct $name(Option<$ty>);
+        pub struct $name<E>(Option<$ty>, PhantomData<E>);
 
-        impl ValueDeserializer for $ty {
-            type Deserializer = $name;
+        impl<E> ValueDeserializer<E> for $ty
+            where E: de::Error,
+        {
+            type Deserializer = $name<E>;
 
-            fn into_deserializer(self) -> $name {
-                $name(Some(self))
+            fn into_deserializer(self) -> $name<E> {
+                $name(Some(self), PhantomData)
             }
         }
 
-        impl de::Deserializer for $name {
-            type Error = Error;
+        impl<E> de::Deserializer for $name<E>
+            where E: de::Error,
+        {
+            type Error = E;
 
-            fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+            de_forward_to_deserialize!{
+                deserialize_bool,
+                deserialize_f64, deserialize_f32,
+                deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+                deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+                deserialize_char, deserialize_str, deserialize_string,
+                deserialize_ignored_any,
+                deserialize_bytes,
+                deserialize_unit_struct, deserialize_unit,
+                deserialize_seq, deserialize_seq_fixed_size,
+                deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+                deserialize_tuple,
+                deserialize_enum,
+                deserialize_struct, deserialize_tuple_struct,
+                deserialize_option
+            }
+
+            fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
                 where V: de::Visitor,
             {
                 match self.0.take() {
@@ -129,20 +272,24 @@ primitive_deserializer!(char, CharDeserializer, visit_char);
 ///////////////////////////////////////////////////////////////////////////////
 
 /// A helper deserializer that deserializes a `&str`.
-pub struct StrDeserializer<'a>(Option<&'a str>);
+pub struct StrDeserializer<'a, E>(Option<&'a str>, PhantomData<E>);
 
-impl<'a> ValueDeserializer for &'a str {
-    type Deserializer = StrDeserializer<'a>;
+impl<'a, E> ValueDeserializer<E> for &'a str
+    where E: de::Error,
+{
+    type Deserializer = StrDeserializer<'a, E>;
 
-    fn into_deserializer(self) -> StrDeserializer<'a> {
-        StrDeserializer(Some(self))
+    fn into_deserializer(self) -> StrDeserializer<'a, E> {
+        StrDeserializer(Some(self), PhantomData)
     }
 }
 
-impl<'a> de::Deserializer for StrDeserializer<'a> {
-    type Error = Error;
+impl<'a, E> de::Deserializer for StrDeserializer<'a, E>
+    where E: de::Error,
+{
+    type Error = E;
 
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         match self.0.take() {
@@ -151,47 +298,95 @@ impl<'a> de::Deserializer for StrDeserializer<'a> {
         }
     }
 
-    fn visit_enum<V>(&mut self,
+    fn deserialize_enum<V>(&mut self,
                      _name: &str,
                      _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
+                     mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::EnumVisitor,
     {
         visitor.visit(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
-impl<'a> de::VariantVisitor for StrDeserializer<'a> {
-    type Error = Error;
+impl<'a, E> de::VariantVisitor for StrDeserializer<'a, E>
+    where E: de::Error,
+{
+    type Error = E;
 
-    fn visit_variant<T>(&mut self) -> Result<T, Error>
+    fn visit_variant<T>(&mut self) -> Result<T, Self::Error>
         where T: de::Deserialize,
     {
         de::Deserialize::deserialize(self)
     }
 
-    fn visit_unit(&mut self) -> Result<(), Error> {
+    fn visit_unit(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
+
+    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
+        where T: super::Deserialize,
+    {
+        let (value,) = try!(self.visit_tuple(1, super::impls::TupleVisitor1::new()));
+        Ok(value)
+    }
+
+    fn visit_tuple<V>(&mut self,
+                      _len: usize,
+                      _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::TupleVariant))
+    }
+
+    fn visit_struct<V>(&mut self,
+                       _fields: &'static [&'static str],
+                       _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::StructVariant))
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /// A helper deserializer that deserializes a `String`.
-pub struct StringDeserializer(Option<String>);
+#[cfg(any(feature = "std", feature = "collections"))]
+pub struct StringDeserializer<E>(Option<String>, PhantomData<E>);
 
-impl ValueDeserializer for String {
-    type Deserializer = StringDeserializer;
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<E> ValueDeserializer<E> for String
+    where E: de::Error,
+{
+    type Deserializer = StringDeserializer<E>;
 
-    fn into_deserializer(self) -> StringDeserializer {
-        StringDeserializer(Some(self))
+    fn into_deserializer(self) -> StringDeserializer<E> {
+        StringDeserializer(Some(self), PhantomData)
     }
 }
 
-impl de::Deserializer for StringDeserializer {
-    type Error = Error;
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<E> de::Deserializer for StringDeserializer<E>
+    where E: de::Error,
+{
+    type Error = E;
 
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         match self.0.take() {
@@ -200,68 +395,133 @@ impl de::Deserializer for StringDeserializer {
         }
     }
 
-    fn visit_enum<V>(&mut self,
+    fn deserialize_enum<V>(&mut self,
                      _name: &str,
                      _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
+                     mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::EnumVisitor,
     {
         visitor.visit(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
-impl<'a> de::VariantVisitor for StringDeserializer {
-    type Error = Error;
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<'a, E> de::VariantVisitor for StringDeserializer<E>
+    where E: de::Error,
+{
+    type Error = E;
 
-    fn visit_variant<T>(&mut self) -> Result<T, Error>
+    fn visit_variant<T>(&mut self) -> Result<T, Self::Error>
         where T: de::Deserialize,
     {
         de::Deserialize::deserialize(self)
     }
 
-    fn visit_unit(&mut self) -> Result<(), Error> {
+    fn visit_unit(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
+
+    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
+        where T: super::Deserialize,
+    {
+        let (value,) = try!(self.visit_tuple(1, super::impls::TupleVisitor1::new()));
+        Ok(value)
+    }
+
+    fn visit_tuple<V>(&mut self,
+                      _len: usize,
+                      _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::TupleVariant))
+    }
+
+    fn visit_struct<V>(&mut self,
+                       _fields: &'static [&'static str],
+                       _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::StructVariant))
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /// A helper deserializer that deserializes a sequence.
-pub struct SeqDeserializer<I> {
+pub struct SeqDeserializer<I, E> {
     iter: I,
     len: usize,
+    marker: PhantomData<E>,
 }
 
-impl<I> SeqDeserializer<I> {
+impl<I, E> SeqDeserializer<I, E>
+    where E: de::Error,
+{
     /// Construct a new `SeqDeserializer<I>`.
     pub fn new(iter: I, len: usize) -> Self {
         SeqDeserializer {
             iter: iter,
             len: len,
+            marker: PhantomData,
         }
     }
 }
 
-impl<I, T> de::Deserializer for SeqDeserializer<I>
+impl<I, T, E> de::Deserializer for SeqDeserializer<I, E>
     where I: Iterator<Item=T>,
-          T: ValueDeserializer,
+          T: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Error = Error;
+    type Error = E;
 
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         visitor.visit_seq(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
-impl<I, T> de::SeqVisitor for SeqDeserializer<I>
+impl<I, T, E> de::SeqVisitor for SeqDeserializer<I, E>
     where I: Iterator<Item=T>,
-          T: ValueDeserializer,
+          T: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Error = Error;
+    type Error = E;
 
-    fn visit<V>(&mut self) -> Result<Option<V>, Error>
+    fn visit<V>(&mut self) -> Result<Option<V>, Self::Error>
         where V: de::Deserialize
     {
         match self.iter.next() {
@@ -274,11 +534,11 @@ impl<I, T> de::SeqVisitor for SeqDeserializer<I>
         }
     }
 
-    fn end(&mut self) -> Result<(), Error> {
+    fn end(&mut self) -> Result<(), Self::Error> {
         if self.len == 0 {
             Ok(())
         } else {
-            Err(de::Error::length_mismatch(self.len))
+            Err(de::Error::invalid_length(self.len))
         }
     }
 
@@ -289,34 +549,40 @@ impl<I, T> de::SeqVisitor for SeqDeserializer<I>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<T> ValueDeserializer for Vec<T>
-    where T: ValueDeserializer,
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T, E> ValueDeserializer<E> for Vec<T>
+    where T: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Deserializer = SeqDeserializer<vec::IntoIter<T>>;
+    type Deserializer = SeqDeserializer<vec::IntoIter<T>, E>;
 
-    fn into_deserializer(self) -> SeqDeserializer<vec::IntoIter<T>> {
+    fn into_deserializer(self) -> Self::Deserializer {
         let len = self.len();
         SeqDeserializer::new(self.into_iter(), len)
     }
 }
 
-impl<T> ValueDeserializer for BTreeSet<T>
-    where T: ValueDeserializer + Eq + Ord,
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T, E> ValueDeserializer<E> for BTreeSet<T>
+    where T: ValueDeserializer<E> + Eq + Ord,
+          E: de::Error,
 {
-    type Deserializer = SeqDeserializer<btree_set::IntoIter<T>>;
+    type Deserializer = SeqDeserializer<btree_set::IntoIter<T>, E>;
 
-    fn into_deserializer(self) -> SeqDeserializer<btree_set::IntoIter<T>> {
+    fn into_deserializer(self) -> Self::Deserializer {
         let len = self.len();
         SeqDeserializer::new(self.into_iter(), len)
     }
 }
 
-impl<T> ValueDeserializer for HashSet<T>
-    where T: ValueDeserializer + Eq + Hash,
+#[cfg(feature = "std")]
+impl<T, E> ValueDeserializer<E> for HashSet<T>
+    where T: ValueDeserializer<E> + Eq + Hash,
+          E: de::Error,
 {
-    type Deserializer = SeqDeserializer<hash_set::IntoIter<T>>;
+    type Deserializer = SeqDeserializer<hash_set::IntoIter<T>, E>;
 
-    fn into_deserializer(self) -> SeqDeserializer<hash_set::IntoIter<T>> {
+    fn into_deserializer(self) -> Self::Deserializer {
         let len = self.len();
         SeqDeserializer::new(self.into_iter(), len)
     }
@@ -324,21 +590,73 @@ impl<T> ValueDeserializer for HashSet<T>
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/// A helper deserializer that deserializes a sequence using a `SeqVisitor`.
+pub struct SeqVisitorDeserializer<V_, E> {
+    visitor: V_,
+    marker: PhantomData<E>,
+}
+
+impl<V_, E> SeqVisitorDeserializer<V_, E>
+    where V_: de::SeqVisitor<Error = E>,
+          E: de::Error,
+{
+    /// Construct a new `SeqVisitorDeserializer<V_, E>`.
+    pub fn new(visitor: V_) -> Self {
+        SeqVisitorDeserializer{
+            visitor: visitor,
+            marker: PhantomData
+        }
+    }
+}
+
+impl<V_, E> de::Deserializer for SeqVisitorDeserializer<V_, E>
+    where V_: de::SeqVisitor<Error = E>,
+          E: de::Error,
+{
+    type Error = E;
+
+    fn deserialize<V: de::Visitor>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error> {
+        visitor.visit_seq(&mut self.visitor)
+    }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 /// A helper deserializer that deserializes a map.
-pub struct MapDeserializer<I, K, V>
+pub struct MapDeserializer<I, K, V, E>
     where I: Iterator<Item=(K, V)>,
-          K: ValueDeserializer,
-          V: ValueDeserializer,
+          K: ValueDeserializer<E>,
+          V: ValueDeserializer<E>,
+          E: de::Error,
 {
     iter: I,
     value: Option<V>,
     len: usize,
+    marker: PhantomData<E>,
 }
 
-impl<I, K, V> MapDeserializer<I, K, V>
+impl<I, K, V, E> MapDeserializer<I, K, V, E>
     where I: Iterator<Item=(K, V)>,
-          K: ValueDeserializer,
-          V: ValueDeserializer,
+          K: ValueDeserializer<E>,
+          V: ValueDeserializer<E>,
+          E: de::Error,
 {
     /// Construct a new `MapDeserializer<I, K, V>`.
     pub fn new(iter: I, len: usize) -> Self {
@@ -346,32 +664,52 @@ impl<I, K, V> MapDeserializer<I, K, V>
             iter: iter,
             value: None,
             len: len,
+            marker: PhantomData,
         }
     }
 }
 
-impl<I, K, V> de::Deserializer for MapDeserializer<I, K, V>
+impl<I, K, V, E> de::Deserializer for MapDeserializer<I, K, V, E>
     where I: Iterator<Item=(K, V)>,
-          K: ValueDeserializer,
-          V: ValueDeserializer,
+          K: ValueDeserializer<E>,
+          V: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Error = Error;
+    type Error = E;
 
-    fn visit<V_>(&mut self, mut visitor: V_) -> Result<V_::Value, Error>
+    fn deserialize<V_>(&mut self, mut visitor: V_) -> Result<V_::Value, Self::Error>
         where V_: de::Visitor,
     {
         visitor.visit_map(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
-impl<I, K, V> de::MapVisitor for MapDeserializer<I, K, V>
+impl<I, K, V, E> de::MapVisitor for MapDeserializer<I, K, V, E>
     where I: Iterator<Item=(K, V)>,
-          K: ValueDeserializer,
-          V: ValueDeserializer,
+          K: ValueDeserializer<E>,
+          V: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Error = Error;
+    type Error = E;
 
-    fn visit_key<T>(&mut self) -> Result<Option<T>, Error>
+    fn visit_key<T>(&mut self) -> Result<Option<T>, Self::Error>
         where T: de::Deserialize,
     {
         match self.iter.next() {
@@ -385,7 +723,7 @@ impl<I, K, V> de::MapVisitor for MapDeserializer<I, K, V>
         }
     }
 
-    fn visit_value<T>(&mut self) -> Result<T, Error>
+    fn visit_value<T>(&mut self) -> Result<T, Self::Error>
         where T: de::Deserialize,
     {
         match self.value.take() {
@@ -393,15 +731,17 @@ 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::end_of_stream())
+            }
         }
     }
 
-    fn end(&mut self) -> Result<(), Error> {
+    fn end(&mut self) -> Result<(), Self::Error> {
         if self.len == 0 {
             Ok(())
         } else {
-            Err(de::Error::length_mismatch(self.len))
+            Err(de::Error::invalid_length(self.len))
         }
     }
 
@@ -412,25 +752,29 @@ impl<I, K, V> de::MapVisitor for MapDeserializer<I, K, V>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<K, V> ValueDeserializer for BTreeMap<K, V>
-    where K: ValueDeserializer + Eq + Ord,
-          V: ValueDeserializer,
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<K, V, E> ValueDeserializer<E> for BTreeMap<K, V>
+    where K: ValueDeserializer<E> + Eq + Ord,
+          V: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Deserializer = MapDeserializer<btree_map::IntoIter<K, V>, K, V>;
+    type Deserializer = MapDeserializer<btree_map::IntoIter<K, V>, K, V, E>;
 
-    fn into_deserializer(self) -> MapDeserializer<btree_map::IntoIter<K, V>, K, V> {
+    fn into_deserializer(self) -> Self::Deserializer {
         let len = self.len();
         MapDeserializer::new(self.into_iter(), len)
     }
 }
 
-impl<K, V> ValueDeserializer for HashMap<K, V>
-    where K: ValueDeserializer + Eq + Hash,
-          V: ValueDeserializer,
+#[cfg(feature = "std")]
+impl<K, V, E> ValueDeserializer<E> for HashMap<K, V>
+    where K: ValueDeserializer<E> + Eq + Hash,
+          V: ValueDeserializer<E>,
+          E: de::Error,
 {
-    type Deserializer = MapDeserializer<hash_map::IntoIter<K, V>, K, V>;
+    type Deserializer = MapDeserializer<hash_map::IntoIter<K, V>, K, V, E>;
 
-    fn into_deserializer(self) -> MapDeserializer<hash_map::IntoIter<K, V>, K, V> {
+    fn into_deserializer(self) -> Self::Deserializer {
         let len = self.len();
         MapDeserializer::new(self.into_iter(), len)
     }
@@ -438,22 +782,74 @@ impl<K, V> ValueDeserializer for HashMap<K, V>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<'a> ValueDeserializer for bytes::Bytes<'a>
-{
-    type Deserializer = BytesDeserializer<'a>;
+/// A helper deserializer that deserializes a map using a `MapVisitor`.
+pub struct MapVisitorDeserializer<V_, E> {
+    visitor: V_,
+    marker: PhantomData<E>,
+}
 
-    fn into_deserializer(self) -> BytesDeserializer<'a> {
-        BytesDeserializer(Some(self.into()))
+impl<V_, E> MapVisitorDeserializer<V_, E>
+    where V_: de::MapVisitor<Error = E>,
+          E: de::Error,
+{
+    /// Construct a new `MapVisitorDeserializer<V_, E>`.
+    pub fn new(visitor: V_) -> Self {
+        MapVisitorDeserializer{
+            visitor: visitor,
+            marker: PhantomData
+        }
+    }
+}
+
+impl<V_, E> de::Deserializer for MapVisitorDeserializer<V_, E>
+    where V_: de::MapVisitor<Error = E>,
+          E: de::Error,
+{
+    type Error = E;
+
+    fn deserialize<V: de::Visitor>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error> {
+        visitor.visit_map(&mut self.visitor)
+    }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl<'a, E> ValueDeserializer<E> for bytes::Bytes<'a>
+    where E: de::Error,
+{
+    type Deserializer = BytesDeserializer<'a, E>;
+
+    fn into_deserializer(self) -> BytesDeserializer<'a, E> {
+        BytesDeserializer(Some(self.into()), PhantomData)
     }
 }
 
 /// A helper deserializer that deserializes a `&[u8]`.
-pub struct BytesDeserializer<'a> (Option<&'a [u8]>);
+pub struct BytesDeserializer<'a, E> (Option<&'a [u8]>, PhantomData<E>);
 
-impl<'a> de::Deserializer for BytesDeserializer<'a> {
-    type Error = Error;
+impl<'a, E> de::Deserializer for BytesDeserializer<'a, E>
+    where E: de::Error
+{
+    type Error = E;
 
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         match self.0.take() {
@@ -461,27 +857,50 @@ impl<'a> de::Deserializer for BytesDeserializer<'a> {
             None => Err(de::Error::end_of_stream()),
         }
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl ValueDeserializer for bytes::ByteBuf
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<E> ValueDeserializer<E> for bytes::ByteBuf
+    where E: de::Error,
 {
-    type Deserializer = ByteBufDeserializer;
+    type Deserializer = ByteBufDeserializer<E>;
 
     fn into_deserializer(self) -> Self::Deserializer {
-        ByteBufDeserializer(Some(self.into()))
+        ByteBufDeserializer(Some(self.into()), PhantomData)
     }
 }
 
 /// A helper deserializer that deserializes a `Vec<u8>`.
-pub struct ByteBufDeserializer(Option<Vec<u8>>);
+#[cfg(any(feature = "std", feature = "collections"))]
+pub struct ByteBufDeserializer<E>(Option<Vec<u8>>, PhantomData<E>);
 
-impl de::Deserializer for ByteBufDeserializer {
-    type Error = Error;
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<E> de::Deserializer for ByteBufDeserializer<E>
+    where E: de::Error,
+{
+    type Error = E;
 
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
         match self.0.take() {
@@ -489,4 +908,21 @@ impl de::Deserializer for ByteBufDeserializer {
             None => Err(de::Error::end_of_stream()),
         }
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }

serde/src/error.rs

@@ -0,0 +1,44 @@
+//! A stand-in for `std::error`
+use core::any::TypeId;
+use core::fmt::{Debug, Display};
+
+
+/// A stand-in for `std::error::Error`, which requires no allocation.
+#[cfg(feature = "unstable")]
+pub trait Error: Debug + Display + ::core::marker::Reflect {
+    /// A short description of the error.
+    ///
+    /// The description should not contain newlines or sentence-ending
+    /// punctuation, to facilitate embedding in larger user-facing
+    /// strings.
+    fn description(&self) -> &str;
+
+    /// The lower-level cause of this error, if any.
+    fn cause(&self) -> Option<&Error> { None }
+
+    /// Get the `TypeId` of `self`
+    #[doc(hidden)]
+    fn type_id(&self) -> TypeId where Self: 'static {
+        TypeId::of::<Self>()
+    }
+}
+
+/// A stand-in for `std::error::Error`, which requires no allocation.
+#[cfg(not(feature = "unstable"))]
+pub trait Error: Debug + Display {
+    /// A short description of the error.
+    ///
+    /// The description should not contain newlines or sentence-ending
+    /// punctuation, to facilitate embedding in larger user-facing
+    /// strings.
+    fn description(&self) -> &str;
+
+    /// The lower-level cause of this error, if any.
+    fn cause(&self) -> Option<&Error> { None }
+
+    /// Stubbed! Returns type_id of `()`
+    #[doc(hidden)]
+    fn type_id(&self) -> TypeId where Self: 'static {
+        TypeId::of::<()>()
+    }
+}

serde/src/lib.rs

@@ -5,27 +5,51 @@
 //! 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.
-//! 
+//!
 //! For a detailed tutorial on the different ways to use serde please check out the
 //! [github repository](https://github.com/serde-rs/serde)
 
-#![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="https://docs.serde.rs")]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(feature = "unstable", feature(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))]
+#![cfg_attr(feature = "alloc", feature(alloc))]
+#![cfg_attr(feature = "collections", feature(collections, enumset))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", allow(linkedlist))]
+
+#![cfg_attr(any(not(feature = "std"), feature = "unstable"), allow(unused_variables, unused_imports, unused_features, dead_code))]
 
 #![deny(missing_docs)]
 
-extern crate num;
-
-#[cfg(feature = "nightly")]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 extern crate collections;
 
-#[cfg(feature = "nightly")]
-extern crate core;
+#[cfg(all(feature = "unstable", feature = "alloc"))]
+extern crate alloc;
+
+#[cfg(feature = "std")]
+mod core {
+    pub use std::{ops, hash, fmt, cmp, marker, mem, i8, i16, i32, i64, u8, u16, u32, u64, isize,
+            usize, f32, f64, char, str, num, slice, iter};
+    #[cfg(feature = "unstable")]
+    extern crate core;
+    #[cfg(feature = "unstable")]
+    pub use self::core::nonzero;
+}
 
 pub use ser::{Serialize, Serializer};
 pub use de::{Deserialize, Deserializer, Error};
 
+#[cfg(not(feature = "std"))]
+macro_rules! format {
+    ($s:expr, $($rest:tt)*) => ($s)
+}
+
 pub mod bytes;
 pub mod de;
+#[cfg(feature = "std")]
 pub mod iter;
 pub mod ser;
+#[cfg(not(feature = "std"))]
+pub mod error;
+mod utils;

serde/src/ser/impls.rs

@@ -1,6 +1,15 @@
-//! Implementations for all of Rust's builtin types.
+//! Implementations for all of Rust's builtin types. Tuples implement the `Serialize` trait if they
+//! have at most 16 fields. Arrays implement the `Serialize` trait if their length is 32 or less.
+//! You can always forward array serialization to slice serialization, which works for any length.
+//! Long tuples are best replaced by tuple structs, for which you can use `derive(Serialize)`. In
+//! that case the number of fields is irrelevant.
 
+#[cfg(feature = "std")]
 use std::borrow::Cow;
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::borrow::Cow;
+
+#[cfg(feature = "std")]
 use std::collections::{
     BinaryHeap,
     BTreeMap,
@@ -10,27 +19,57 @@ use std::collections::{
     HashSet,
     VecDeque,
 };
-#[cfg(feature = "nightly")]
-use collections::enum_set::{CLike, EnumSet};
-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(all(feature = "collections", not(feature = "std")))]
+use collections::{
+    BinaryHeap,
+    BTreeMap,
+    BTreeSet,
+    LinkedList,
+    VecDeque,
+    String,
+    Vec,
+};
 
-#[cfg(feature = "nightly")]
+#[cfg(all(feature = "unstable", feature = "collections"))]
+use collections::enum_set::{CLike, EnumSet};
+#[cfg(all(feature = "unstable", feature = "collections"))]
+use collections::borrow::ToOwned;
+
+use core::hash::{Hash, BuildHasher};
+#[cfg(feature = "unstable")]
+use core::iter;
+#[cfg(feature = "std")]
+use std::net;
+#[cfg(feature = "unstable")]
+use core::num;
+#[cfg(feature = "unstable")]
+use core::ops;
+#[cfg(feature = "std")]
+use std::path;
+#[cfg(feature = "std")]
+use std::rc::Rc;
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+use alloc::rc::Rc;
+#[cfg(feature = "std")]
+use std::time::Duration;
+
+#[cfg(feature = "std")]
+use std::sync::Arc;
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+use alloc::arc::Arc;
+
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+use alloc::boxed::Box;
+
+use core::marker::PhantomData;
+
+#[cfg(feature = "unstable")]
 use core::nonzero::{NonZero, Zeroable};
 
 use super::{
+    Error,
     Serialize,
     Serializer,
-    SeqVisitor,
-    MapVisitor,
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,20 +87,20 @@ macro_rules! impl_visit {
     }
 }
 
-impl_visit!(bool, visit_bool);
-impl_visit!(isize, visit_isize);
-impl_visit!(i8, visit_i8);
-impl_visit!(i16, visit_i16);
-impl_visit!(i32, visit_i32);
-impl_visit!(i64, visit_i64);
-impl_visit!(usize, visit_usize);
-impl_visit!(u8, visit_u8);
-impl_visit!(u16, visit_u16);
-impl_visit!(u32, visit_u32);
-impl_visit!(u64, visit_u64);
-impl_visit!(f32, visit_f32);
-impl_visit!(f64, visit_f64);
-impl_visit!(char, visit_char);
+impl_visit!(bool, serialize_bool);
+impl_visit!(isize, serialize_isize);
+impl_visit!(i8, serialize_i8);
+impl_visit!(i16, serialize_i16);
+impl_visit!(i32, serialize_i32);
+impl_visit!(i64, serialize_i64);
+impl_visit!(usize, serialize_usize);
+impl_visit!(u8, serialize_u8);
+impl_visit!(u16, serialize_u16);
+impl_visit!(u32, serialize_u32);
+impl_visit!(u64, serialize_u64);
+impl_visit!(f32, serialize_f32);
+impl_visit!(f64, serialize_f64);
+impl_visit!(char, serialize_char);
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -70,10 +109,11 @@ impl Serialize for str {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        serializer.visit_str(self)
+        serializer.serialize_str(self)
     }
 }
 
+#[cfg(any(feature = "std", feature = "collections"))]
 impl Serialize for String {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
@@ -91,96 +131,24 @@ impl<T> Serialize for Option<T> where T: Serialize {
         where S: Serializer,
     {
         match *self {
-            Some(ref value) => serializer.visit_some(value),
-            None => serializer.visit_none(),
+            Some(ref value) => serializer.serialize_some(value),
+            None => serializer.serialize_none(),
         }
     }
 }
 
-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 })
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
-/// A `serde::Visitor` for sequence iterators.
-///
-/// # Examples
-///
-/// ```
-/// use serde::{Serialize, Serializer};
-/// use serde::ser::impls::SeqIteratorVisitor;
-///
-/// struct Seq(Vec<u32>);
-///
-/// impl Serialize for Seq {
-///     fn serialize<S>(&self, ser: &mut S) -> Result<(), S::Error>
-///         where S: Serializer,
-///     {
-///         ser.visit_seq(SeqIteratorVisitor::new(
-///             self.0.iter(),
-///             Some(self.0.len()),
-///         ))
-///     }
-/// }
-/// ```
-pub struct SeqIteratorVisitor<Iter> {
-    iter: Iter,
-    len: Option<usize>,
-}
-
-impl<T, Iter> SeqIteratorVisitor<Iter>
-    where Iter: Iterator<Item=T>
-{
-    /// Construct a new `SeqIteratorVisitor<Iter>`.
+impl<T> Serialize for PhantomData<T> {
     #[inline]
-    pub fn new(iter: Iter, len: Option<usize>) -> SeqIteratorVisitor<Iter> {
-        SeqIteratorVisitor {
-            iter: iter,
-            len: len,
-        }
-    }
-}
-
-impl<T, Iter> SeqVisitor for SeqIteratorVisitor<Iter>
-    where T: Serialize,
-          Iter: Iterator<Item=T>,
-{
-    #[inline]
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        match self.iter.next() {
-            Some(value) => {
-                try!(serializer.visit_seq_elt(value));
-                Ok(Some(()))
-            }
-            None => Ok(None),
-        }
-    }
-
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        self.len
+        serializer.serialize_unit_struct("PhantomData")
     }
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 
 impl<T> Serialize for [T]
@@ -190,10 +158,16 @@ impl<T> Serialize for [T]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
+        let mut state = try!(serializer.serialize_seq(Some(self.len())));
+        for e in self {
+            try!(serializer.serialize_seq_elt(&mut state, e));
+        }
+        serializer.serialize_seq_end(state)
     }
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
 macro_rules! array_impls {
     ($len:expr) => {
         impl<T> Serialize for [T; $len] where T: Serialize {
@@ -201,7 +175,11 @@ macro_rules! array_impls {
             fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
                 where S: Serializer,
             {
-                serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some($len)))
+                let mut state = try!(serializer.serialize_seq_fixed_size($len));
+                for e in self {
+                    try!(serializer.serialize_seq_elt(&mut state, e));
+                }
+                serializer.serialize_seq_end(state)
             }
         }
     }
@@ -243,63 +221,68 @@ array_impls!(32);
 
 ///////////////////////////////////////////////////////////////////////////////
 
+macro_rules! serialize_seq {
+    () => {
+        #[inline]
+        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+            where S: Serializer,
+        {
+            let mut state = try!(serializer.serialize_seq(Some(self.len())));
+            for e in self {
+                try!(serializer.serialize_seq_elt(&mut state, e));
+            }
+            serializer.serialize_seq_end(state)
+        }
+    }
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
 impl<T> Serialize for BinaryHeap<T>
     where T: Serialize + Ord
 {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
+    serialize_seq!();
 }
 
+#[cfg(any(feature = "std", feature = "collections"))]
 impl<T> Serialize for BTreeSet<T>
     where T: Serialize + Ord,
 {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
+    serialize_seq!();
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 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())))
-    }
+    serialize_seq!();
 }
 
-impl<T> Serialize for HashSet<T>
+#[cfg(feature = "std")]
+impl<T, H> Serialize for HashSet<T, H>
     where T: Serialize + Eq + Hash,
+          H: BuildHasher,
 {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_seq(SeqIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
+    serialize_seq!();
 }
 
+#[cfg(any(feature = "std", feature = "collections"))]
 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())))
-    }
+    serialize_seq!();
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T> Serialize for Vec<T> where T: Serialize {
+    serialize_seq!();
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T> Serialize for VecDeque<T> where T: Serialize {
+    serialize_seq!();
+}
+
+#[cfg(feature = "unstable")]
 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>,
@@ -309,25 +292,11 @@ impl<A> Serialize for ops::Range<A>
         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())))
+        let mut state = try!(serializer.serialize_seq(len));
+        for e in self.clone() {
+            try!(serializer.serialize_seq_elt(&mut state, e));
+        }
+        serializer.serialize_seq_end(state)
     }
 }
 
@@ -338,7 +307,7 @@ impl Serialize for () {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        serializer.visit_unit()
+        serializer.serialize_unit()
     }
 }
 
@@ -356,52 +325,18 @@ macro_rules! tuple_impls {
         }
     )+) => {
         $(
-            /// A tuple visitor.
-            pub struct $TupleVisitor<'a, $($T: 'a),+> {
-                tuple: &'a ($($T,)+),
-                state: u8,
-            }
-
-            impl<'a, $($T: 'a),+> $TupleVisitor<'a, $($T),+> {
-                /// Construct a new, empty `TupleVisitor`.
-                pub fn new(tuple: &'a ($($T,)+)) -> $TupleVisitor<'a, $($T),+> {
-                    $TupleVisitor {
-                        tuple: tuple,
-                        state: 0,
-                    }
-                }
-            }
-
-            impl<'a, $($T),+> SeqVisitor for $TupleVisitor<'a, $($T),+>
-                where $($T: Serialize),+
-            {
-                fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-                    where S: Serializer,
-                {
-                    match self.state {
-                        $(
-                            $state => {
-                                self.state += 1;
-                                Ok(Some(try!(serializer.visit_tuple_elt(&e!(self.tuple.$idx)))))
-                            }
-                        )+
-                        _ => {
-                            Ok(None)
-                        }
-                    }
-                }
-
-                fn len(&self) -> Option<usize> {
-                    Some($len)
-                }
-            }
-
             impl<$($T),+> Serialize for ($($T,)+)
                 where $($T: Serialize),+
             {
                 #[inline]
-                fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error> {
-                    serializer.visit_tuple($TupleVisitor::new(self))
+                fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+                    where S: Serializer,
+                {
+                    let mut state = try!(serializer.serialize_tuple($len));
+                    $(
+                        try!(serializer.serialize_tuple_elt(&mut state, &e!(self.$idx)));
+                    )+
+                    serializer.serialize_tuple_end(state)
                 }
             }
         )+
@@ -511,98 +446,107 @@ tuple_impls! {
         10 => 10,
         11 => 11,
     }
+    TupleVisitor13 (13, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+    }
+    TupleVisitor14 (14, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+    }
+    TupleVisitor15 (15, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+    }
+    TupleVisitor16 (16, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// A `serde::Visitor` for (key, value) map iterators.
-///
-/// # Examples
-///
-/// ```
-/// use std::collections::HashMap;
-/// use serde::{Serialize, Serializer};
-/// use serde::ser::impls::MapIteratorVisitor;
-///
-/// struct Map(HashMap<u32, u32>);
-///
-/// impl Serialize for Map {
-///     fn serialize<S>(&self, ser: &mut S) -> Result<(), S::Error>
-///         where S: Serializer,
-///     {
-///         ser.visit_map(MapIteratorVisitor::new(
-///             self.0.iter(),
-///             Some(self.0.len()),
-///         ))
-///     }
-/// }
-/// ```
-pub struct MapIteratorVisitor<Iter> {
-    iter: Iter,
-    len: Option<usize>,
-}
-
-impl<K, V, Iter> MapIteratorVisitor<Iter>
-    where Iter: Iterator<Item=(K, V)>
-{
-    /// Construct a new `MapIteratorVisitor<Iter>`.
-    #[inline]
-    pub fn new(iter: Iter, len: Option<usize>) -> MapIteratorVisitor<Iter> {
-        MapIteratorVisitor {
-            iter: iter,
-            len: len,
-        }
-    }
-}
-
-impl<K, V, I> MapVisitor for MapIteratorVisitor<I>
-    where K: Serialize,
-          V: Serialize,
-          I: Iterator<Item=(K, V)>,
-{
-    #[inline]
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: Serializer,
-    {
-        match self.iter.next() {
-            Some((key, value)) => {
-                let value = try!(serializer.visit_map_elt(key, value));
-                Ok(Some(value))
+macro_rules! serialize_map {
+    () => {
+        #[inline]
+        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+            where S: Serializer,
+        {
+            let mut state = try!(serializer.serialize_map(Some(self.len())));
+            for (k, v) in self {
+                try!(serializer.serialize_map_key(&mut state, k));
+                try!(serializer.serialize_map_value(&mut state, v));
             }
-            None => Ok(None)
+            serializer.serialize_map_end(state)
         }
     }
-
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        self.len
-    }
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
+#[cfg(any(feature = "std", feature = "collections"))]
 impl<K, V> Serialize for BTreeMap<K, V>
     where K: Serialize + Ord,
           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())))
-    }
+    serialize_map!();
 }
 
-impl<K, V> Serialize for HashMap<K, V>
+#[cfg(feature = "std")]
+impl<K, V, H> Serialize for HashMap<K, V, H>
     where K: Serialize + Eq + Hash,
           V: Serialize,
+          H: BuildHasher,
 {
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.visit_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
+    serialize_map!();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -625,6 +569,7 @@ impl<'a, T: ?Sized> Serialize for &'a mut T where T: Serialize {
     }
 }
 
+#[cfg(any(feature = "std", feature = "alloc"))]
 impl<T: ?Sized> Serialize for Box<T> where T: Serialize {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
@@ -634,6 +579,7 @@ impl<T: ?Sized> Serialize for Box<T> where T: Serialize {
     }
 }
 
+#[cfg(any(feature = "std", feature = "alloc"))]
 impl<T> Serialize for Rc<T> where T: Serialize, {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
@@ -643,6 +589,7 @@ impl<T> Serialize for Rc<T> where T: Serialize, {
     }
 }
 
+#[cfg(any(feature = "std", feature = "alloc"))]
 impl<T> Serialize for Arc<T> where T: Serialize, {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
@@ -652,6 +599,7 @@ impl<T> Serialize for Arc<T> where T: Serialize, {
     }
 }
 
+#[cfg(any(feature = "std", feature = "collections"))]
 impl<'a, T: ?Sized> Serialize for Cow<'a, T> where T: Serialize + ToOwned, {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
@@ -667,10 +615,10 @@ 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)
+                serializer.serialize_newtype_variant("Result", 0, "Ok", value)
             }
             Result::Err(ref value) => {
-                serializer.visit_newtype_variant("Result", 1, "Err", value)
+                serializer.serialize_newtype_variant("Result", 1, "Err", value)
             }
         }
     }
@@ -678,23 +626,106 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#[cfg(feature = "std")]
+impl Serialize for Duration {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        let mut state = try!(serializer.serialize_struct("Duration", 2));
+        try!(serializer.serialize_struct_elt(&mut state, "secs", self.as_secs()));
+        try!(serializer.serialize_struct_elt(&mut state, "nanos", self.subsec_nanos()));
+        serializer.serialize_struct_end(state)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(all(feature = "std", feature = "unstable"))]
+impl Serialize for net::IpAddr {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        match *self {
+            net::IpAddr::V4(ref addr) => addr.serialize(serializer),
+            net::IpAddr::V6(ref addr) => addr.serialize(serializer),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::Ipv4Addr {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        self.to_string().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::Ipv6Addr {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        self.to_string().serialize(serializer)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
+impl Serialize for net::SocketAddr {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        match *self {
+            net::SocketAddr::V4(ref addr) => addr.serialize(serializer),
+            net::SocketAddr::V6(ref addr) => addr.serialize(serializer),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::SocketAddrV4 {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        self.to_string().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::SocketAddrV6 {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        self.to_string().serialize(serializer)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
 impl Serialize for path::Path {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        self.to_str().unwrap().serialize(serializer)
+        match self.to_str() {
+            Some(s) => s.serialize(serializer),
+            None => Err(Error::invalid_value("Path contains invalid UTF-8 characters")),
+        }
     }
 }
 
+#[cfg(feature = "std")]
 impl Serialize for path::PathBuf {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        self.to_str().unwrap().serialize(serializer)
+        self.as_path().serialize(serializer)
     }
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 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

@@ -1,9 +1,46 @@
 //! Generic serialization framework.
+//! # For Developers who want to serialize objects
+//! Implement the `Serialize` trait for the type of objects you want to serialize. Call methods of
+//! the `serializer` object. For which methods to call and how to do so, look at the documentation
+//! of the `Serializer` trait.
+//!
+//! # For Serialization Format Developers
+//! Implement the `Serializer` trait for a structure that contains fields that enable it to write
+//! the serialization result to your target. When a method's argument is an object of type
+//! `Serialize`, you can either forward the serializer object (`self`) or create a new one,
+//! depending on the quirks of your format.
+
+#[cfg(feature = "std")]
+use std::error;
+#[cfg(not(feature = "std"))]
+use error;
+
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::String;
 
 pub mod impls;
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/// `Error` is a trait that allows a `Serialize` to generically create a
+/// `Serializer` error.
+pub trait Error: Sized + error::Error {
+    /// Raised when there is a general error when serializing a type.
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn custom<T: Into<String>>(msg: T) -> Self;
+
+    /// Raised when there is a general error when serializing a type.
+    #[cfg(all(not(feature = "std"), not(feature = "collections")))]
+    fn custom<T: Into<&'static str>>(msg: T) -> Self;
+
+    /// Raised when a `Serialize` was passed an incorrect value.
+    fn invalid_value(msg: &str) -> Self {
+        Error::custom(format!("invalid value: {}", msg))
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 /// A trait that describes a type that can be serialized by a `Serializer`.
 pub trait Serialize {
     /// Serializes this value into this serializer.
@@ -14,341 +51,362 @@ pub trait Serialize {
 ///////////////////////////////////////////////////////////////////////////////
 
 /// A trait that describes a type that can serialize a stream of values into the underlying format.
+///
+/// # For `Serialize` Developers
+/// Non-aggrergate types like integers and strings can be serialized directly by calling the
+/// appropriate function. For Aggregate types there's an initial `serialize_T` method that yields
+/// a State object that you should not interact with. For each part of the aggregate there's a
+/// `serialize_T_elt` method that allows you to pass values or key/value pairs. The types of the
+/// values or the keys may change between calls, but the serialization format may not necessarily
+/// accept it. The `serialize_T_elt` method also takes a mutable reference to the state object.
+/// Make sure that you always use the same state object and only the state object that was returned
+/// by the `serialize_T` method. Finally, when your object is done, call the `serialize_T_end`
+/// method and pass the state object by value
+///
+/// # For Serialization Format Developers
+/// If your format has different situations where it accepts different types, create a
+/// `Serializer` for each situation. You can create the sub-`Serializer` in one of the aggregate
+/// `serialize_T` methods and return it as a state object. Remember to also set the corresponding
+/// associated type `TState`. In the `serialize_T_elt` methods you will be given a mutable
+/// reference to that state. You do not need to do any additional checks for the correctness of the
+/// state object, as it is expected that the user will not modify it. Due to the generic nature
+/// of the `Serialize` impls, modifying the object is impossible on stable Rust.
 pub trait Serializer {
     /// The error type that can be returned if some error occurs during serialization.
-    type Error;
+    type Error: Error;
 
-    /// `visit_bool` serializes a `bool` value.
-    fn visit_bool(&mut self, v: bool) -> Result<(), Self::Error>;
+    /// A state object that is initialized by `serialize_seq`, passed to
+    /// `serialize_seq_elt`, and consumed by `serialize_seq_end`. Use `()` if no
+    /// state is required.
+    type SeqState;
+    /// A state object that is initialized by `serialize_tuple`, passed to
+    /// `serialize_tuple_elt`, and consumed by `serialize_tuple_end`. Use `()`
+    /// if no state is required.
+    type TupleState;
+    /// A state object that is initialized by `serialize_tuple_struct`, passed
+    /// to `serialize_tuple_struct_elt`, and consumed by
+    /// `serialize_tuple_struct_end`. Use `()` if no state is required.
+    type TupleStructState;
+    /// A state object that is initialized by `serialize_tuple_variant`, passed
+    /// to `serialize_tuple_variant_elt`, and consumed by
+    /// `serialize_tuple_variant_end`. Use `()` if no state is required.
+    type TupleVariantState;
+    /// A state object that is initialized by `serialize_map`, passed to
+    /// `serialize_map_elt`, and consumed by `serialize_map_end`. Use `()` if no
+    /// state is required.
+    type MapState;
+    /// A state object that is initialized by `serialize_struct`, passed to
+    /// `serialize_struct_elt`, and consumed by `serialize_struct_end`. Use `()`
+    /// if no state is required.
+    type StructState;
+    /// A state object that is initialized by `serialize_struct_variant`, passed
+    /// to `serialize_struct_variant_elt`, and consumed by
+    /// `serialize_struct_variant_end`. Use `()` if no state is required.
+    type StructVariantState;
 
-    /// `visit_isize` serializes a `isize` value. By default it casts the value to a `i64` and
-    /// passes it to the `visit_i64` method.
-    #[inline]
-    fn visit_isize(&mut self, v: isize) -> Result<(), Self::Error> {
-        self.visit_i64(v as i64)
-    }
+    /// Serializes a `bool` value.
+    fn serialize_bool(&mut self, v: bool) -> Result<(), Self::Error>;
 
-    /// `visit_i8` serializes a `i8` value. By default it casts the value to a `i64` and
-    /// passes it to the `visit_i64` method.
-    #[inline]
-    fn visit_i8(&mut self, v: i8) -> Result<(), Self::Error> {
-        self.visit_i64(v as i64)
-    }
+    /// Serializes an `isize` value. If the format does not differentiate
+    /// between `isize` and `i64`, a reasonable implementation would be to cast
+    /// the value to `i64` and forward to `serialize_i64`.
+    fn serialize_isize(&mut self, v: isize) -> Result<(), Self::Error>;
 
-    /// `visit_i16` serializes a `i16` value. By default it casts the value to a `i64` and
-    /// passes it to the `visit_i64` method.
-    #[inline]
-    fn visit_i16(&mut self, v: i16) -> Result<(), Self::Error> {
-        self.visit_i64(v as i64)
-    }
+    /// Serializes an `i8` value. If the format does not differentiate between
+    /// `i8` and `i64`, a reasonable implementation would be to cast the value
+    /// to `i64` and forward to `serialize_i64`.
+    fn serialize_i8(&mut self, v: i8) -> Result<(), Self::Error>;
 
-    /// `visit_i32` serializes a `i32` value. By default it casts the value to a `i64` and
-    /// passes it to the `visit_i64` method.
-    #[inline]
-    fn visit_i32(&mut self, v: i32) -> Result<(), Self::Error> {
-        self.visit_i64(v as i64)
-    }
+    /// Serializes an `i16` value. If the format does not differentiate between
+    /// `i16` and `i64`, a reasonable implementation would be to cast the value
+    /// to `i64` and forward to `serialize_i64`.
+    fn serialize_i16(&mut self, v: i16) -> Result<(), Self::Error>;
 
-    /// `visit_i64` serializes a `i64` value.
-    #[inline]
-    fn visit_i64(&mut self, v: i64) -> Result<(), Self::Error>;
+    /// Serializes an `i32` value. If the format does not differentiate between
+    /// `i32` and `i64`, a reasonable implementation would be to cast the value
+    /// to `i64` and forward to `serialize_i64`.
+    fn serialize_i32(&mut self, v: i32) -> Result<(), Self::Error>;
 
-    /// `visit_usize` serializes a `usize` value. By default it casts the value to a `u64` and
-    /// passes it to the `visit_u64` method.
-    #[inline]
-    fn visit_usize(&mut self, v: usize) -> Result<(), Self::Error> {
-        self.visit_u64(v as u64)
-    }
+    /// Serializes an `i64` value.
+    fn serialize_i64(&mut self, v: i64) -> Result<(), Self::Error>;
 
-    /// `visit_u8` serializes a `u8` value. By default it casts the value to a `u64` and passes
-    /// it to the `visit_u64` method.
-    #[inline]
-    fn visit_u8(&mut self, v: u8) -> Result<(), Self::Error> {
-        self.visit_u64(v as u64)
-    }
+    /// Serializes a `usize` value. If the format does not differentiate between
+    /// `usize` and `u64`, a reasonable implementation would be to cast the
+    /// value to `u64` and forward to `serialize_u64`.
+    fn serialize_usize(&mut self, v: usize) -> Result<(), Self::Error>;
 
-    /// `visit_u32` serializes a `u32` value. By default it casts the value to a `u64` and passes
-    /// it to the `visit_u64` method.
-    #[inline]
-    fn visit_u16(&mut self, v: u16) -> Result<(), Self::Error> {
-        self.visit_u64(v as u64)
-    }
+    /// Serializes a `u8` value. If the format does not differentiate between
+    /// `u8` and `u64`, a reasonable implementation would be to cast the value
+    /// to `u64` and forward to `serialize_u64`.
+    fn serialize_u8(&mut self, v: u8) -> Result<(), Self::Error>;
 
-    /// `visit_u32` serializes a `u32` value. By default it casts the value to a `u64` and passes
-    /// it to the `visit_u64` method.
-    #[inline]
-    fn visit_u32(&mut self, v: u32) -> Result<(), Self::Error> {
-        self.visit_u64(v as u64)
-    }
+    /// Serializes a `u16` value. If the format does not differentiate between
+    /// `u16` and `u64`, a reasonable implementation would be to cast the value
+    /// to `u64` and forward to `serialize_u64`.
+    fn serialize_u16(&mut self, v: u16) -> Result<(), Self::Error>;
 
-    /// `visit_u64` serializes a `u64` value.
-    #[inline]
-    fn visit_u64(&mut self, v: u64) -> Result<(), Self::Error>;
+    /// Serializes a `u32` value. If the format does not differentiate between
+    /// `u32` and `u64`, a reasonable implementation would be to cast the value
+    /// to `u64` and forward to `serialize_u64`.
+    fn serialize_u32(&mut self, v: u32) -> Result<(), Self::Error>;
 
-    /// `visit_f32` serializes a `f32` value. By default it casts the value to a `f64` and passes
-    /// it to the `visit_f64` method.
-    #[inline]
-    fn visit_f32(&mut self, v: f32) -> Result<(), Self::Error> {
-        self.visit_f64(v as f64)
-    }
+    /// `Serializes a `u64` value.
+    fn serialize_u64(&mut self, v: u64) -> Result<(), Self::Error>;
 
-    /// `visit_f64` serializes a `f64` value.
-    fn visit_f64(&mut self, v: f64) -> Result<(), Self::Error>;
+    /// Serializes an `f32` value. If the format does not differentiate between
+    /// `f32` and `f64`, a reasonable implementation would be to cast the value
+    /// to `f64` and forward to `serialize_f64`.
+    fn serialize_f32(&mut self, v: f32) -> Result<(), Self::Error>;
 
-    /// `visit_char` serializes a character. By default it serializes it as a `&str` containing a
-    /// single character.
-    #[inline]
-    fn visit_char(&mut self, v: char) -> Result<(), Self::Error> {
-        // FIXME: this allocation is required in order to be compatible with stable rust, which
-        // doesn't support encoding a `char` into a stack buffer.
-        self.visit_str(&v.to_string())
-    }
+    /// Serializes an `f64` value.
+    fn serialize_f64(&mut self, v: f64) -> Result<(), Self::Error>;
 
-    /// `visit_str` serializes a `&str`.
-    fn visit_str(&mut self, value: &str) -> Result<(), Self::Error>;
+    /// Serializes a character. If the format does not support characters,
+    /// it is reasonable to serialize it as a single element `str` or a `u32`.
+    fn serialize_char(&mut self, v: char) -> Result<(), Self::Error>;
 
-    /// `visit_bytes` is a hook that enables those serialization formats that support serializing
-    /// byte slices separately from generic arrays. By default it serializes as a regular array.
-    #[inline]
-    fn visit_bytes(&mut self, value: &[u8]) -> Result<(), Self::Error> {
-        self.visit_seq(impls::SeqIteratorVisitor::new(value.iter(), Some(value.len())))
-    }
+    /// Serializes a `&str`.
+    fn serialize_str(&mut self, value: &str) -> Result<(), Self::Error>;
 
-    /// Serializes a `()` value.
-    fn visit_unit(&mut self) -> Result<(), Self::Error>;
+    /// Enables serializers to serialize byte slices more compactly or more
+    /// efficiently than other types of slices. If no efficient implementation
+    /// is available, a reasonable implementation would be to forward to
+    /// `serialize_seq`. If forwarded, the implementation looks usually just like this:
+    /// ```rust
+    /// let mut state = try!(self.serialize_seq(value));
+    /// for b in value {
+    ///     try!(self.serialize_seq_elt(&mut state, b));
+    /// }
+    /// self.serialize_seq_end(state)
+    /// ```
+    fn serialize_bytes(&mut self, value: &[u8]) -> Result<(), Self::Error>;
 
-    /// Serializes a unit struct value.
-    ///
-    /// By default, unit structs are serialized as a `()`.
-    #[inline]
-    fn visit_unit_struct(&mut self, _name: &'static str) -> Result<(), Self::Error> {
-        self.visit_unit()
-    }
+    /// Serializes a `()` value. It's reasonable to just not serialize anything.
+    fn serialize_unit(&mut self) -> Result<(), Self::Error>;
 
-    /// Serializes a unit variant, otherwise known as a variant with no arguments.
-    ///
-    /// By default, unit variants are serialized as a `()`.
-    #[inline]
-    fn visit_unit_variant(&mut self,
-                          _name: &'static str,
-                          _variant_index: usize,
-                          _variant: &'static str) -> Result<(), Self::Error> {
-        self.visit_unit()
-    }
+    /// Serializes a unit struct value. A reasonable implementation would be to
+    /// forward to `serialize_unit`.
+    fn serialize_unit_struct(
+        &mut self,
+        name: &'static str,
+    ) -> Result<(), Self::Error>;
 
-    /// 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))
-    }
+    /// Serializes a unit variant, otherwise known as a variant with no
+    /// arguments. A reasonable implementation would be to forward to
+    /// `serialize_unit`.
+    fn serialize_unit_variant(
+        &mut self,
+        name: &'static str,
+        variant_index: usize,
+        variant: &'static str,
+    ) -> Result<(), Self::Error>;
 
-    /// 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))
-    }
+    /// Allows a tuple struct with a single element, also known as a newtype
+    /// struct, to be more efficiently serialized than a tuple struct with
+    /// multiple items. A reasonable implementation would be to forward to
+    /// `serialize_tuple_struct` or to just serialize the inner value without wrapping.
+    fn serialize_newtype_struct<T: Serialize>(
+        &mut self,
+        name: &'static str,
+        value: T,
+    ) -> Result<(), Self::Error>;
+
+    /// Allows a variant with a single item to be more efficiently serialized
+    /// than a variant with multiple items. A reasonable implementation would be
+    /// to forward to `serialize_tuple_variant`.
+    fn serialize_newtype_variant<T: Serialize>(
+        &mut self,
+        name: &'static str,
+        variant_index: usize,
+        variant: &'static str,
+        value: T,
+    ) -> Result<(), Self::Error>;
 
     /// Serializes a `None` value.
-    fn visit_none(&mut self) -> Result<(), Self::Error>;
+    fn serialize_none(&mut self) -> Result<(), Self::Error>;
 
     /// Serializes a `Some(...)` value.
-    fn visit_some<V>(&mut self, value: V) -> Result<(), Self::Error>
-        where V: Serialize;
+    fn serialize_some<T: Serialize>(
+        &mut self,
+        value: T,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a sequence.
-    ///
-    /// Callees of this method need to construct a `SeqVisitor`, which iterates through each item
-    /// in the sequence.
-    fn visit_seq<V>(&mut self, visitor: V) -> Result<(), Self::Error>
-        where V: SeqVisitor;
+    /// Begins to serialize a sequence. This call must be followed by zero or
+    /// more calls to `serialize_seq_elt`, then a call to `serialize_seq_end`.
+    fn serialize_seq(
+        &mut self,
+        len: Option<usize>,
+    ) -> Result<Self::SeqState, Self::Error>;
 
-    /// Serializes a sequence element.
-    fn visit_seq_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize;
+    /// Serializes a sequence element. Must have previously called
+    /// `serialize_seq`.
+    fn serialize_seq_elt<T: Serialize>(
+        &mut self,
+        state: &mut Self::SeqState,
+        value: T,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a tuple.
-    ///
-    /// By default this serializes a tuple as a sequence.
-    #[inline]
-    fn visit_tuple<V>(&mut self, visitor: V) -> Result<(), Self::Error>
-        where V: SeqVisitor,
-    {
-        self.visit_seq(visitor)
-    }
+    /// Finishes serializing a sequence.
+    fn serialize_seq_end(
+        &mut self,
+        state: Self::SeqState,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a tuple element.
-    ///
-    /// By default, tuples are serialized as a sequence.
-    #[inline]
-    fn visit_tuple_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize
-    {
-        self.visit_seq_elt(value)
-    }
+    /// Begins to serialize a sequence whose length will be known at
+    /// deserialization time. This call must be followed by zero or more calls
+    /// to `serialize_seq_elt`, then a call to `serialize_seq_end`. A reasonable
+    /// implementation would be to forward to `serialize_seq`.
+    fn serialize_seq_fixed_size(
+        &mut self,
+        size: usize,
+    ) -> Result<Self::SeqState, Self::Error>;
 
-    /// Serializes a tuple struct.
-    ///
-    /// By default, tuple structs are serialized as a tuple.
-    #[inline]
-    fn visit_tuple_struct<V>(&mut self,
-                             _name: &'static str,
-                             visitor: V) -> Result<(), Self::Error>
-        where V: SeqVisitor,
-    {
-        self.visit_tuple(visitor)
-    }
+    /// Begins to serialize a tuple. This call must be followed by zero or more
+    /// calls to `serialize_tuple_elt`, then a call to `serialize_tuple_end`. A
+    /// reasonable implementation would be to forward to `serialize_seq`.
+    fn serialize_tuple(
+        &mut self,
+        len: usize,
+    ) -> Result<Self::TupleState, Self::Error>;
 
-    /// Serializes a tuple struct element.
-    ///
-    /// By default, tuple struct elements are serialized as a tuple element.
-    #[inline]
-    fn visit_tuple_struct_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize
-    {
-        self.visit_tuple_elt(value)
-    }
+    /// Serializes a tuple element. Must have previously called
+    /// `serialize_tuple`.
+    fn serialize_tuple_elt<T: Serialize>(
+        &mut self,
+        state: &mut Self::TupleState,
+        value: T,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a tuple variant.
-    ///
-    /// By default, tuple variants are serialized as a tuple struct.
-    #[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)
-    }
+    /// Finishes serializing a tuple.
+    fn serialize_tuple_end(
+        &mut self,
+        state: Self::TupleState,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a tuple element.
-    ///
-    /// By default, tuples are serialized as a sequence.
-    #[inline]
-    fn visit_tuple_variant_elt<T>(&mut self, value: T) -> Result<(), Self::Error>
-        where T: Serialize
-    {
-        self.visit_tuple_struct_elt(value)
-    }
+    /// Begins to serialize a tuple struct. This call must be followed by zero
+    /// or more calls to `serialize_tuple_struct_elt`, then a call to
+    /// `serialize_tuple_struct_end`. A reasonable implementation would be to
+    /// forward to `serialize_tuple`.
+    fn serialize_tuple_struct(
+        &mut self,
+        name: &'static str,
+        len: usize,
+    ) -> Result<Self::TupleStructState, Self::Error>;
 
-    /// Serializes a map.
-    ///
-    /// Callees of this method need to construct a `MapVisitor`, which iterates through each item
-    /// in the map.
-    fn visit_map<V>(&mut self, visitor: V) -> Result<(), Self::Error>
-        where V: MapVisitor;
+    /// Serializes a tuple struct element. Must have previously called
+    /// `serialize_tuple_struct`.
+    fn serialize_tuple_struct_elt<T: Serialize>(
+        &mut self,
+        state: &mut Self::TupleStructState,
+        value: T,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a map element (key-value pair).
-    fn visit_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Self::Error>
-        where K: Serialize,
-              V: Serialize;
+    /// Finishes serializing a tuple struct.
+    fn serialize_tuple_struct_end(
+        &mut self,
+        state: Self::TupleStructState,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a struct.
-    ///
-    /// By default, structs are serialized as a map with the field name as the key.
-    #[inline]
-    fn visit_struct<V>(&mut self,
-                       _name: &'static str,
-                       visitor: V) -> Result<(), Self::Error>
-        where V: MapVisitor,
-    {
-        self.visit_map(visitor)
-    }
+    /// Begins to serialize a tuple variant. This call must be followed by zero
+    /// or more calls to `serialize_tuple_variant_elt`, then a call to
+    /// `serialize_tuple_variant_end`. A reasonable implementation would be to
+    /// forward to `serialize_tuple_struct`.
+    fn serialize_tuple_variant(
+        &mut self,
+        name: &'static str,
+        variant_index: usize,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::TupleVariantState, Self::Error>;
 
-    /// Serializes an element of a struct.
-    ///
-    /// By default, struct elements are serialized as a map element with the field name as the key.
-    #[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)
-    }
+    /// Serializes a tuple variant element. Must have previously called
+    /// `serialize_tuple_variant`.
+    fn serialize_tuple_variant_elt<T: Serialize>(
+        &mut self,
+        state: &mut Self::TupleVariantState,
+        value: T,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes a struct variant.
-    ///
-    /// By default, struct variants are serialized as a struct.
-    #[inline]
-    fn visit_struct_variant<V>(&mut self,
-                               _name: &'static str,
-                               _variant_index: usize,
-                               variant: &'static str,
-                               visitor: V) -> Result<(), Self::Error>
-        where V: MapVisitor,
-    {
-        self.visit_struct(variant, visitor)
-    }
+    /// Finishes serializing a tuple variant.
+    fn serialize_tuple_variant_end(
+        &mut self,
+        state: Self::TupleVariantState,
+    ) -> Result<(), Self::Error>;
 
-    /// Serializes an element of a struct variant.
-    ///
-    /// By default, struct variant elements are serialized as a struct element.
-    #[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)
-    }
+    /// Begins to serialize a map. This call must be followed by zero or more
+    /// calls to `serialize_map_key` and `serialize_map_value`, then a call to
+    /// `serialize_map_end`.
+    fn serialize_map(
+        &mut self,
+        len: Option<usize>,
+    ) -> Result<Self::MapState, Self::Error>;
 
-    /// Specify a format string for the serializer.
-    ///
-    /// The serializer format is used to determine which format
-    /// specific field attributes should be used with the serializer.
-    fn format() -> &'static str {
-        ""
-    }
-}
-
-/// A trait that is used by a `Serialize` to iterate through a sequence.
-pub trait SeqVisitor {
-    /// Serializes a sequence item in the serializer.
-    ///
-    /// This returns `Ok(Some(()))` when there are more items to serialize, or `Ok(None)` when
-    /// complete.
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: Serializer;
-
-    /// Return the length of the sequence if known.
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        None
-    }
-}
-
-/// A trait that is used by a `Serialize` to iterate through a map.
-pub trait MapVisitor {
-    /// Serializes a map item in the serializer.
-    ///
-    /// This returns `Ok(Some(()))` when there are more items to serialize, or `Ok(None)` when
-    /// complete.
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: Serializer;
-
-    /// Return the length of the map if known.
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        None
-    }
+    /// Serialize a map key. Must have previously called `serialize_map`.
+    fn serialize_map_key<T: Serialize>(
+        &mut self,
+        state: &mut Self::MapState,
+        key: T
+    ) -> Result<(), Self::Error>;
+
+    /// Serialize a map value. Must have previously called `serialize_map`.
+    fn serialize_map_value<T: Serialize>(
+        &mut self,
+        state: &mut Self::MapState,
+        value: T
+    ) -> Result<(), Self::Error>;
+
+    /// Finishes serializing a map.
+    fn serialize_map_end(
+        &mut self,
+        state: Self::MapState,
+    ) -> Result<(), Self::Error>;
+
+    /// Begins to serialize a struct. This call must be followed by zero or more
+    /// calls to `serialize_struct_elt`, then a call to `serialize_struct_end`.
+    fn serialize_struct(
+        &mut self,
+        name: &'static str,
+        len: usize,
+    ) -> Result<Self::StructState, Self::Error>;
+
+    /// Serializes a struct field. Must have previously called
+    /// `serialize_struct`.
+    fn serialize_struct_elt<V: Serialize>(
+        &mut self,
+        state: &mut Self::StructState,
+        key: &'static str,
+        value: V,
+    ) -> Result<(), Self::Error>;
+
+    /// Finishes serializing a struct.
+    fn serialize_struct_end(
+        &mut self,
+        state: Self::StructState,
+    ) -> Result<(), Self::Error>;
+
+    /// Begins to serialize a struct variant. This call must be followed by zero
+    /// or more calls to `serialize_struct_variant_elt`, then a call to
+    /// `serialize_struct_variant_end`.
+    fn serialize_struct_variant(
+        &mut self,
+        name: &'static str,
+        variant_index: usize,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::StructVariantState, Self::Error>;
+
+    /// Serialize a struct variant element. Must have previously called
+    /// `serialize_struct_variant`.
+    fn serialize_struct_variant_elt<V: Serialize>(
+        &mut self,
+        state: &mut Self::StructVariantState,
+        key: &'static str,
+        value: V,
+    ) -> Result<(), Self::Error>;
+
+    /// Finishes serializing a struct variant.
+    fn serialize_struct_variant_end(
+        &mut self,
+        state: Self::StructVariantState,
+    ) -> Result<(), Self::Error>;
 }

serde/src/utils.rs

@@ -0,0 +1,72 @@
+//! Private utility functions
+
+const TAG_CONT: u8    = 0b1000_0000;
+const TAG_TWO_B: u8   = 0b1100_0000;
+const TAG_THREE_B: u8 = 0b1110_0000;
+const TAG_FOUR_B: u8  = 0b1111_0000;
+const MAX_ONE_B: u32   =     0x80;
+const MAX_TWO_B: u32   =    0x800;
+const MAX_THREE_B: u32 =  0x10000;
+
+#[inline]
+pub fn encode_utf8(c: char) -> EncodeUtf8 {
+    let code = c as u32;
+    let mut buf = [0; 4];
+    let pos = if code < MAX_ONE_B {
+        buf[3] = code as u8;
+        3
+    } else if code < MAX_TWO_B {
+        buf[2] = (code >> 6 & 0x1F) as u8 | TAG_TWO_B;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        2
+    } else if code < MAX_THREE_B {
+        buf[1] = (code >> 12 & 0x0F) as u8 | TAG_THREE_B;
+        buf[2] = (code >>  6 & 0x3F) as u8 | TAG_CONT;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        1
+    } else {
+        buf[0] = (code >> 18 & 0x07) as u8 | TAG_FOUR_B;
+        buf[1] = (code >> 12 & 0x3F) as u8 | TAG_CONT;
+        buf[2] = (code >>  6 & 0x3F) as u8 | TAG_CONT;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        0
+    };
+    EncodeUtf8 { buf: buf, pos: pos }
+}
+
+pub struct EncodeUtf8 {
+    buf: [u8; 4],
+    pos: usize,
+}
+
+impl EncodeUtf8 {
+    // FIXME: use this from_utf8_unchecked, since we know it can never fail
+    pub fn as_str(&self) -> &str {
+        ::core::str::from_utf8(&self.buf[self.pos..]).unwrap()
+    }
+}
+
+#[allow(non_upper_case_globals)]
+const Pattern_White_Space_table: &'static [(char, char)] = &[
+    ('\u{9}', '\u{d}'), ('\u{20}', '\u{20}'), ('\u{85}', '\u{85}'), ('\u{200e}', '\u{200f}'),
+    ('\u{2028}', '\u{2029}')
+];
+
+fn bsearch_range_table(c: char, r: &'static [(char, char)]) -> bool {
+    use core::cmp::Ordering::{Equal, Less, Greater};
+    r.binary_search_by(|&(lo, hi)| {
+        if c < lo {
+            Greater
+        } else if hi < c {
+            Less
+        } else {
+            Equal
+        }
+    })
+    .is_ok()
+}
+
+#[allow(non_snake_case)]
+pub fn Pattern_White_Space(c: char) -> bool {
+    bsearch_range_table(c, Pattern_White_Space_table)
+}

serde_codegen/Cargo.toml

@@ -1,26 +1,38 @@
 [package]
 name = "serde_codegen"
-version = "0.6.5"
+version = "0.8.3"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde-rs.github.io/serde/serde_codegen/serde_codegen/index.html"
-build = "build.rs"
+documentation = "https://serde.rs/codegen.html"
 keywords = ["serde", "serialization"]
+build = "build.rs"
+include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
 
 [features]
 default = ["with-syntex"]
-nightly = ["quasi_macros"]
-with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
+unstable = ["quasi_macros"]
+unstable-testing = ["clippy"]
+with-syntex = [
+    "quasi/with-syntex",
+    "quasi_codegen",
+    "quasi_codegen/with-syntex",
+    "serde_codegen_internals/with-syntex",
+    "syntex",
+    "syntex_syntax",
+]
 
 [build-dependencies]
-quasi_codegen = { verision = "^0.3.8", optional = true }
-syntex = { version = "^0.22.0", optional = true }
+quasi_codegen = { version = "^0.17.0", optional = true }
+syntex = { version = "^0.41.0", optional = true }
 
 [dependencies]
-aster = { version = "^0.8.0", default-features = false }
-quasi = { verision = "^0.3.8", default-features = false }
-quasi_macros = { version = "^0.3.8", optional = true }
-syntex = { version = "^0.22.0", optional = true }
-syntex_syntax = { version = "^0.22.0", optional = true }
+aster = { version = "^0.24.0", default-features = false }
+clippy = { version = "^0.*", optional = true }
+quasi = { version = "^0.17.0", default-features = false }
+quasi_macros = { version = "^0.17.0", optional = true }
+serde_codegen_internals = { version = "=0.6.1", default-features = false, path = "../serde_codegen_internals" }
+syntex = { version = "^0.41.0", optional = true }
+syntex_syntax = { version = "^0.41.0", optional = true }

serde_codegen/build.rs

@@ -1,20 +1,20 @@
 #[cfg(feature = "with-syntex")]
 mod inner {
-    extern crate syntex;
     extern crate quasi_codegen;
 
     use std::env;
     use std::path::Path;
+    use std::thread::spawn;
 
     pub fn main() {
-        let out_dir = env::var_os("OUT_DIR").unwrap();
-        let mut registry = syntex::Registry::new();
-        quasi_codegen::register(&mut registry);
+        // put everything into a thread, so users can use `RUST_MIN_STACK` to increase the amount of stack
+        spawn(|| {
+            let out_dir = env::var_os("OUT_DIR").unwrap();
 
-        let src = Path::new("src/lib.rs.in");
-        let dst = Path::new(&out_dir).join("lib.rs");
-
-        registry.expand("", &src, &dst).unwrap();
+            let src = Path::new("src/lib.rs.in");
+            let dst = Path::new(&out_dir).join("lib.rs");
+            quasi_codegen::expand(&src, &dst).unwrap();
+        }).join().unwrap()
     }
 }
 

serde_codegen/src/attr.rs

@@ -1,245 +0,0 @@
-use std::collections::HashMap;
-use std::collections::HashSet;
-
-use syntax::ast;
-use syntax::attr;
-use syntax::ext::base::ExtCtxt;
-use syntax::ptr::P;
-
-use aster;
-
-/// Represents field name information
-#[derive(Debug)]
-pub enum FieldNames {
-    Global(P<ast::Expr>),
-    Format{
-        formats: HashMap<P<ast::Expr>, P<ast::Expr>>,
-        default: P<ast::Expr>,
-    }
-}
-
-/// Represents field attribute information
-#[derive(Debug)]
-pub struct FieldAttrs {
-    skip_serializing_field: bool,
-    skip_serializing_field_if_empty: bool,
-    skip_serializing_field_if_none: bool,
-    names: FieldNames,
-    use_default: bool,
-}
-
-impl FieldAttrs {
-    /// Return a set of formats that the field has attributes for.
-    pub fn formats(&self) -> HashSet<P<ast::Expr>> {
-        match self.names {
-            FieldNames::Format{ref formats, default: _} => {
-                let mut set = HashSet::new();
-                for (fmt, _) in formats.iter() {
-                    set.insert(fmt.clone());
-                };
-                set
-            },
-            _ => HashSet::new()
-        }
-    }
-
-    /// Return an expression for the field key name for serialisation.
-    ///
-    /// The resulting expression assumes that `S` refers to a type
-    /// that implements `Serializer`.
-    pub fn serializer_key_expr(&self, cx: &ExtCtxt) -> P<ast::Expr> {
-        match self.names {
-            FieldNames::Global(ref name) => name.clone(),
-            FieldNames::Format { ref formats, ref default } => {
-                let arms = formats.iter()
-                    .map(|(fmt, lit)| {
-                        quote_arm!(cx, $fmt => { $lit })
-                    })
-                    .collect::<Vec<_>>();
-                quote_expr!(cx,
-                    match S::format() {
-                        $arms
-                        _ => { $default }
-                    }
-                )
-            },
-        }
-    }
-
-    /// Return the default field name for the field.
-    pub fn default_key_expr(&self) -> &P<ast::Expr> {
-        match self.names {
-            FieldNames::Global(ref expr) => expr,
-            FieldNames::Format{formats: _, ref default} => default,
-        }
-    }
-
-    /// Return the field name for the field in the specified format.
-    pub fn key_expr(&self, format: &P<ast::Expr>) -> &P<ast::Expr> {
-        match self.names {
-            FieldNames::Global(ref expr) => expr,
-            FieldNames::Format { ref formats, ref default } => {
-                formats.get(format).unwrap_or(default)
-            }
-        }
-    }
-
-    /// Predicate for using a field's default value
-    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
-    }
-
-    pub fn skip_serializing_field_if_empty(&self) -> bool {
-        self.skip_serializing_field_if_empty
-    }
-
-    pub fn skip_serializing_field_if_none(&self) -> bool {
-        self.skip_serializing_field_if_none
-    }
-}
-
-pub struct FieldAttrsBuilder<'a> {
-    builder: &'a aster::AstBuilder,
-    skip_serializing_field: bool,
-    skip_serializing_field_if_empty: bool,
-    skip_serializing_field_if_none: bool,
-    name: Option<P<ast::Expr>>,
-    format_rename: HashMap<P<ast::Expr>, P<ast::Expr>>,
-    use_default: bool,
-}
-
-impl<'a> FieldAttrsBuilder<'a> {
-    pub fn new(builder: &'a aster::AstBuilder) -> FieldAttrsBuilder<'a> {
-        FieldAttrsBuilder {
-            builder: builder,
-            skip_serializing_field: false,
-            skip_serializing_field_if_empty: false,
-            skip_serializing_field_if_none: false,
-            name: None,
-            format_rename: HashMap::new(),
-            use_default: false,
-        }
-    }
-
-    pub fn field(mut self, field: &ast::StructField) -> FieldAttrsBuilder<'a> {
-        match field.node.kind {
-            ast::NamedField(name, _) => {
-                self.name = Some(self.builder.expr().str(name));
-            }
-            ast::UnnamedField(_) => { }
-        };
-
-        self.attrs(&field.node.attrs)
-    }
-
-    pub fn attrs(self, attrs: &[ast::Attribute]) -> FieldAttrsBuilder<'a> {
-        attrs.iter().fold(self, FieldAttrsBuilder::attr)
-    }
-
-    pub fn attr(self, attr: &ast::Attribute) -> FieldAttrsBuilder<'a> {
-        match attr.node.value.node {
-            ast::MetaList(ref name, ref items) if name == &"serde" => {
-                attr::mark_used(&attr);
-                items.iter().fold(self, FieldAttrsBuilder::meta_item)
-            }
-            _ => {
-                self
-            }
-        }
-    }
-
-    pub fn meta_item(mut self, meta_item: &P<ast::MetaItem>) -> FieldAttrsBuilder<'a> {
-        match meta_item.node {
-            ast::MetaNameValue(ref name, ref lit) if name == &"rename" => {
-                let expr = self.builder.expr().build_lit(P(lit.clone()));
-
-                self.name(expr)
-            }
-            ast::MetaList(ref name, ref items) if name == &"rename" => {
-                for item in items {
-                    match item.node {
-                        ast::MetaNameValue(ref name, ref lit) => {
-                            let name = self.builder.expr().str(name);
-                            let expr = self.builder.expr().build_lit(P(lit.clone()));
-
-                            self = self.format_rename(name, expr);
-                        }
-                        _ => { }
-                    }
-                }
-                self
-            }
-            ast::MetaWord(ref name) if name == &"default" => {
-                self.default()
-            }
-            ast::MetaWord(ref name) if name == &"skip_serializing" => {
-                self.skip_serializing_field()
-            }
-            ast::MetaWord(ref name) if name == &"skip_serializing_if_empty" => {
-                self.skip_serializing_field_if_empty()
-            }
-            ast::MetaWord(ref name) if name == &"skip_serializing_if_none" => {
-                self.skip_serializing_field_if_none()
-            }
-            _ => {
-                // Ignore unknown meta variables for now.
-                self
-            }
-        }
-    }
-
-    pub fn skip_serializing_field(mut self) -> FieldAttrsBuilder<'a> {
-        self.skip_serializing_field = true;
-        self
-    }
-
-    pub fn skip_serializing_field_if_empty(mut self) -> FieldAttrsBuilder<'a> {
-        self.skip_serializing_field_if_empty = true;
-        self
-    }
-
-    pub fn skip_serializing_field_if_none(mut self) -> FieldAttrsBuilder<'a> {
-        self.skip_serializing_field_if_none = true;
-        self
-    }
-
-    pub fn name(mut self, name: P<ast::Expr>) -> FieldAttrsBuilder<'a> {
-        self.name = Some(name);
-        self
-    }
-
-    pub fn format_rename(mut self, format: P<ast::Expr>, name: P<ast::Expr>) -> FieldAttrsBuilder<'a> {
-        self.format_rename.insert(format, name);
-        self
-    }
-
-    pub fn default(mut self) -> FieldAttrsBuilder<'a> {
-        self.use_default = true;
-        self
-    }
-
-    pub fn build(self) -> FieldAttrs {
-        let name = self.name.expect("here");
-        let names = if self.format_rename.is_empty() {
-            FieldNames::Global(name)
-        } else {
-            FieldNames::Format {
-                formats: self.format_rename,
-                default: name,
-            }
-        };
-
-        FieldAttrs {
-            skip_serializing_field: self.skip_serializing_field,
-            skip_serializing_field_if_empty: self.skip_serializing_field_if_empty,
-            skip_serializing_field_if_none: self.skip_serializing_field_if_none,
-            names: names,
-            use_default: self.use_default,
-        }
-    }
-}

serde_codegen/src/bound.rs

@@ -0,0 +1,127 @@
+use std::collections::HashSet;
+
+use aster::AstBuilder;
+
+use syntax::ast;
+use syntax::visit;
+
+use internals::ast::Item;
+use internals::attr;
+
+// Remove the default from every type parameter because in the generated impls
+// they look like associated types: "error: associated type bindings are not
+// allowed here".
+pub fn without_defaults(generics: &ast::Generics) -> ast::Generics {
+    ast::Generics {
+        ty_params: generics.ty_params.iter().map(|ty_param| {
+            ast::TyParam {
+                default: None,
+                .. ty_param.clone()
+            }}).collect(),
+        .. generics.clone()
+    }
+}
+
+pub fn with_where_predicates(
+    builder: &AstBuilder,
+    generics: &ast::Generics,
+    predicates: &[ast::WherePredicate],
+) -> ast::Generics {
+    builder.from_generics(generics.clone())
+        .with_predicates(predicates.to_vec())
+        .build()
+}
+
+pub fn with_where_predicates_from_fields<F>(
+    builder: &AstBuilder,
+    item: &Item,
+    generics: &ast::Generics,
+    from_field: F,
+) -> ast::Generics
+    where F: Fn(&attr::Field) -> Option<&[ast::WherePredicate]>,
+{
+    builder.from_generics(generics.clone())
+        .with_predicates(
+            item.body.all_fields()
+                .flat_map(|field| from_field(&field.attrs))
+                .flat_map(|predicates| predicates.to_vec()))
+        .build()
+}
+
+// Puts the given bound on any generic type parameters that are used in fields
+// for which filter returns true.
+//
+// For example, the following struct needs the bound `A: Serialize, B: Serialize`.
+//
+//     struct S<'b, A, B: 'b, C> {
+//         a: A,
+//         b: Option<&'b B>
+//         #[serde(skip_serializing)]
+//         c: C,
+//     }
+pub fn with_bound<F>(
+    builder: &AstBuilder,
+    item: &Item,
+    generics: &ast::Generics,
+    filter: F,
+    bound: &ast::Path,
+) -> ast::Generics
+    where F: Fn(&attr::Field) -> bool,
+{
+    struct FindTyParams {
+        // Set of all generic type parameters on the current struct (A, B, C in
+        // the example). Initialized up front.
+        all_ty_params: HashSet<ast::Name>,
+        // Set of generic type parameters used in fields for which filter
+        // returns true (A and B in the example). Filled in as the visitor sees
+        // them.
+        relevant_ty_params: HashSet<ast::Name>,
+    }
+    impl visit::Visitor for FindTyParams {
+        fn visit_path(&mut self, path: &ast::Path, _id: ast::NodeId) {
+            if let Some(seg) = path.segments.last() {
+                if seg.identifier.name.as_str() == "PhantomData" {
+                    // Hardcoded exception, because PhantomData<T> implements
+                    // Serialize and Deserialize whether or not T implements it.
+                    return;
+                }
+            }
+            if !path.global && path.segments.len() == 1 {
+                let id = path.segments[0].identifier.name;
+                if self.all_ty_params.contains(&id) {
+                    self.relevant_ty_params.insert(id);
+                }
+            }
+            visit::walk_path(self, path);
+        }
+    }
+
+    let all_ty_params: HashSet<_> = generics.ty_params.iter()
+        .map(|ty_param| ty_param.ident.name)
+        .collect();
+
+    let relevant_tys = item.body.all_fields()
+        .filter(|&field| filter(&field.attrs))
+        .map(|field| &field.ty);
+
+    let mut visitor = FindTyParams {
+        all_ty_params: all_ty_params,
+        relevant_ty_params: HashSet::new(),
+    };
+    for ty in relevant_tys {
+        visit::walk_ty(&mut visitor, ty);
+    }
+
+    builder.from_generics(generics.clone())
+        .with_predicates(
+            generics.ty_params.iter()
+                .map(|ty_param| ty_param.ident.name)
+                .filter(|id| visitor.relevant_ty_params.contains(id))
+                .map(|id| builder.where_predicate()
+                    // the type parameter that is being bounded e.g. T
+                    .bound().build(builder.ty().id(id))
+                    // the bound e.g. Serialize
+                    .bound().trait_(bound.clone()).build()
+                    .build()))
+        .build()
+}

serde_codegen/src/env.rs

@@ -0,0 +1,36 @@
+use std::env;
+use std::ffi::OsStr;
+use std::ops::Drop;
+
+pub fn set_if_unset<K, V>(k: K, v: V) -> TmpEnv<K>
+    where K: AsRef<OsStr>,
+          V: AsRef<OsStr>,
+{
+    match env::var(&k) {
+        Ok(_) => TmpEnv::WasAlreadySet,
+        Err(_) => {
+            env::set_var(&k, v);
+            TmpEnv::WasNotSet { k: k }
+        }
+    }
+}
+
+#[must_use]
+pub enum TmpEnv<K>
+    where K: AsRef<OsStr>,
+{
+    WasAlreadySet,
+    WasNotSet {
+        k: K,
+    }
+}
+
+impl<K> Drop for TmpEnv<K>
+    where K: AsRef<OsStr>,
+{
+    fn drop(&mut self) {
+        if let TmpEnv::WasNotSet { ref k } = *self {
+            env::remove_var(k);
+        }
+    }
+}

serde_codegen/src/field.rs

@@ -1,17 +0,0 @@
-use syntax::ast;
-use syntax::ext::base::ExtCtxt;
-
-use aster;
-use attr::{FieldAttrs, FieldAttrsBuilder};
-
-pub fn struct_field_attrs(
-    _cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    fields: &[ast::StructField],
-) -> Vec<FieldAttrs> {
-    fields.iter()
-        .map(|field| {
-            FieldAttrsBuilder::new(builder).field(field).build()
-        })
-        .collect()
-}

serde_codegen/src/lib.rs

@@ -1,21 +1,34 @@
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "clippy", allow(used_underscore_binding))]
 #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
 #![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
 
 extern crate aster;
 extern crate quasi;
+extern crate serde_codegen_internals as internals;
 
 #[cfg(feature = "with-syntex")]
 extern crate syntex;
 
 #[cfg(feature = "with-syntex")]
+#[macro_use]
 extern crate syntex_syntax as syntax;
 
 #[cfg(not(feature = "with-syntex"))]
+#[macro_use]
 extern crate syntax;
 
 #[cfg(not(feature = "with-syntex"))]
 extern crate rustc_plugin;
 
+#[cfg(feature = "with-syntex")]
+use std::path::Path;
+
+#[cfg(not(feature = "with-syntex"))]
+use syntax::feature_gate::AttributeType;
+
 #[cfg(feature = "with-syntex")]
 include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 
@@ -23,40 +36,61 @@ include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 include!("lib.rs.in");
 
 #[cfg(feature = "with-syntex")]
-pub fn register(reg: &mut syntex::Registry) {
-    use syntax::{ast, fold};
+mod env;
 
-    reg.add_attr("feature(custom_derive)");
-    reg.add_attr("feature(custom_attribute)");
+#[cfg(feature = "with-syntex")]
+pub fn expand<S, D>(src: S, dst: D) -> Result<(), syntex::Error>
+    where S: AsRef<Path>,
+          D: AsRef<Path>,
+{
+    let src = src.as_ref().to_owned();
+    let dst = dst.as_ref().to_owned();
 
-    reg.add_decorator("derive_Serialize", ser::expand_derive_serialize);
-    reg.add_decorator("derive_Deserialize", de::expand_derive_deserialize);
+    let expand_thread = move || {
+        use syntax::{ast, fold};
 
-    reg.add_post_expansion_pass(strip_attributes);
+        /// Strip the serde attributes from the crate.
+        #[cfg(feature = "with-syntex")]
+        fn strip_attributes(krate: ast::Crate) -> ast::Crate {
+            /// Helper folder that strips the serde attributes after the extensions have been expanded.
+            struct StripAttributeFolder;
 
-    /// Strip the serde attributes from the crate.
-    #[cfg(feature = "with-syntex")]
-    fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-        /// Helper folder that strips the serde attributes after the extensions have been expanded.
-        struct StripAttributeFolder;
+            impl fold::Folder for StripAttributeFolder {
+                fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
+                    match attr.node.value.node {
+                        ast::MetaItemKind::List(ref n, _) if n == &"serde" => { return None; }
+                        _ => {}
+                    }
 
-        impl fold::Folder for StripAttributeFolder {
-            fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-                match attr.node.value.node {
-                    ast::MetaList(ref n, _) if n == &"serde" => { return None; }
-                    _ => {}
+                    Some(attr)
                 }
 
-                Some(attr)
+                fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
+                    fold::noop_fold_mac(mac, self)
+                }
             }
 
-            fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
-                fold::noop_fold_mac(mac, self)
-            }
+            fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
         }
 
-        fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
-    }
+        let mut reg = syntex::Registry::new();
+
+        reg.add_attr("feature(custom_derive)");
+        reg.add_attr("feature(custom_attribute)");
+
+        reg.add_decorator("derive_Serialize", ser::expand_derive_serialize);
+        reg.add_decorator("derive_Deserialize", de::expand_derive_deserialize);
+
+        reg.add_post_expansion_pass(strip_attributes);
+
+        reg.expand("", src, dst)
+    };
+
+    // 16 MB stack unless otherwise specified
+    let _tmp_env = env::set_if_unset("RUST_MIN_STACK", "16777216");
+
+    use std::thread;
+    thread::spawn(expand_thread).join().unwrap()
 }
 
 #[cfg(not(feature = "with-syntex"))]
@@ -70,4 +104,6 @@ pub fn register(reg: &mut rustc_plugin::Registry) {
         syntax::parse::token::intern("derive_Deserialize"),
         syntax::ext::base::MultiDecorator(
             Box::new(de::expand_derive_deserialize)));
+
+    reg.register_attribute("serde".to_owned(), AttributeType::Normal);
 }

serde_codegen/src/lib.rs.in

@@ -1,4 +1,4 @@
-mod attr;
+mod bound;
 mod de;
-mod field;
 mod ser;
+mod span;

serde_codegen/src/span.rs

@@ -0,0 +1,43 @@
+use syntax::ast;
+use syntax::codemap::{self, ExpnId, Span};
+use syntax::ext::base::{Annotatable, ExtCtxt};
+use syntax::fold::{self, Folder};
+use syntax::parse::token::intern;
+use syntax::ptr::P;
+
+pub fn record_expansion(
+    cx: &ExtCtxt,
+    item: P<ast::Item>,
+    derive: &str,
+) -> Annotatable {
+    let info = codemap::ExpnInfo {
+        call_site: codemap::DUMMY_SP,
+        callee: codemap::NameAndSpan {
+            format: codemap::MacroAttribute(intern(&format!("derive({})", derive))),
+            span: None,
+            allow_internal_unstable: false,
+        },
+    };
+    let expn_id = cx.codemap().record_expansion(info);
+
+    let mut respanner = Respanner { expn_id: expn_id };
+    let item = item.map(|item| respanner.fold_item_simple(item));
+    Annotatable::Item(item)
+}
+
+struct Respanner {
+    expn_id: ExpnId,
+}
+
+impl Folder for Respanner {
+    fn new_span(&mut self, span: Span) -> Span {
+        Span {
+            expn_id: self.expn_id,
+            .. span
+        }
+    }
+
+    fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
+        fold::noop_fold_mac(mac, self)
+    }
+}

serde_codegen_internals/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "serde_codegen_internals"
+version = "0.6.1"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "AST representation used by Serde codegen. Unstable."
+homepage = "https://serde.rs"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://docs.serde.rs/serde_codegen_internals/"
+keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "src/**/*.rs"]
+
+[features]
+default = ["with-syntex"]
+unstable-testing = ["clippy"]
+with-syntex = ["syntex_syntax", "syntex_errors"]
+
+[dependencies]
+clippy = { version = "^0.*", optional = true }
+syntex_syntax = { version = "^0.41.0", optional = true }
+syntex_errors = { version = "^0.41.0", optional = true }

serde_codegen_internals/src/ast.rs

@@ -0,0 +1,142 @@
+use syntax::ast;
+use syntax::codemap;
+use syntax::ext::base::ExtCtxt;
+use syntax::ptr::P;
+
+use attr;
+use Error;
+
+pub struct Item<'a> {
+    pub ident: ast::Ident,
+    pub span: codemap::Span,
+    pub attrs: attr::Item,
+    pub body: Body<'a>,
+    pub generics: &'a ast::Generics,
+}
+
+pub enum Body<'a> {
+    Enum(Vec<Variant<'a>>),
+    Struct(Style, Vec<Field<'a>>),
+}
+
+pub struct Variant<'a> {
+    pub ident: ast::Ident,
+    pub span: codemap::Span,
+    pub attrs: attr::Variant,
+    pub style: Style,
+    pub fields: Vec<Field<'a>>,
+}
+
+pub struct Field<'a> {
+    pub ident: Option<ast::Ident>,
+    pub span: codemap::Span,
+    pub attrs: attr::Field,
+    pub ty: &'a P<ast::Ty>,
+}
+
+pub enum Style {
+    Struct,
+    Tuple,
+    Newtype,
+    Unit,
+}
+
+impl<'a> Item<'a> {
+    pub fn from_ast(
+        cx: &ExtCtxt,
+        item: &'a ast::Item,
+    ) -> Result<Item<'a>, Error> {
+        let attrs = attr::Item::from_ast(cx, item);
+
+        let (body, generics) = match item.node {
+            ast::ItemKind::Enum(ref enum_def, ref generics) => {
+                let variants = enum_from_ast(cx, enum_def);
+                (Body::Enum(variants), generics)
+            }
+            ast::ItemKind::Struct(ref variant_data, ref generics) => {
+                let (style, fields) = struct_from_ast(cx, variant_data);
+                (Body::Struct(style, fields), generics)
+            }
+            _ => {
+                return Err(Error::UnexpectedItemKind);
+            }
+        };
+
+        Ok(Item {
+            ident: item.ident,
+            span: item.span,
+            attrs: attrs,
+            body: body,
+            generics: generics,
+        })
+    }
+}
+
+impl<'a> Body<'a> {
+    pub fn all_fields(&'a self) -> Box<Iterator<Item=&'a Field<'a>> + 'a> {
+        match *self {
+            Body::Enum(ref variants) => {
+                Box::new(variants.iter()
+                             .flat_map(|variant| variant.fields.iter()))
+            }
+            Body::Struct(_, ref fields) => {
+                Box::new(fields.iter())
+            }
+        }
+    }
+}
+
+fn enum_from_ast<'a>(
+    cx: &ExtCtxt,
+    enum_def: &'a ast::EnumDef,
+) -> Vec<Variant<'a>> {
+    enum_def.variants.iter()
+        .map(|variant| {
+            let (style, fields) = struct_from_ast(cx, &variant.node.data);
+            Variant {
+                ident: variant.node.name,
+                span: variant.span,
+                attrs: attr::Variant::from_ast(cx, variant),
+                style: style,
+                fields: fields,
+            }
+        })
+        .collect()
+}
+
+fn struct_from_ast<'a>(
+    cx: &ExtCtxt,
+    variant_data: &'a ast::VariantData,
+) -> (Style, Vec<Field<'a>>) {
+    match *variant_data {
+        ast::VariantData::Struct(ref fields, _) => {
+            (Style::Struct, fields_from_ast(cx, fields))
+        }
+        ast::VariantData::Tuple(ref fields, _) if fields.len() == 1 => {
+            (Style::Newtype, fields_from_ast(cx, fields))
+        }
+        ast::VariantData::Tuple(ref fields, _) => {
+            (Style::Tuple, fields_from_ast(cx, fields))
+        }
+        ast::VariantData::Unit(_) => {
+            (Style::Unit, Vec::new())
+        }
+    }
+}
+
+fn fields_from_ast<'a>(
+    cx: &ExtCtxt,
+    fields: &'a [ast::StructField],
+) -> Vec<Field<'a>> {
+    fields.iter()
+        .enumerate()
+        .map(|(i, field)| {
+            Field {
+                ident: field.ident,
+                span: field.span,
+                attrs: attr::Field::from_ast(cx, i, field),
+                ty: &field.ty,
+            }
+        })
+        .collect()
+}

serde_codegen_internals/src/attr.rs

@@ -0,0 +1,640 @@
+use std::rc::Rc;
+
+use syntax::ast;
+use syntax::attr::{self, HasAttrs};
+use syntax::codemap::{Span, Spanned, respan};
+use syntax::ext::base::ExtCtxt;
+use syntax::fold::Folder;
+use syntax::parse::parser::{Parser, PathStyle};
+use syntax::parse::token::{self, InternedString};
+use syntax::parse;
+use syntax::print::pprust::{lit_to_string, meta_item_to_string};
+use syntax::ptr::P;
+use syntax::tokenstream::{self, TokenTree};
+
+// This module handles parsing of `#[serde(...)]` attributes. The entrypoints
+// are `attr::Item::from_ast`, `attr::Variant::from_ast`, and
+// `attr::Field::from_ast`. Each returns an instance of the corresponding
+// struct. Note that none of them return a Result. Unrecognized, malformed, or
+// duplicated attributes result in a span_err but otherwise are ignored. The
+// user will see errors simultaneously for all bad attributes in the crate
+// rather than just the first.
+
+struct Attr<'a, 'b: 'a, T> {
+    cx: &'a ExtCtxt<'b>,
+    name: &'static str,
+    value: Option<Spanned<T>>,
+}
+impl<'a, 'b, T> Attr<'a, 'b, T> {
+    fn none(cx: &'a ExtCtxt<'b>, name: &'static str) -> Self {
+        Attr {
+            cx: cx,
+            name: name,
+            value: None,
+        }
+    }
+
+    fn set(&mut self, span: Span, t: T) {
+        if let Some(Spanned { span: prev_span, .. }) = self.value {
+            let mut err = self.cx.struct_span_err(
+                span,
+                &format!("duplicate serde attribute `{}`", self.name));
+            err.span_help(prev_span, "previously set here");
+            err.emit();
+        } else {
+            self.value = Some(respan(span, t));
+        }
+    }
+
+    fn set_opt(&mut self, v: Option<Spanned<T>>) {
+        if let Some(v) = v {
+            self.set(v.span, v.node);
+        }
+    }
+
+    fn set_if_none(&mut self, span: Span, t: T) {
+        if self.value.is_none() {
+            self.value = Some(respan(span, t));
+        }
+    }
+
+    fn get(self) -> Option<T> {
+        self.value.map(|spanned| spanned.node)
+    }
+
+    fn get_spanned(self) -> Option<Spanned<T>> {
+        self.value
+    }
+}
+
+struct BoolAttr<'a, 'b: 'a>(Attr<'a, 'b, ()>);
+impl<'a, 'b> BoolAttr<'a, 'b> {
+    fn none(cx: &'a ExtCtxt<'b>, name: &'static str) -> Self {
+        BoolAttr(Attr::none(cx, name))
+    }
+
+    fn set_true(&mut self, span: Span) {
+        self.0.set(span, ());
+    }
+
+    fn get(&self) -> bool {
+        self.0.value.is_some()
+    }
+}
+
+#[derive(Debug)]
+pub struct Name {
+    serialize: InternedString,
+    deserialize: InternedString,
+}
+
+impl Name {
+    /// Return the container name for the container when serializing.
+    pub fn serialize_name(&self) -> InternedString {
+        self.serialize.clone()
+    }
+
+    /// Return the container name for the container when deserializing.
+    pub fn deserialize_name(&self) -> InternedString {
+        self.deserialize.clone()
+    }
+}
+
+/// Represents container (e.g. struct) attribute information
+#[derive(Debug)]
+pub struct Item {
+    name: Name,
+    deny_unknown_fields: bool,
+    ser_bound: Option<Vec<ast::WherePredicate>>,
+    de_bound: Option<Vec<ast::WherePredicate>>,
+}
+
+impl Item {
+    /// Extract out the `#[serde(...)]` attributes from an item.
+    pub fn from_ast(cx: &ExtCtxt, item: &ast::Item) -> Self {
+        let mut ser_name = Attr::none(cx, "rename");
+        let mut de_name = Attr::none(cx, "rename");
+        let mut deny_unknown_fields = BoolAttr::none(cx, "deny_unknown_fields");
+        let mut ser_bound = Attr::none(cx, "bound");
+        let mut de_bound = Attr::none(cx, "bound");
+
+        let ident = item.ident.name.as_str();
+
+        for meta_items in item.attrs().iter().filter_map(get_serde_meta_items) {
+            for meta_item in meta_items {
+                let span = meta_item.span;
+                match meta_item.node {
+                    // Parse `#[serde(rename="foo")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
+                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
+                            ser_name.set(span, s.clone());
+                            de_name.set(span, s);
+                        }
+                    }
+
+                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
+                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
+                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
+                            ser_name.set_opt(ser);
+                            de_name.set_opt(de);
+                        }
+                    }
+
+                    // Parse `#[serde(deny_unknown_fields)]`
+                    ast::MetaItemKind::Word(ref name) if name == &"deny_unknown_fields" => {
+                        deny_unknown_fields.set_true(span);
+                    }
+
+                    // Parse `#[serde(bound="D: Serialize")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"bound" => {
+                        if let Ok(where_predicates) = parse_lit_into_where(cx, name, lit) {
+                            ser_bound.set(span, where_predicates.clone());
+                            de_bound.set(span, where_predicates);
+                        }
+                    }
+
+                    // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
+                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
+                        if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
+                            ser_bound.set_opt(ser);
+                            de_bound.set_opt(de);
+                        }
+                    }
+
+                    _ => {
+                        cx.span_err(
+                            meta_item.span,
+                            &format!("unknown serde container attribute `{}`",
+                                     meta_item_to_string(meta_item)));
+                    }
+                }
+            }
+        }
+
+        Item {
+            name: Name {
+                serialize: ser_name.get().unwrap_or(ident.clone()),
+                deserialize: de_name.get().unwrap_or(ident),
+            },
+            deny_unknown_fields: deny_unknown_fields.get(),
+            ser_bound: ser_bound.get(),
+            de_bound: de_bound.get(),
+        }
+    }
+
+    pub fn name(&self) -> &Name {
+        &self.name
+    }
+
+    pub fn deny_unknown_fields(&self) -> bool {
+        self.deny_unknown_fields
+    }
+
+    pub fn ser_bound(&self) -> Option<&[ast::WherePredicate]> {
+        self.ser_bound.as_ref().map(|vec| &vec[..])
+    }
+
+    pub fn de_bound(&self) -> Option<&[ast::WherePredicate]> {
+        self.de_bound.as_ref().map(|vec| &vec[..])
+    }
+}
+
+/// Represents variant attribute information
+#[derive(Debug)]
+pub struct Variant {
+    name: Name,
+}
+
+impl Variant {
+    pub fn from_ast(cx: &ExtCtxt, variant: &ast::Variant) -> Self {
+        let mut ser_name = Attr::none(cx, "rename");
+        let mut de_name = Attr::none(cx, "rename");
+
+        let ident = variant.node.name.name.as_str();
+
+        for meta_items in variant.node.attrs.iter().filter_map(get_serde_meta_items) {
+            for meta_item in meta_items {
+                let span = meta_item.span;
+                match meta_item.node {
+                    // Parse `#[serde(rename="foo")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
+                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
+                            ser_name.set(span, s.clone());
+                            de_name.set(span, s);
+                        }
+                    }
+
+                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
+                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
+                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
+                            ser_name.set_opt(ser);
+                            de_name.set_opt(de);
+                        }
+                    }
+
+                    _ => {
+                        cx.span_err(
+                            meta_item.span,
+                            &format!("unknown serde variant attribute `{}`",
+                                     meta_item_to_string(meta_item)));
+                    }
+                }
+            }
+        }
+
+        Variant {
+            name: Name {
+                serialize: ser_name.get().unwrap_or(ident.clone()),
+                deserialize: de_name.get().unwrap_or(ident),
+            },
+        }
+    }
+
+    pub fn name(&self) -> &Name {
+        &self.name
+    }
+}
+
+/// Represents field attribute information
+#[derive(Debug)]
+pub struct Field {
+    name: Name,
+    skip_serializing: bool,
+    skip_deserializing: bool,
+    skip_serializing_if: Option<ast::Path>,
+    default: FieldDefault,
+    serialize_with: Option<ast::Path>,
+    deserialize_with: Option<ast::Path>,
+    ser_bound: Option<Vec<ast::WherePredicate>>,
+    de_bound: Option<Vec<ast::WherePredicate>>,
+}
+
+/// Represents the default to use for a field when deserializing.
+#[derive(Debug, PartialEq)]
+pub enum FieldDefault {
+    /// Field must always be specified because it does not have a default.
+    None,
+    /// The default is given by `std::default::Default::default()`.
+    Default,
+    /// The default is given by this function.
+    Path(ast::Path),
+}
+
+impl Field {
+    /// Extract out the `#[serde(...)]` attributes from a struct field.
+    pub fn from_ast(cx: &ExtCtxt,
+                    index: usize,
+                    field: &ast::StructField) -> Self {
+        let mut ser_name = Attr::none(cx, "rename");
+        let mut de_name = Attr::none(cx, "rename");
+        let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
+        let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing");
+        let mut skip_serializing_if = Attr::none(cx, "skip_serializing_if");
+        let mut default = Attr::none(cx, "default");
+        let mut serialize_with = Attr::none(cx, "serialize_with");
+        let mut deserialize_with = Attr::none(cx, "deserialize_with");
+        let mut ser_bound = Attr::none(cx, "bound");
+        let mut de_bound = Attr::none(cx, "bound");
+
+        let ident = match field.ident {
+            Some(ident) => ident.name.as_str(),
+            None => token::intern_and_get_ident(&index.to_string()),
+        };
+
+        for meta_items in field.attrs.iter().filter_map(get_serde_meta_items) {
+            for meta_item in meta_items {
+                let span = meta_item.span;
+                match meta_item.node {
+                    // Parse `#[serde(rename="foo")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
+                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
+                            ser_name.set(span, s.clone());
+                            de_name.set(span, s);
+                        }
+                    }
+
+                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
+                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
+                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
+                            ser_name.set_opt(ser);
+                            de_name.set_opt(de);
+                        }
+                    }
+
+                    // Parse `#[serde(default)]`
+                    ast::MetaItemKind::Word(ref name) if name == &"default" => {
+                        default.set(span, FieldDefault::Default);
+                    }
+
+                    // Parse `#[serde(default="...")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"default" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            default.set(span, FieldDefault::Path(path));
+                        }
+                    }
+
+                    // Parse `#[serde(skip_serializing)]`
+                    ast::MetaItemKind::Word(ref name) if name == &"skip_serializing" => {
+                        skip_serializing.set_true(span);
+                    }
+
+                    // Parse `#[serde(skip_deserializing)]`
+                    ast::MetaItemKind::Word(ref name) if name == &"skip_deserializing" => {
+                        skip_deserializing.set_true(span);
+                    }
+
+                    // Parse `#[serde(skip_serializing_if="...")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"skip_serializing_if" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            skip_serializing_if.set(span, path);
+                        }
+                    }
+
+                    // Parse `#[serde(serialize_with="...")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize_with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            serialize_with.set(span, path);
+                        }
+                    }
+
+                    // Parse `#[serde(deserialize_with="...")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize_with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            deserialize_with.set(span, path);
+                        }
+                    }
+
+                    // Parse `#[serde(bound="D: Serialize")]`
+                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"bound" => {
+                        if let Ok(where_predicates) = parse_lit_into_where(cx, name, lit) {
+                            ser_bound.set(span, where_predicates.clone());
+                            de_bound.set(span, where_predicates);
+                        }
+                    }
+
+                    // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
+                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
+                        if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
+                            ser_bound.set_opt(ser);
+                            de_bound.set_opt(de);
+                        }
+                    }
+
+                    _ => {
+                        cx.span_err(
+                            meta_item.span,
+                            &format!("unknown serde field attribute `{}`",
+                                     meta_item_to_string(meta_item)));
+                    }
+                }
+            }
+        }
+
+        // Is skip_deserializing, initialize the field to Default::default()
+        // unless a different default is specified by `#[serde(default="...")]`
+        if let Some(Spanned { span, .. }) = skip_deserializing.0.value {
+            default.set_if_none(span, FieldDefault::Default);
+        }
+
+        Field {
+            name: Name {
+                serialize: ser_name.get().unwrap_or(ident.clone()),
+                deserialize: de_name.get().unwrap_or(ident),
+            },
+            skip_serializing: skip_serializing.get(),
+            skip_deserializing: skip_deserializing.get(),
+            skip_serializing_if: skip_serializing_if.get(),
+            default: default.get().unwrap_or(FieldDefault::None),
+            serialize_with: serialize_with.get(),
+            deserialize_with: deserialize_with.get(),
+            ser_bound: ser_bound.get(),
+            de_bound: de_bound.get(),
+        }
+    }
+
+    pub fn name(&self) -> &Name {
+        &self.name
+    }
+
+    pub fn skip_serializing(&self) -> bool {
+        self.skip_serializing
+    }
+
+    pub fn skip_deserializing(&self) -> bool {
+        self.skip_deserializing
+    }
+
+    pub fn skip_serializing_if(&self) -> Option<&ast::Path> {
+        self.skip_serializing_if.as_ref()
+    }
+
+    pub fn default(&self) -> &FieldDefault {
+        &self.default
+    }
+
+    pub fn serialize_with(&self) -> Option<&ast::Path> {
+        self.serialize_with.as_ref()
+    }
+
+    pub fn deserialize_with(&self) -> Option<&ast::Path> {
+        self.deserialize_with.as_ref()
+    }
+
+    pub fn ser_bound(&self) -> Option<&[ast::WherePredicate]> {
+        self.ser_bound.as_ref().map(|vec| &vec[..])
+    }
+
+    pub fn de_bound(&self) -> Option<&[ast::WherePredicate]> {
+        self.de_bound.as_ref().map(|vec| &vec[..])
+    }
+}
+
+type SerAndDe<T> = (Option<Spanned<T>>, Option<Spanned<T>>);
+
+fn get_ser_and_de<T, F>(
+    cx: &ExtCtxt,
+    attribute: &'static str,
+    items: &[P<ast::MetaItem>],
+    f: F
+) -> Result<SerAndDe<T>, ()>
+    where F: Fn(&ExtCtxt, &str, &ast::Lit) -> Result<T, ()>,
+{
+    let mut ser_item = Attr::none(cx, attribute);
+    let mut de_item = Attr::none(cx, attribute);
+
+    for item in items {
+        match item.node {
+            ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize" => {
+                if let Ok(v) = f(cx, name, lit) {
+                    ser_item.set(item.span, v);
+                }
+            }
+
+            ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize" => {
+                if let Ok(v) = f(cx, name, lit) {
+                    de_item.set(item.span, v);
+                }
+            }
+
+            _ => {
+                cx.span_err(
+                    item.span,
+                    &format!("unknown {} attribute `{}`",
+                             attribute,
+                             meta_item_to_string(item)));
+
+                return Err(());
+            }
+        }
+    }
+
+    Ok((ser_item.get_spanned(), de_item.get_spanned()))
+}
+
+fn get_renames(
+    cx: &ExtCtxt,
+    items: &[P<ast::MetaItem>],
+) -> Result<SerAndDe<InternedString>, ()> {
+    get_ser_and_de(cx, "rename", items, get_str_from_lit)
+}
+
+fn get_where_predicates(
+    cx: &ExtCtxt,
+    items: &[P<ast::MetaItem>],
+) -> Result<SerAndDe<Vec<ast::WherePredicate>>, ()> {
+    get_ser_and_de(cx, "bound", items, parse_lit_into_where)
+}
+
+pub fn get_serde_meta_items(attr: &ast::Attribute) -> Option<&[P<ast::MetaItem>]> {
+    match attr.node.value.node {
+        ast::MetaItemKind::List(ref name, ref items) if name == &"serde" => {
+            attr::mark_used(attr);
+            Some(items)
+        }
+        _ => None
+    }
+}
+
+/// This syntax folder rewrites tokens to say their spans are coming from a macro context.
+struct Respanner<'a, 'b: 'a> {
+    cx: &'a ExtCtxt<'b>,
+}
+
+impl<'a, 'b> Folder for Respanner<'a, 'b> {
+    fn fold_tt(&mut self, tt: &TokenTree) -> TokenTree {
+        match *tt {
+            TokenTree::Token(span, ref tok) => {
+                TokenTree::Token(
+                    self.new_span(span),
+                    self.fold_token(tok.clone())
+                )
+            }
+            TokenTree::Delimited(span, ref delimed) => {
+                TokenTree::Delimited(
+                    self.new_span(span),
+                    Rc::new(tokenstream::Delimited {
+                        delim: delimed.delim,
+                        open_span: delimed.open_span,
+                        tts: self.fold_tts(&delimed.tts),
+                        close_span: delimed.close_span,
+                    })
+                )
+            }
+            TokenTree::Sequence(span, ref seq) => {
+                TokenTree::Sequence(
+                    self.new_span(span),
+                    Rc::new(tokenstream::SequenceRepetition {
+                        tts: self.fold_tts(&seq.tts),
+                        separator: seq.separator.clone().map(|tok| self.fold_token(tok)),
+                        ..**seq
+                    })
+                )
+            }
+        }
+    }
+
+    fn new_span(&mut self, span: Span) -> Span {
+        Span {
+            lo: span.lo,
+            hi: span.hi,
+            expn_id: self.cx.backtrace(),
+        }
+    }
+}
+
+fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<InternedString, ()> {
+    match lit.node {
+        ast::LitKind::Str(ref s, _) => Ok(s.clone()),
+        _ => {
+            cx.span_err(
+                lit.span,
+                &format!("serde annotation `{}` must be a string, not `{}`",
+                         name,
+                         lit_to_string(lit)));
+
+            Err(())
+        }
+    }
+}
+
+// If we just parse a string literal from an attibute, any syntax errors in the
+// source will only have spans that point inside the string and not back to the
+// attribute. So to have better error reporting, we'll first parse the string
+// into a token tree. Then we'll update those spans to say they're coming from a
+// macro context that originally came from the attribnute, and then finally
+// parse them into an expression or where-clause.
+fn parse_string_via_tts<T, F>(cx: &ExtCtxt, name: &str, string: String, action: F) -> Result<T, ()>
+    where F: for<'a> Fn(&'a mut Parser) -> parse::PResult<'a, T>,
+{
+    let tts = panictry!(parse::parse_tts_from_source_str(
+        format!("<serde {} expansion>", name),
+        string,
+        cx.cfg(),
+        cx.parse_sess()));
+
+    // Respan the spans to say they are all coming from this macro.
+    let tts = Respanner { cx: cx }.fold_tts(&tts);
+
+    let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts);
+
+    let path = match action(&mut parser) {
+        Ok(path) => path,
+        Err(mut e) => {
+            e.emit();
+            return Err(());
+        }
+    };
+
+    // Make sure to error out if there are trailing characters in the stream.
+    match parser.expect(&token::Eof) {
+        Ok(()) => { }
+        Err(mut e) => {
+            e.emit();
+            return Err(());
+        }
+    }
+
+    Ok(path)
+}
+
+fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::Path, ()> {
+    let string = try!(get_str_from_lit(cx, name, lit)).to_string();
+
+    parse_string_via_tts(cx, name, string, |parser| {
+        parser.parse_path(PathStyle::Type)
+    })
+}
+
+fn parse_lit_into_where(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<Vec<ast::WherePredicate>, ()> {
+    let string = try!(get_str_from_lit(cx, name, lit));
+    if string.is_empty() {
+        return Ok(Vec::new());
+    }
+
+    let where_string = format!("where {}", string);
+
+    parse_string_via_tts(cx, name, where_string, |parser| {
+        let where_clause = try!(parser.parse_where_clause());
+        Ok(where_clause.predicates)
+    })
+}

serde_codegen_internals/src/error.rs

@@ -0,0 +1,19 @@
+use std::error;
+use std::fmt;
+
+#[derive(Debug)]
+pub enum Error {
+    UnexpectedItemKind,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "expected a struct or enum")
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "expected a struct or enum"
+    }
+}

serde_codegen_internals/src/lib.rs

@@ -0,0 +1,21 @@
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
+
+#[cfg(feature = "with-syntex")]
+#[macro_use]
+extern crate syntex_syntax as syntax;
+#[cfg(feature = "with-syntex")]
+extern crate syntex_errors as errors;
+
+#[cfg(not(feature = "with-syntex"))]
+#[macro_use]
+extern crate syntax;
+#[cfg(not(feature = "with-syntex"))]
+extern crate rustc_errors as errors;
+
+pub mod ast;
+pub mod attr;
+
+mod error;
+pub use error::Error;

serde_macros/.cargo/config

@@ -0,0 +1,2 @@
+# To prevent compiletest from seeing two versions of serde
+paths = ["../serde"]

serde_macros/Cargo.toml

@@ -1,21 +1,53 @@
 [package]
 name = "serde_macros"
-version = "0.6.5"
+version = "0.8.3"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://github.com/serde-rs/serde"
+documentation = "https://serde.rs/codegen.html"
 keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "src/**/*.rs", "build.rs"]
+build = "build.rs"
 
 [lib]
 name = "serde_macros"
 plugin = true
 
+[features]
+unstable-testing = [
+    "clippy",
+    "skeptic",
+    "serde_json",
+    "serde/unstable-testing",
+    "serde_codegen/unstable-testing"
+]
+
+[build-dependencies]
+skeptic = { version = "^0.6.0", optional = true }
+
 [dependencies]
-serde_codegen = { version = "*", path = "../serde_codegen", default-features = false, features = ["nightly"] }
+clippy = { version = "^0.*", optional = true }
+serde_codegen = { version = "=0.8.3", default-features = false, features = ["unstable"], path = "../serde_codegen" }
+skeptic = { version = "^0.6.0", optional = true }
+serde_json = { version = "0.8.0", optional = true }
 
 [dev-dependencies]
-num = "^0.1.27"
+compiletest_rs = "^0.2.0"
+fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = { version = "*", path = "../serde", features = ["nightly"] }
+serde = { version = "0.8.3", path = "../serde" }
+serde_test = { version = "0.8.3", path = "../serde_test" }
+
+[[test]]
+name = "test"
+path = "tests/test.rs"
+
+[[test]]
+name = "skeptic"
+path = "tests/skeptic.rs"
+
+[[bench]]
+name = "bench"
+path = "benches/bench.rs"

serde_macros/benches/bench.rs

@@ -1,9 +1,9 @@
 #![feature(custom_attribute, custom_derive, plugin, test)]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
 #![plugin(serde_macros)]
 
-extern crate num;
 extern crate rustc_serialize;
 extern crate serde;
 extern crate test;
 
-include!("../../serde_tests/benches/bench.rs.in");
+include!("../../testing/benches/bench.rs.in");

serde_macros/build.rs

@@ -0,0 +1,18 @@
+#[cfg(feature = "unstable-testing")]
+mod inner {
+    extern crate skeptic;
+
+    pub fn main() {
+        println!("cargo:rerun-if-changed=../README.md");
+        skeptic::generate_doc_tests(&["../README.md"]);
+    }
+}
+
+#[cfg(not(feature = "unstable-testing"))]
+mod inner {
+    pub fn main() {}
+}
+
+fn main() {
+    inner::main()
+}

serde_macros/src/lib.rs

@@ -1,4 +1,6 @@
 #![feature(plugin_registrar, rustc_private)]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
 
 extern crate serde_codegen;
 extern crate rustc_plugin;

serde_macros/tests/compile-fail/duplicate_attributes.rs

@@ -0,0 +1,32 @@
+#![feature(custom_attribute, custom_derive, plugin)]
+#![plugin(serde_macros)]
+
+#[derive(Serialize)]
+struct S {
+    #[serde(rename(serialize="x"))]
+    #[serde(rename(serialize="y"))] //~ ERROR: duplicate serde attribute `rename`
+    a: (),
+
+    #[serde(rename(serialize="x"))]
+    #[serde(rename="y")] //~ ERROR: duplicate serde attribute `rename`
+    b: (),
+
+    #[serde(rename(serialize="x"))]
+    #[serde(rename(deserialize="y"))] // ok
+    c: (),
+
+    #[serde(rename="x")]
+    #[serde(rename(deserialize="y"))] //~ ERROR: duplicate serde attribute `rename`
+    d: (),
+
+    #[serde(rename(serialize="x", serialize="y"))] //~ ERROR: duplicate serde attribute `rename`
+    e: (),
+
+    #[serde(rename="x", serialize="y")] //~ ERROR: unknown serde field attribute `serialize = "y"`
+    f: (),
+
+    #[serde(rename(serialize="x"), rename(serialize="y"))] //~ ERROR: duplicate serde attribute `rename`
+    g: (),
+}
+
+fn main() {}

serde_macros/tests/compile-fail/reject-unknown-attributes.rs

@@ -0,0 +1,30 @@
+#![feature(custom_attribute, custom_derive, plugin)]
+#![plugin(serde_macros)]
+
+extern crate serde;
+
+#[derive(Serialize)]
+#[serde(abc="xyz")] //~ unknown serde container attribute `abc = "xyz"`
+struct Foo {
+    x: u32,
+}
+
+#[derive(Deserialize)]
+#[serde(abc="xyz")] //~ unknown serde container attribute `abc = "xyz"`
+struct Foo {
+    x: u32,
+}
+
+#[derive(Serialize)]
+struct Foo {
+    #[serde(abc="xyz")] //~ unknown serde field attribute `abc = "xyz"`
+    x: u32,
+}
+
+#[derive(Deserialize)]
+struct Foo {
+    #[serde(abc="xyz")] //~ unknown serde field attribute `abc = "xyz"`
+    x: u32,
+}
+
+fn main() { }

serde_macros/tests/compile-fail/str_ref_deser.rs

@@ -0,0 +1,9 @@
+#![feature(custom_attribute, custom_derive, plugin)]
+#![plugin(serde_macros)]
+
+#[derive(Serialize, Deserialize)]
+struct Test<'a> {
+    s: &'a str, //~ ERROR: Serde does not support deserializing fields of type &str
+}
+
+fn main() {}

serde_macros/tests/compile_tests.rs

@@ -0,0 +1,30 @@
+extern crate compiletest_rs as compiletest;
+
+use std::path::PathBuf;
+use std::env::var;
+
+fn run_mode(mode: &'static str) {
+    let mut config = compiletest::default_config();
+
+    let cfg_mode = mode.parse().ok().expect("Invalid mode");
+
+    config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned());
+    if let Ok(name) = var::<&str>("TESTNAME") {
+        let s : String = name.to_owned();
+        config.filter = Some(s)
+    }
+    config.mode = cfg_mode;
+    config.src_base = PathBuf::from(format!("tests/{}", mode));
+
+    compiletest::run_tests(&config);
+}
+
+#[test]
+fn compile_fail() {
+    run_mode("compile-fail");
+}
+
+#[test]
+fn run_pass() {
+    run_mode("run-pass");
+}

serde_macros/tests/run-pass/identity-op.rs

@@ -0,0 +1,12 @@
+#![feature(custom_derive, plugin)]
+#![plugin(serde_macros, clippy)]
+
+#![deny(identity_op)]
+
+// The derived implementation uses 0+1 to add up the number of fields
+// serialized, which Clippy warns about. If the expansion info is registered
+// correctly, the Clippy lint is not triggered.
+#[derive(Serialize)]
+struct A { b: u8 }
+
+fn main() {}

serde_macros/tests/skeptic.rs

@@ -0,0 +1,3 @@
+#![cfg(feature = "unstable-testing")]
+
+include!(concat!(env!("OUT_DIR"), "/skeptic-tests.rs"));

serde_macros/tests/test.rs

@@ -1,7 +1,9 @@
 #![feature(test, custom_attribute, custom_derive, plugin)]
 #![plugin(serde_macros)]
 
-extern crate serde;
 extern crate test;
 
-include!("../../serde_tests/tests/test.rs.in");
+include!("../../testing/tests/test.rs.in");
+
+mod compile_tests;
+mod skeptic;

serde_test/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "serde_test"
+version = "0.8.3"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "Token De/Serializer for testing De/Serialize implementations"
+homepage = "https://serde.rs"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://docs.serde.rs/serde_test/"
+readme = "../README.md"
+keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "src/**/*.rs"]
+
+[dependencies]
+serde = { version = "0.8.3", path = "../serde" }

serde_test/src/assert.rs

@@ -0,0 +1,54 @@
+use serde::{Serialize, Deserialize};
+
+use de::Deserializer;
+use error::Error;
+use ser::Serializer;
+use token::Token;
+
+use std::fmt::Debug;
+
+pub fn assert_tokens<T>(value: &T, tokens: &[Token<'static>])
+    where T: Serialize + Deserialize + PartialEq + Debug,
+{
+    assert_ser_tokens(value, tokens);
+    assert_de_tokens(value, tokens);
+}
+
+pub fn assert_ser_tokens<T>(value: &T, tokens: &[Token])
+    where T: Serialize,
+{
+    let mut ser = Serializer::new(tokens.iter());
+    assert_eq!(Serialize::serialize(value, &mut ser), Ok(()));
+    assert_eq!(ser.next_token(), None);
+}
+
+/// Expect an error serializing `T`.
+pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: Error)
+    where T: Serialize + PartialEq + Debug,
+{
+    let mut ser = Serializer::new(tokens.iter());
+    let v: Result<(), Error> = Serialize::serialize(value, &mut ser);
+    assert_eq!(v.as_ref(), Err(&error));
+    assert_eq!(ser.next_token(), None);
+}
+
+pub fn assert_de_tokens<T>(value: &T, tokens: &[Token<'static>])
+    where T: Deserialize + PartialEq + Debug,
+{
+    let mut de = Deserializer::new(tokens.to_vec().into_iter());
+    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
+    assert_eq!(v.as_ref(), Ok(value));
+    assert_eq!(de.next_token(), None);
+}
+
+/// Expect an error deserializing tokens into a `T`.
+pub fn assert_de_tokens_error<T>(tokens: &[Token<'static>], error: Error)
+    where T: Deserialize + PartialEq + Debug,
+{
+    let mut de = Deserializer::new(tokens.to_vec().into_iter());
+    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
+    assert_eq!(v, Err(error));
+    // There may be one token left if a peek caused the error
+    de.next_token();
+    assert_eq!(de.next_token(), None);
+}

serde_test/src/de.rs

@@ -0,0 +1,946 @@
+use std::iter;
+
+use serde::de::{
+    self,
+    Deserialize,
+    EnumVisitor,
+    MapVisitor,
+    SeqVisitor,
+    VariantVisitor,
+    Visitor,
+};
+
+use error::Error;
+use token::Token;
+
+pub struct Deserializer<I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    tokens: iter::Peekable<I>,
+}
+
+impl<I> Deserializer<I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    pub fn new(tokens: I) -> Deserializer<I> {
+        Deserializer {
+            tokens: tokens.peekable(),
+        }
+    }
+
+    pub fn next_token(&mut self) -> Option<Token<'static>> {
+        self.tokens.next()
+    }
+
+    fn visit_seq<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_seq(DeserializerSeqVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_array<V>(&mut self, len: usize, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_seq(DeserializerArrayVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_tuple<V>(&mut self, len: usize, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_seq(DeserializerTupleVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_tuple_struct<V>(&mut self, len: usize, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_seq(DeserializerTupleStructVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_variant_seq<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_seq(DeserializerVariantSeqVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_map<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_map(DeserializerMapVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_struct<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_map(DeserializerStructVisitor {
+            de: self,
+            len: len,
+        })
+    }
+
+    fn visit_variant_map<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        visitor.visit_map(DeserializerVariantMapVisitor {
+            de: self,
+            len: len,
+        })
+    }
+}
+
+impl<I> de::Deserializer for Deserializer<I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn deserialize_seq<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_struct_field<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_map<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_unit<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_bytes<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_ignored_any<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_string<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_str<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_char<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_bool<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_usize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_isize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.next() {
+            Some(Token::Bool(v)) => visitor.visit_bool(v),
+            Some(Token::Isize(v)) => visitor.visit_isize(v),
+            Some(Token::I8(v)) => visitor.visit_i8(v),
+            Some(Token::I16(v)) => visitor.visit_i16(v),
+            Some(Token::I32(v)) => visitor.visit_i32(v),
+            Some(Token::I64(v)) => visitor.visit_i64(v),
+            Some(Token::Usize(v)) => visitor.visit_usize(v),
+            Some(Token::U8(v)) => visitor.visit_u8(v),
+            Some(Token::U16(v)) => visitor.visit_u16(v),
+            Some(Token::U32(v)) => visitor.visit_u32(v),
+            Some(Token::U64(v)) => visitor.visit_u64(v),
+            Some(Token::F32(v)) => visitor.visit_f32(v),
+            Some(Token::F64(v)) => visitor.visit_f64(v),
+            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(),
+            Some(Token::UnitStruct(name)) => visitor.visit_unit_struct(name),
+            Some(Token::SeqStart(len)) => {
+                self.visit_seq(len, visitor)
+            }
+            Some(Token::SeqArrayStart(len))| Some(Token::TupleStructStart(_, len)) => {
+                self.visit_seq(Some(len), visitor)
+            }
+            Some(Token::MapStart(len)) => {
+                self.visit_map(len, visitor)
+            }
+            Some(Token::StructStart(_, len)) => {
+                self.visit_map(Some(len), visitor)
+            }
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    /// Hook into `Option` deserializing so we can treat `Unit` as a
+    /// `None`, or a regular value as `Some(value)`.
+    fn deserialize_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::Option(false)) => {
+                self.tokens.next();
+                visitor.visit_none()
+            }
+            Some(&Token::Option(true)) => {
+                self.tokens.next();
+                visitor.visit_some(self)
+            }
+            Some(&Token::Unit) => {
+                self.tokens.next();
+                visitor.visit_none()
+            }
+            Some(_) => visitor.visit_some(self),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn deserialize_enum<V>(&mut self,
+                     name: &str,
+                     _variants: &'static [&'static str],
+                     mut visitor: V) -> Result<V::Value, Error>
+        where V: EnumVisitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::EnumStart(n)) if name == n => {
+                self.tokens.next();
+
+                visitor.visit(DeserializerVariantVisitor {
+                    de: self,
+                })
+            }
+            Some(&Token::EnumUnit(n, _))
+            | Some(&Token::EnumNewType(n, _))
+            | Some(&Token::EnumSeqStart(n, _, _))
+            | Some(&Token::EnumMapStart(n, _, _)) if name == n => {
+                visitor.visit(DeserializerVariantVisitor {
+                    de: self,
+                })
+            }
+            Some(_) => {
+                let token = self.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => { return Err(Error::EndOfStream); }
+        }
+    }
+
+    fn deserialize_unit_struct<V>(&mut self, name: &str, mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::UnitStruct(n)) => {
+                self.tokens.next();
+                if name == n {
+                    visitor.visit_unit()
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn deserialize_newtype_struct<V>(&mut self,
+                                     name: &str,
+                                     mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::StructNewType(n)) => {
+                self.tokens.next();
+                if name == n {
+                    visitor.visit_newtype_struct(self)
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn deserialize_seq_fixed_size<V>(&mut self,
+                                       len: usize,
+                                       visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::SeqArrayStart(_)) => {
+                self.tokens.next();
+                self.visit_array(len, visitor)
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn deserialize_tuple<V>(&mut self,
+                            len: usize,
+                            mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::Unit) => {
+                self.tokens.next();
+                visitor.visit_unit()
+            }
+            Some(&Token::UnitStruct(_)) => {
+                self.tokens.next();
+                visitor.visit_unit()
+            }
+            Some(&Token::SeqStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), visitor)
+            }
+            Some(&Token::SeqArrayStart(_)) => {
+                self.tokens.next();
+                self.visit_array(len, visitor)
+            }
+            Some(&Token::TupleStart(_)) => {
+                self.tokens.next();
+                self.visit_tuple(len, visitor)
+            }
+            Some(&Token::TupleStructStart(_, _)) => {
+                self.tokens.next();
+                self.visit_tuple_struct(len, visitor)
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn deserialize_tuple_struct<V>(&mut self,
+                                   name: &str,
+                                   len: usize,
+                                   mut visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::Unit) => {
+                self.tokens.next();
+                visitor.visit_unit()
+            }
+            Some(&Token::UnitStruct(n)) => {
+                self.tokens.next();
+                if name == n {
+                    visitor.visit_unit()
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(&Token::SeqStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), visitor)
+            }
+            Some(&Token::SeqArrayStart(_)) => {
+                self.tokens.next();
+                self.visit_array(len, visitor)
+            }
+            Some(&Token::TupleStart(_)) => {
+                self.tokens.next();
+                self.visit_tuple(len, visitor)
+            }
+            Some(&Token::TupleStructStart(n, _)) => {
+                self.tokens.next();
+                if name == n {
+                    self.visit_tuple_struct(len, visitor)
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn deserialize_struct<V>(&mut self,
+                             name: &str,
+                             fields: &'static [&'static str],
+                             visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.tokens.peek() {
+            Some(&Token::StructStart(n, _)) => {
+                self.tokens.next();
+                if name == n {
+                    self.visit_struct(Some(fields.len()), visitor)
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(&Token::MapStart(_)) => {
+                self.tokens.next();
+                self.visit_map(Some(fields.len()), visitor)
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfStream),
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerSeqVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: Option<usize>,
+}
+
+impl<'a, I> SeqVisitor for DeserializerSeqVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Error>
+        where T: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::SeqSep) => {
+                self.de.tokens.next();
+                self.len = self.len.map(|len| len - 1);
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::SeqEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        //assert_eq!(self.len.unwrap_or(0), 0);
+        match self.de.tokens.next() {
+            Some(Token::SeqEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len.unwrap_or(0);
+        (len, self.len)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerArrayVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: usize,
+}
+
+impl<'a, I> SeqVisitor for DeserializerArrayVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Error>
+        where T: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::SeqSep) => {
+                self.de.tokens.next();
+                self.len -= 1;
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::SeqEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        assert_eq!(self.len, 0);
+        match self.de.tokens.next() {
+            Some(Token::SeqEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerTupleVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: usize,
+}
+
+impl<'a, I> SeqVisitor for DeserializerTupleVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Error>
+        where T: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::TupleSep) => {
+                self.de.tokens.next();
+                self.len -= 1;
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::TupleEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        assert_eq!(self.len, 0);
+        match self.de.tokens.next() {
+            Some(Token::TupleEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerTupleStructVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: usize,
+}
+
+impl<'a, I> SeqVisitor for DeserializerTupleStructVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Error>
+        where T: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::TupleStructSep) => {
+                self.de.tokens.next();
+                self.len -= 1;
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::TupleStructEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        assert_eq!(self.len, 0);
+        match self.de.tokens.next() {
+            Some(Token::TupleStructEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.len, Some(self.len))
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerVariantSeqVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: Option<usize>,
+}
+
+impl<'a, I> SeqVisitor for DeserializerVariantSeqVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Error>
+        where T: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumSeqSep) => {
+                self.de.tokens.next();
+                self.len = self.len.map(|len| len - 1);
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::EnumSeqEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        //assert_eq!(self.len.unwrap_or(0), 0);
+        match self.de.tokens.next() {
+            Some(Token::EnumSeqEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len.unwrap_or(0);
+        (len, self.len)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerMapVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: Option<usize>,
+}
+
+impl<'a, I> MapVisitor for DeserializerMapVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
+        where K: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::MapSep) => {
+                self.de.tokens.next();
+                self.len = self.len.map(|len| if len > 0 { len - 1} else { 0 });
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::MapEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_value<V>(&mut self) -> Result<V, Error>
+        where V: Deserialize,
+    {
+        Ok(try!(Deserialize::deserialize(self.de)))
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        //assert_eq!(self.len.unwrap_or(0), 0);
+        match self.de.tokens.next() {
+            Some(Token::MapEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len.unwrap_or(0);
+        (len, self.len)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerStructVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: Option<usize>,
+}
+
+impl<'a, I> MapVisitor for DeserializerStructVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
+        where K: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::StructSep) => {
+                self.de.tokens.next();
+                self.len = self.len.map(|len| if len > 0 { len - 1} else { 0 });
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::StructEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_value<V>(&mut self) -> Result<V, Error>
+        where V: Deserialize,
+    {
+        Ok(try!(Deserialize::deserialize(self.de)))
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        //assert_eq!(self.len.unwrap_or(0), 0);
+        match self.de.tokens.next() {
+            Some(Token::StructEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len.unwrap_or(0);
+        (len, self.len)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerVariantVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+}
+
+impl<'a, I> VariantVisitor for DeserializerVariantVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit_variant<V>(&mut self) -> Result<V, Error>
+        where V: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumUnit(_, v))
+            | Some(&Token::EnumNewType(_, v))
+            | Some(&Token::EnumSeqStart(_, v, _))
+            | Some(&Token::EnumMapStart(_, v, _)) => {
+                let mut de = de::value::ValueDeserializer::<Error>::into_deserializer(v);
+                let value = try!(Deserialize::deserialize(&mut de));
+                Ok(value)
+            }
+            Some(_) => {
+                Deserialize::deserialize(self.de)
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_unit(&mut self) -> Result<(), Error> {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumUnit(_, _)) => {
+                self.de.tokens.next();
+                Ok(())
+            }
+            Some(_) => {
+                Deserialize::deserialize(self.de)
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
+        where T: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumNewType(_, _)) => {
+                self.de.tokens.next();
+                Deserialize::deserialize(self.de)
+            }
+            Some(_) => {
+                Deserialize::deserialize(self.de)
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_tuple<V>(&mut self,
+                      len: usize,
+                      visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumSeqStart(_, _, enum_len)) => {
+                let token = self.de.tokens.next().unwrap();
+
+                if len == enum_len {
+                    self.de.visit_variant_seq(Some(len), visitor)
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            Some(&Token::SeqStart(Some(enum_len))) => {
+                let token = self.de.tokens.next().unwrap();
+
+                if len == enum_len {
+                    self.de.visit_seq(Some(len), visitor)
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            Some(_) => {
+                Deserialize::deserialize(self.de)
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_struct<V>(&mut self,
+                       fields: &'static [&'static str],
+                       visitor: V) -> Result<V::Value, Error>
+        where V: Visitor,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumMapStart(_, _, enum_len)) => {
+                let token = self.de.tokens.next().unwrap();
+
+                if fields.len() == enum_len {
+                    self.de.visit_variant_map(Some(fields.len()), visitor)
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            Some(&Token::MapStart(Some(enum_len))) => {
+                let token = self.de.tokens.next().unwrap();
+
+                if fields.len() == enum_len {
+                    self.de.visit_map(Some(fields.len()), visitor)
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            Some(_) => {
+                Deserialize::deserialize(self.de)
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerVariantMapVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
+    de: &'a mut Deserializer<I>,
+    len: Option<usize>,
+}
+
+impl<'a, I> MapVisitor for DeserializerVariantMapVisitor<'a, I>
+    where I: Iterator<Item=Token<'static>>,
+{
+    type Error = Error;
+
+    fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
+        where K: Deserialize,
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumMapSep) => {
+                self.de.tokens.next();
+                self.len = self.len.map(|len| if len > 0 { len - 1} else { 0 });
+                Ok(Some(try!(Deserialize::deserialize(self.de))))
+            }
+            Some(&Token::EnumMapEnd) => Ok(None),
+            Some(_) => {
+                let token = self.de.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn visit_value<V>(&mut self) -> Result<V, Error>
+        where V: Deserialize,
+    {
+        Ok(try!(Deserialize::deserialize(self.de)))
+    }
+
+    fn end(&mut self) -> Result<(), Error> {
+        //assert_eq!(self.len.unwrap_or(0), 0);
+        match self.de.tokens.next() {
+            Some(Token::EnumMapEnd) => Ok(()),
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfStream),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len.unwrap_or(0);
+        (len, self.len)
+    }
+}

serde_test/src/error.rs

@@ -0,0 +1,87 @@
+use std::{error, fmt};
+
+use serde::{ser, de};
+
+use token::Token;
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum Error {
+    // Shared
+    Custom(String),
+    InvalidValue(String),
+
+    // De
+    EndOfStream,
+    InvalidType(de::Type),
+    InvalidLength(usize),
+    UnknownVariant(String),
+    UnknownField(String),
+    MissingField(&'static str),
+    DuplicateField(&'static str),
+    InvalidName(&'static str),
+    UnexpectedToken(Token<'static>),
+}
+
+impl ser::Error for Error {
+    fn custom<T: Into<String>>(msg: T) -> Error {
+        Error::Custom(msg.into())
+    }
+
+    fn invalid_value(msg: &str) -> Error {
+        Error::InvalidValue(msg.to_owned())
+    }
+}
+
+impl de::Error for Error {
+    fn custom<T: Into<String>>(msg: T) -> Error {
+        Error::Custom(msg.into())
+    }
+
+    fn end_of_stream() -> Error {
+        Error::EndOfStream
+    }
+
+    fn invalid_type(ty: de::Type) -> Error {
+        Error::InvalidType(ty)
+    }
+
+    fn invalid_value(msg: &str) -> Error {
+        Error::InvalidValue(msg.to_owned())
+    }
+
+    fn invalid_length(len: usize) -> Error {
+        Error::InvalidLength(len)
+    }
+
+    fn unknown_variant(variant: &str) -> Error {
+        Error::UnknownVariant(variant.to_owned())
+    }
+
+    fn unknown_field(field: &str) -> Error {
+        Error::UnknownField(field.to_owned())
+    }
+
+    fn missing_field(field: &'static str) -> Error {
+        Error::MissingField(field)
+    }
+
+    fn duplicate_field(field: &'static str) -> Error {
+        Error::DuplicateField(field)
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(format!("{:?}", self).as_ref())
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}

serde_test/src/lib.rs

@@ -0,0 +1,22 @@
+extern crate serde;
+
+mod assert;
+pub use assert::{
+    assert_tokens,
+    assert_ser_tokens,
+    assert_ser_tokens_error,
+    assert_de_tokens,
+    assert_de_tokens_error,
+};
+
+mod ser;
+pub use ser::Serializer;
+
+mod de;
+pub use de::Deserializer;
+
+mod token;
+pub use token::Token;
+
+mod error;
+pub use error::Error;

serde_test/src/ser.rs

@@ -0,0 +1,323 @@
+use std::marker::PhantomData;
+
+use serde::ser::{
+    self,
+    Serialize,
+};
+
+use error::Error;
+use token::Token;
+
+pub struct Serializer<'a, I>
+    where I: Iterator<Item=&'a Token<'a>>,
+{
+    tokens: I,
+    phantom: PhantomData<&'a Token<'a>>,
+}
+
+impl<'a, I> Serializer<'a, I>
+    where I: Iterator<Item=&'a Token<'a>>,
+{
+    pub fn new(tokens: I) -> Serializer<'a, I> {
+        Serializer {
+            tokens: tokens,
+            phantom: PhantomData,
+        }
+    }
+
+    pub fn next_token(&mut self) -> Option<&'a Token<'a>> {
+        self.tokens.next()
+    }
+}
+
+impl<'a, I> ser::Serializer for Serializer<'a, I>
+    where I: Iterator<Item=&'a Token<'a>>,
+{
+    type Error = Error;
+    type MapState = ();
+    type SeqState = ();
+    type TupleState = ();
+    type TupleStructState = ();
+    type TupleVariantState = ();
+    type StructState = ();
+    type StructVariantState = ();
+
+    fn serialize_unit(&mut self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Unit));
+        Ok(())
+    }
+
+    fn serialize_newtype_variant<T>(&mut self,
+                                name: &str,
+                                _variant_index: usize,
+                                variant: &str,
+                                value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumNewType(name, variant)));
+        value.serialize(self)
+    }
+
+    fn serialize_unit_struct(&mut self, name: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::UnitStruct(name)));
+        Ok(())
+    }
+
+    fn serialize_unit_variant(&mut self,
+                          name: &str,
+                          _variant_index: usize,
+                          variant: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumUnit(name, variant)));
+
+        Ok(())
+    }
+
+    fn serialize_bool(&mut self, v: bool) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Bool(v)));
+        Ok(())
+    }
+
+    fn serialize_isize(&mut self, v: isize) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Isize(v)));
+        Ok(())
+    }
+
+    fn serialize_i8(&mut self, v: i8) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I8(v)));
+        Ok(())
+    }
+
+    fn serialize_i16(&mut self, v: i16) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I16(v)));
+        Ok(())
+    }
+
+    fn serialize_i32(&mut self, v: i32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I32(v)));
+        Ok(())
+    }
+
+    fn serialize_i64(&mut self, v: i64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I64(v)));
+        Ok(())
+    }
+
+    fn serialize_usize(&mut self, v: usize) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Usize(v)));
+        Ok(())
+    }
+
+    fn serialize_u8(&mut self, v: u8) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U8(v)));
+        Ok(())
+    }
+
+    fn serialize_u16(&mut self, v: u16) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U16(v)));
+        Ok(())
+    }
+
+    fn serialize_u32(&mut self, v: u32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U32(v)));
+        Ok(())
+    }
+
+    fn serialize_u64(&mut self, v: u64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U64(v)));
+        Ok(())
+    }
+
+    fn serialize_f32(&mut self, v: f32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::F32(v)));
+        Ok(())
+    }
+
+    fn serialize_f64(&mut self, v: f64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::F64(v)));
+        Ok(())
+    }
+
+    fn serialize_char(&mut self, v: char) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Char(v)));
+        Ok(())
+    }
+
+    fn serialize_str(&mut self, v: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Str(v)));
+        Ok(())
+    }
+
+    fn serialize_none(&mut self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Option(false)));
+        Ok(())
+    }
+
+    fn serialize_some<V>(&mut self, value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::Option(true)));
+        value.serialize(self)
+    }
+
+    fn serialize_seq<'b>(&'b mut self, len: Option<usize>) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqStart(len)));
+        Ok(())
+    }
+
+    fn serialize_seq_elt<T>(&mut self, _: &mut (), value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqSep));
+        value.serialize(self)
+    }
+
+    fn serialize_seq_end(&mut self, _: ()) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqEnd));
+        Ok(())
+    }
+
+    fn serialize_seq_fixed_size(&mut self, len: usize) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqArrayStart(len)));
+        Ok(())
+    }
+
+    fn serialize_tuple(&mut self, len: usize) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStart(len)));
+        Ok(())
+    }
+
+    fn serialize_tuple_elt<T>(&mut self, _: &mut (), value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleSep));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple_end(&mut self, _: ()) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleEnd));
+        Ok(())
+    }
+
+    fn serialize_newtype_struct<T>(&mut self,
+                                   name: &'static str,
+                                   value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::StructNewType(name)));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple_struct(&mut self, name: &'static str, len: usize) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructStart(name, len)));
+
+        Ok(())
+    }
+
+    fn serialize_tuple_struct_elt<T>(&mut self, _: &mut (), value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructSep));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple_struct_end(&mut self, _: ()) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructEnd));
+        Ok(())
+    }
+
+    fn serialize_tuple_variant(&mut self,
+                               name: &str,
+                               _variant_index: usize,
+                               variant: &str,
+                               len: usize) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqStart(name, variant, len)));
+
+        Ok(())
+    }
+
+    fn serialize_tuple_variant_elt<T>(&mut self, _: &mut (), value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqSep));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple_variant_end(&mut self, _: ()) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqEnd));
+        Ok(())
+    }
+
+    fn serialize_map(&mut self, len: Option<usize>) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::MapStart(len)));
+
+        Ok(())
+    }
+
+    fn serialize_map_key<T>(&mut self, _: &mut (), key: T) -> Result<(), Self::Error> where T: Serialize {
+        assert_eq!(self.tokens.next(), Some(&Token::MapSep));
+        key.serialize(self)
+    }
+
+    fn serialize_map_value<T>(&mut self, _: &mut (), value: T) -> Result<(), Self::Error> where T: Serialize {
+        value.serialize(self)
+    }
+
+    fn serialize_map_end(&mut self, _: ()) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::MapEnd));
+        Ok(())
+    }
+
+    fn serialize_struct(&mut self, name: &str, len: usize) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::StructStart(name, len)));
+
+        Ok(())
+    }
+
+    fn serialize_struct_elt<V>(&mut self, _: &mut (), key: &'static str, value: V) -> Result<(), Self::Error> where V: Serialize {
+        assert_eq!(self.tokens.next(), Some(&Token::StructSep));
+        try!(key.serialize(self));
+        value.serialize(self)
+    }
+
+    fn serialize_struct_end(&mut self, _: ()) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::StructEnd));
+        Ok(())
+    }
+
+    fn serialize_struct_variant(&mut self,
+                                name: &str,
+                                _variant_index: usize,
+                                variant: &str,
+                                len: usize) -> Result<(), Error>
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapStart(name, variant, len)));
+
+        Ok(())
+    }
+
+    fn serialize_struct_variant_elt<V>(&mut self, _: &mut (), key: &'static str, value: V) -> Result<(), Self::Error> where V: Serialize {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapSep));
+        try!(key.serialize(self));
+        value.serialize(self)
+    }
+
+    fn serialize_struct_variant_end(&mut self, _: ()) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapEnd));
+        Ok(())
+    }
+
+    fn serialize_bytes(&mut self, value: &[u8]) -> Result<(), Self::Error> {
+        let mut state = try!(self.serialize_seq(Some(value.len())));
+        for c in value {
+            try!(self.serialize_seq_elt(&mut state, c));
+        }
+        self.serialize_seq_end(state)
+    }
+}

serde_test/src/token.rs

@@ -0,0 +1,60 @@
+#[derive(Clone, PartialEq, Debug)]
+pub enum Token<'a> {
+    Bool(bool),
+    Isize(isize),
+    I8(i8),
+    I16(i16),
+    I32(i32),
+    I64(i64),
+    Usize(usize),
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    F32(f32),
+    F64(f64),
+    Char(char),
+    Str(&'a str),
+    String(String),
+    Bytes(&'a [u8]),
+
+    Option(bool),
+
+    Unit,
+    UnitStruct(&'a str),
+
+    StructNewType(&'a str),
+
+    EnumStart(&'a str),
+    EnumUnit(&'a str, &'a str),
+    EnumNewType(&'a str, &'a str),
+
+    SeqStart(Option<usize>),
+    SeqArrayStart(usize),
+    SeqSep,
+    SeqEnd,
+
+    TupleStart(usize),
+    TupleSep,
+    TupleEnd,
+
+    TupleStructStart(&'a str, usize),
+    TupleStructSep,
+    TupleStructEnd,
+
+    MapStart(Option<usize>),
+    MapSep,
+    MapEnd,
+
+    StructStart(&'a str, usize),
+    StructSep,
+    StructEnd,
+
+    EnumSeqStart(&'a str, &'a str, usize),
+    EnumSeqSep,
+    EnumSeqEnd,
+
+    EnumMapStart(&'a str, &'a str, usize),
+    EnumMapSep,
+    EnumMapEnd,
+}

serde_tests/tests/test.rs

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

serde_tests/tests/test_annotations.rs

@@ -1,343 +0,0 @@
-use std::default;
-
-use token::{Token, assert_tokens, assert_ser_tokens, assert_de_tokens};
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-struct Default {
-    a1: i32,
-    #[serde(default)]
-    a2: i32,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-struct Rename {
-    a1: i32,
-    #[serde(rename="a3")]
-    a2: i32,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-struct FormatRename {
-    a1: i32,
-    #[serde(rename(xml= "a4", token="a5"))]
-    a2: i32,
-}
-
-#[derive(Debug, PartialEq, Deserialize, Serialize)]
-enum SerEnum<A> {
-    Map {
-        a: i8,
-        #[serde(rename(xml= "c", token="d"))]
-        b: A,
-    },
-}
-
-#[derive(Debug, PartialEq, Deserialize, Serialize)]
-struct SkipSerializingFields<A: default::Default> {
-    a: i8,
-    #[serde(skip_serializing, default)]
-    b: A,
-}
-
-#[derive(Debug, PartialEq, Deserialize, Serialize)]
-struct SkipSerializingIfEmptyFields<A: default::Default> {
-    a: i8,
-    #[serde(skip_serializing_if_empty, default)]
-    b: Vec<A>,
-}
-
-#[derive(Debug, PartialEq, Deserialize, Serialize)]
-struct SkipSerializingIfNoneFields<A: default::Default> {
-    a: i8,
-    #[serde(skip_serializing_if_none, default)]
-    b: Option<A>,
-}
-
-#[test]
-fn test_default() {
-    assert_de_tokens(
-        &Default { a1: 1, a2: 2 },
-        vec![
-            Token::StructStart("Default", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a1"),
-            Token::I32(1),
-
-            Token::MapSep,
-            Token::Str("a2"),
-            Token::I32(2),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_de_tokens(
-        &Default { a1: 1, a2: 0 },
-        vec![
-            Token::StructStart("Default", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a1"),
-            Token::I32(1),
-
-            Token::MapEnd,
-        ]
-    );
-}
-
-#[test]
-fn test_rename() {
-    assert_tokens(
-        &Rename { a1: 1, a2: 2 },
-        vec![
-            Token::StructStart("Rename", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a1"),
-            Token::I32(1),
-
-            Token::MapSep,
-            Token::Str("a3"),
-            Token::I32(2),
-
-            Token::MapEnd,
-        ]
-    );
-}
-
-#[test]
-fn test_format_rename() {
-    assert_tokens(
-        &FormatRename { a1: 1, a2: 2 },
-        vec![
-            Token::StructStart("FormatRename", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a1"),
-            Token::I32(1),
-
-            Token::MapSep,
-            Token::Str("a5"),
-            Token::I32(2),
-
-            Token::MapEnd,
-        ]
-    );
-}
-
-#[test]
-fn test_enum_format_rename() {
-    assert_tokens(
-        &SerEnum::Map {
-            a: 0,
-            b: String::new(),
-        },
-        vec![
-            Token::EnumMapStart("SerEnum", "Map", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(0),
-
-            Token::MapSep,
-            Token::Str("d"),
-            Token::Str(""),
-
-            Token::MapEnd,
-        ]
-    );
-}
-
-#[test]
-fn test_skip_serializing_fields() {
-    assert_ser_tokens(
-        &SkipSerializingFields {
-            a: 1,
-            b: 2,
-        },
-        &[
-            Token::StructStart("SkipSerializingFields", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_de_tokens(
-        &SkipSerializingFields {
-            a: 1,
-            b: 0,
-        },
-        vec![
-            Token::StructStart("SkipSerializingFields", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapEnd,
-        ]
-    );
-}
-
-#[test]
-fn test_skip_serializing_fields_if_empty() {
-    assert_ser_tokens(
-        &SkipSerializingIfEmptyFields::<i32> {
-            a: 1,
-            b: vec![],
-        },
-        &[
-            Token::StructStart("SkipSerializingIfEmptyFields", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_de_tokens(
-        &SkipSerializingIfEmptyFields::<i32> {
-            a: 1,
-            b: vec![],
-        },
-        vec![
-            Token::StructStart("SkipSerializingIfEmptyFields", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_ser_tokens(
-        &SkipSerializingIfEmptyFields {
-            a: 1,
-            b: vec![2],
-        },
-        &[
-            Token::StructStart("SkipSerializingIfEmptyFields", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapSep,
-            Token::Str("b"),
-            Token::SeqStart(Some(1)),
-            Token::SeqSep,
-            Token::I32(2),
-            Token::SeqEnd,
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_de_tokens(
-        &SkipSerializingIfEmptyFields {
-            a: 1,
-            b: vec![2],
-        },
-        vec![
-            Token::StructStart("SkipSerializingIfEmptyFields", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapSep,
-            Token::Str("b"),
-            Token::SeqStart(Some(1)),
-            Token::SeqSep,
-            Token::I32(2),
-            Token::SeqEnd,
-
-            Token::MapEnd,
-        ]
-    );
-}
-
-#[test]
-fn test_skip_serializing_fields_if_none() {
-    assert_ser_tokens(
-        &SkipSerializingIfNoneFields::<i32> {
-            a: 1,
-            b: None,
-        },
-        &[
-            Token::StructStart("SkipSerializingIfNoneFields", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_de_tokens(
-        &SkipSerializingIfNoneFields::<i32> {
-            a: 1,
-            b: None,
-        },
-        vec![
-            Token::StructStart("SkipSerializingIfNoneFields", Some(1)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_ser_tokens(
-        &SkipSerializingIfNoneFields {
-            a: 1,
-            b: Some(2),
-        },
-        &[
-            Token::StructStart("SkipSerializingIfNoneFields", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapSep,
-            Token::Str("b"),
-            Token::Option(true),
-            Token::I32(2),
-
-            Token::MapEnd,
-        ]
-    );
-
-    assert_de_tokens(
-        &SkipSerializingIfNoneFields {
-            a: 1,
-            b: Some(2),
-        },
-        vec![
-            Token::StructStart("SkipSerializingIfNoneFields", Some(2)),
-
-            Token::MapSep,
-            Token::Str("a"),
-            Token::I8(1),
-
-            Token::MapSep,
-            Token::Str("b"),
-            Token::Option(true),
-            Token::I32(2),
-
-            Token::MapEnd,
-        ]
-    );
-}

serde_tests/tests/test_bytes.rs

@@ -1,166 +0,0 @@
-use serde;
-use serde::Serialize;
-use serde::bytes::{ByteBuf, Bytes};
-
-///////////////////////////////////////////////////////////////////////////////
-
-#[derive(Debug, PartialEq)]
-struct Error;
-
-impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error }
-
-    fn end_of_stream() -> Error { Error }
-
-    fn unknown_field(_field: &str) -> Error { Error }
-
-    fn missing_field(_field: &'static str) -> Error { Error }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct BytesSerializer {
-    bytes: Vec<u8>,
-}
-
-impl BytesSerializer {
-    fn new(bytes: Vec<u8>) -> Self {
-        BytesSerializer {
-            bytes: bytes,
-        }
-    }
-}
-
-impl serde::Serializer for BytesSerializer {
-    type Error = Error;
-
-    fn visit_unit(&mut self) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_bool(&mut self, _v: bool) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_i64(&mut self, _v: i64) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_u64(&mut self, _v: u64) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_f32(&mut self, _v: f32) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_f64(&mut self, _v: f64) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_char(&mut self, _v: char) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_str(&mut self, _v: &str) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_none(&mut self) -> Result<(), Error> {
-        Err(Error)
-    }
-
-    fn visit_some<V>(&mut self, _value: V) -> Result<(), Error>
-        where V: serde::Serialize,
-    {
-        Err(Error)
-    }
-
-    fn visit_seq<V>(&mut self, _visitor: V) -> Result<(), Error>
-        where V: serde::ser::SeqVisitor,
-    {
-        Err(Error)
-    }
-
-    fn visit_seq_elt<T>(&mut self, _value: T) -> Result<(), Error>
-        where T: serde::Serialize
-    {
-        Err(Error)
-    }
-
-    fn visit_map<V>(&mut self, _visitor: V) -> Result<(), Error>
-        where V: serde::ser::MapVisitor,
-    {
-        Err(Error)
-    }
-
-    fn visit_map_elt<K, V>(&mut self, _key: K, _value: V) -> Result<(), Error>
-        where K: serde::Serialize,
-              V: serde::Serialize,
-    {
-        Err(Error)
-    }
-
-    fn visit_bytes(&mut self, bytes: &[u8]) -> Result<(), Error> {
-        assert_eq!(self.bytes, bytes);
-        Ok(())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct BytesDeserializer {
-    bytes: Option<Vec<u8>>,
-}
-
-impl BytesDeserializer {
-    fn new(bytes: Vec<u8>) -> Self {
-        BytesDeserializer {
-            bytes: Some(bytes),
-        }
-    }
-}
-
-impl serde::Deserializer for BytesDeserializer {
-    type Error = Error;
-
-    fn visit<V>(&mut self, _visitor: V) -> Result<V::Value, Error>
-        where V: serde::de::Visitor,
-    {
-        Err(Error)
-    }
-
-    fn visit_bytes<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: serde::de::Visitor,
-    {
-        visitor.visit_byte_buf(self.bytes.take().unwrap())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#[test]
-fn test_bytes_ser_bytes() {
-    let buf = vec![];
-    let bytes = Bytes::from(&buf);
-    let mut ser = BytesSerializer::new(vec![]);
-    bytes.serialize(&mut ser).unwrap();
-
-    let buf = vec![1, 2, 3];
-    let bytes = Bytes::from(&buf);
-    let mut ser = BytesSerializer::new(vec![1, 2, 3]);
-    bytes.serialize(&mut ser).unwrap();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#[test]
-fn test_byte_buf_de_bytes() {
-    let mut de = BytesDeserializer::new(vec![]);
-    let bytes = serde::Deserialize::deserialize(&mut de);
-    assert_eq!(bytes, Ok(ByteBuf::new()));
-
-    let mut de = BytesDeserializer::new(vec![1, 2, 3]);
-    let bytes = serde::Deserialize::deserialize(&mut de);
-    assert_eq!(bytes, Ok(ByteBuf::from(vec![1, 2, 3])));
-}

serde_tests/tests/test_de.rs

@@ -1,558 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
-
-use serde::de::{Deserializer, Visitor};
-
-use token::{Token, assert_de_tokens};
-
-//////////////////////////////////////////////////////////////////////////
-
-#[derive(Copy, Clone, PartialEq, Debug, Deserialize)]
-struct UnitStruct;
-
-#[derive(PartialEq, Debug, Deserialize)]
-struct TupleStruct(i32, i32, i32);
-
-#[derive(PartialEq, Debug, Deserialize)]
-struct Struct {
-    a: i32,
-    b: i32,
-    c: i32,
-}
-
-#[derive(PartialEq, Debug, Deserialize)]
-enum Enum {
-    Unit,
-    Simple(i32),
-    Seq(i32, i32, i32),
-    Map { a: i32, b: i32, c: i32 }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-macro_rules! declare_test {
-    ($name:ident { $($value:expr => $tokens:expr,)+ }) => {
-        #[test]
-        fn $name() {
-            $(
-                assert_de_tokens(&$value, $tokens);
-            )+
-        }
-    }
-}
-
-macro_rules! declare_tests {
-    ($($name:ident { $($value:expr => $tokens:expr,)+ })+) => {
-        $(
-            declare_test!($name { $($value => $tokens,)+ });
-        )+
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-declare_tests! {
-    test_bool {
-        true => vec![Token::Bool(true)],
-        false => vec![Token::Bool(false)],
-    }
-    test_isize {
-        0isize => vec![Token::Isize(0)],
-        0isize => vec![Token::I8(0)],
-        0isize => vec![Token::I16(0)],
-        0isize => vec![Token::I32(0)],
-        0isize => vec![Token::I64(0)],
-        0isize => vec![Token::Usize(0)],
-        0isize => vec![Token::U8(0)],
-        0isize => vec![Token::U16(0)],
-        0isize => vec![Token::U32(0)],
-        0isize => vec![Token::U64(0)],
-        0isize => vec![Token::F32(0.)],
-        0isize => vec![Token::F64(0.)],
-    }
-    test_ints {
-        0isize => vec![Token::Isize(0)],
-        0i8 => vec![Token::I8(0)],
-        0i16 => vec![Token::I16(0)],
-        0i32 => vec![Token::I32(0)],
-        0i64 => vec![Token::I64(0)],
-    }
-    test_uints {
-        0usize => vec![Token::Usize(0)],
-        0u8 => vec![Token::U8(0)],
-        0u16 => vec![Token::U16(0)],
-        0u32 => vec![Token::U32(0)],
-        0u64 => vec![Token::U64(0)],
-    }
-    test_floats {
-        0f32 => vec![Token::F32(0.)],
-        0f64 => vec![Token::F64(0.)],
-    }
-    test_char {
-        'a' => vec![Token::Char('a')],
-        'a' => vec![Token::Str("a")],
-        'a' => vec![Token::String("a".to_string())],
-    }
-    test_string {
-        "abc".to_string() => vec![Token::Str("abc")],
-        "abc".to_string() => vec![Token::String("abc".to_string())],
-        "a".to_string() => vec![Token::Char('a')],
-    }
-    test_option {
-        None::<i32> => vec![Token::Unit],
-        None::<i32> => vec![Token::Option(false)],
-        Some(1) => vec![Token::I32(1)],
-        Some(1) => vec![
-            Token::Option(true),
-            Token::I32(1),
-        ],
-    }
-    test_result {
-        Ok::<i32, i32>(0) => vec![
-            Token::EnumStart("Result"),
-            Token::Str("Ok"),
-            Token::I32(0),
-        ],
-        Err::<i32, i32>(1) => vec![
-            Token::EnumStart("Result"),
-            Token::Str("Err"),
-            Token::I32(1),
-        ],
-    }
-    test_unit {
-        () => vec![Token::Unit],
-        () => vec![
-            Token::SeqStart(Some(0)),
-            Token::SeqEnd,
-        ],
-        () => vec![
-            Token::SeqStart(None),
-            Token::SeqEnd,
-        ],
-        () => vec![
-            Token::TupleStructStart("Anything", Some(0)),
-            Token::SeqEnd,
-        ],
-    }
-    test_unit_struct {
-        UnitStruct => vec![Token::Unit],
-        UnitStruct => vec![
-            Token::UnitStruct("UnitStruct"),
-        ],
-        UnitStruct => vec![
-            Token::SeqStart(Some(0)),
-            Token::SeqEnd,
-        ],
-        UnitStruct => vec![
-            Token::SeqStart(None),
-            Token::SeqEnd,
-        ],
-    }
-    test_tuple_struct {
-        TupleStruct(1, 2, 3) => vec![
-            Token::SeqStart(Some(3)),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-        TupleStruct(1, 2, 3) => vec![
-            Token::SeqStart(None),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-        TupleStruct(1, 2, 3) => vec![
-            Token::TupleStructStart("TupleStruct", Some(3)),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-        TupleStruct(1, 2, 3) => vec![
-            Token::TupleStructStart("TupleStruct", None),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-    }
-    test_btreeset {
-        BTreeSet::<isize>::new() => vec![
-            Token::Unit,
-        ],
-        BTreeSet::<isize>::new() => vec![
-            Token::SeqStart(Some(0)),
-            Token::SeqEnd,
-        ],
-        btreeset![btreeset![], btreeset![1], btreeset![2, 3]] => vec![
-            Token::SeqStart(Some(3)),
-                Token::SeqSep,
-                Token::SeqStart(Some(0)),
-                Token::SeqEnd,
-
-                Token::SeqSep,
-                Token::SeqStart(Some(1)),
-                    Token::SeqSep,
-                    Token::I32(1),
-                Token::SeqEnd,
-
-                Token::SeqSep,
-                Token::SeqStart(Some(2)),
-                    Token::SeqSep,
-                    Token::I32(2),
-
-                    Token::SeqSep,
-                    Token::I32(3),
-                Token::SeqEnd,
-            Token::SeqEnd,
-        ],
-        BTreeSet::<isize>::new() => vec![
-            Token::UnitStruct("Anything"),
-        ],
-        BTreeSet::<isize>::new() => vec![
-            Token::TupleStructStart("Anything", Some(0)),
-            Token::SeqEnd,
-        ],
-    }
-    test_hashset {
-        HashSet::<isize>::new() => vec![
-            Token::Unit,
-        ],
-        HashSet::<isize>::new() => vec![
-            Token::SeqStart(Some(0)),
-            Token::SeqEnd,
-        ],
-        hashset![1, 2, 3] => vec![
-            Token::SeqStart(Some(3)),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-        HashSet::<isize>::new() => vec![
-            Token::UnitStruct("Anything"),
-        ],
-        HashSet::<isize>::new() => vec![
-            Token::TupleStructStart("Anything", Some(0)),
-            Token::SeqEnd,
-        ],
-    }
-    test_vec {
-        Vec::<isize>::new() => vec![
-            Token::Unit,
-        ],
-        Vec::<isize>::new() => vec![
-            Token::SeqStart(Some(0)),
-            Token::SeqEnd,
-        ],
-        vec![vec![], vec![1], vec![2, 3]] => vec![
-            Token::SeqStart(Some(3)),
-                Token::SeqSep,
-                Token::SeqStart(Some(0)),
-                Token::SeqEnd,
-
-                Token::SeqSep,
-                Token::SeqStart(Some(1)),
-                    Token::SeqSep,
-                    Token::I32(1),
-                Token::SeqEnd,
-
-                Token::SeqSep,
-                Token::SeqStart(Some(2)),
-                    Token::SeqSep,
-                    Token::I32(2),
-
-                    Token::SeqSep,
-                    Token::I32(3),
-                Token::SeqEnd,
-            Token::SeqEnd,
-        ],
-        Vec::<isize>::new() => vec![
-            Token::UnitStruct("Anything"),
-        ],
-        Vec::<isize>::new() => vec![
-            Token::TupleStructStart("Anything", Some(0)),
-            Token::SeqEnd,
-        ],
-    }
-    test_array {
-        [0; 0] => vec![
-            Token::Unit,
-        ],
-        [0; 0] => vec![
-            Token::SeqStart(Some(0)),
-            Token::SeqEnd,
-        ],
-        ([0; 0], [1], [2, 3]) => vec![
-            Token::SeqStart(Some(3)),
-                Token::SeqSep,
-                Token::SeqStart(Some(0)),
-                Token::SeqEnd,
-
-                Token::SeqSep,
-                Token::SeqStart(Some(1)),
-                    Token::SeqSep,
-                    Token::I32(1),
-                Token::SeqEnd,
-
-                Token::SeqSep,
-                Token::SeqStart(Some(2)),
-                    Token::SeqSep,
-                    Token::I32(2),
-
-                    Token::SeqSep,
-                    Token::I32(3),
-                Token::SeqEnd,
-            Token::SeqEnd,
-        ],
-        [0; 0] => vec![
-            Token::UnitStruct("Anything"),
-        ],
-        [0; 0] => vec![
-            Token::TupleStructStart("Anything", Some(0)),
-            Token::SeqEnd,
-        ],
-    }
-    test_tuple {
-        (1,) => vec![
-            Token::SeqStart(Some(1)),
-                Token::SeqSep,
-                Token::I32(1),
-            Token::SeqEnd,
-        ],
-        (1, 2, 3) => vec![
-            Token::SeqStart(Some(3)),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-    }
-    test_btreemap {
-        BTreeMap::<isize, isize>::new() => vec![
-            Token::Unit,
-        ],
-        BTreeMap::<isize, isize>::new() => vec![
-            Token::MapStart(Some(0)),
-            Token::MapEnd,
-        ],
-        btreemap![1 => 2] => vec![
-            Token::MapStart(Some(1)),
-                Token::MapSep,
-                Token::I32(1),
-                Token::I32(2),
-            Token::MapEnd,
-        ],
-        btreemap![1 => 2, 3 => 4] => vec![
-            Token::MapStart(Some(2)),
-                Token::MapSep,
-                Token::I32(1),
-                Token::I32(2),
-
-                Token::MapSep,
-                Token::I32(3),
-                Token::I32(4),
-            Token::MapEnd,
-        ],
-        btreemap![1 => btreemap![], 2 => btreemap![3 => 4, 5 => 6]] => vec![
-            Token::MapStart(Some(2)),
-                Token::MapSep,
-                Token::I32(1),
-                Token::MapStart(Some(0)),
-                Token::MapEnd,
-
-                Token::MapSep,
-                Token::I32(2),
-                Token::MapStart(Some(2)),
-                    Token::MapSep,
-                    Token::I32(3),
-                    Token::I32(4),
-
-                    Token::MapSep,
-                    Token::I32(5),
-                    Token::I32(6),
-                Token::MapEnd,
-            Token::MapEnd,
-        ],
-        BTreeMap::<isize, isize>::new() => vec![
-            Token::UnitStruct("Anything"),
-        ],
-        BTreeMap::<isize, isize>::new() => vec![
-            Token::StructStart("Anything", Some(0)),
-            Token::MapEnd,
-        ],
-    }
-    test_hashmap {
-        HashMap::<isize, isize>::new() => vec![
-            Token::Unit,
-        ],
-        HashMap::<isize, isize>::new() => vec![
-            Token::MapStart(Some(0)),
-            Token::MapEnd,
-        ],
-        hashmap![1 => 2] => vec![
-            Token::MapStart(Some(1)),
-                Token::MapSep,
-                Token::I32(1),
-                Token::I32(2),
-            Token::MapEnd,
-        ],
-        hashmap![1 => 2, 3 => 4] => vec![
-            Token::MapStart(Some(2)),
-                Token::MapSep,
-                Token::I32(1),
-                Token::I32(2),
-
-                Token::MapSep,
-                Token::I32(3),
-                Token::I32(4),
-            Token::MapEnd,
-        ],
-        hashmap![1 => hashmap![], 2 => hashmap![3 => 4, 5 => 6]] => vec![
-            Token::MapStart(Some(2)),
-                Token::MapSep,
-                Token::I32(1),
-                Token::MapStart(Some(0)),
-                Token::MapEnd,
-
-                Token::MapSep,
-                Token::I32(2),
-                Token::MapStart(Some(2)),
-                    Token::MapSep,
-                    Token::I32(3),
-                    Token::I32(4),
-
-                    Token::MapSep,
-                    Token::I32(5),
-                    Token::I32(6),
-                Token::MapEnd,
-            Token::MapEnd,
-        ],
-        HashMap::<isize, isize>::new() => vec![
-            Token::UnitStruct("Anything"),
-        ],
-        HashMap::<isize, isize>::new() => vec![
-            Token::StructStart("Anything", Some(0)),
-            Token::MapEnd,
-        ],
-    }
-    test_struct {
-        Struct { a: 1, b: 2, c: 3 } => vec![
-            Token::MapStart(Some(3)),
-                Token::MapSep,
-                Token::Str("a"),
-                Token::I32(1),
-
-                Token::MapSep,
-                Token::Str("b"),
-                Token::I32(2),
-
-                Token::MapSep,
-                Token::Str("c"),
-                Token::I32(3),
-            Token::MapEnd,
-        ],
-        Struct { a: 1, b: 2, c: 3 } => vec![
-            Token::StructStart("Struct", Some(3)),
-                Token::MapSep,
-                Token::Str("a"),
-                Token::I32(1),
-
-                Token::MapSep,
-                Token::Str("b"),
-                Token::I32(2),
-
-                Token::MapSep,
-                Token::Str("c"),
-                Token::I32(3),
-            Token::MapEnd,
-        ],
-    }
-    test_enum_unit {
-        Enum::Unit => vec![
-            Token::EnumUnit("Enum", "Unit"),
-        ],
-    }
-    test_enum_simple {
-        Enum::Simple(1) => vec![
-            Token::EnumNewtype("Enum", "Simple"),
-            Token::I32(1),
-        ],
-    }
-    test_enum_seq {
-        Enum::Seq(1, 2, 3) => vec![
-            Token::EnumSeqStart("Enum", "Seq", Some(3)),
-                Token::SeqSep,
-                Token::I32(1),
-
-                Token::SeqSep,
-                Token::I32(2),
-
-                Token::SeqSep,
-                Token::I32(3),
-            Token::SeqEnd,
-        ],
-    }
-    test_enum_map {
-        Enum::Map { a: 1, b: 2, c: 3 } => vec![
-            Token::EnumMapStart("Enum", "Map", Some(3)),
-                Token::MapSep,
-                Token::Str("a"),
-                Token::I32(1),
-
-                Token::MapSep,
-                Token::Str("b"),
-                Token::I32(2),
-
-                Token::MapSep,
-                Token::Str("c"),
-                Token::I32(3),
-            Token::MapEnd,
-        ],
-    }
-    test_enum_unit_usize {
-        Enum::Unit => vec![
-            Token::EnumStart("Enum"),
-            Token::Usize(0),
-            Token::Unit,
-        ],
-    }
-    test_enum_unit_bytes {
-        Enum::Unit => vec![
-            Token::EnumStart("Enum"),
-            Token::Bytes(b"Unit"),
-            Token::Unit,
-        ],
-    }
-}

serde_tests/tests/token.rs

@@ -1,789 +0,0 @@
-use std::fmt;
-use std::iter;
-
-use serde::{ser, de};
-use serde::de::value::{self, ValueDeserializer};
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum Token<'a> {
-    Bool(bool),
-    Isize(isize),
-    I8(i8),
-    I16(i16),
-    I32(i32),
-    I64(i64),
-    Usize(usize),
-    U8(u8),
-    U16(u16),
-    U32(u32),
-    U64(u64),
-    F32(f32),
-    F64(f64),
-    Char(char),
-    Str(&'a str),
-    String(String),
-    Bytes(&'a [u8]),
-
-    Option(bool),
-
-    Unit,
-    UnitStruct(&'a str),
-
-    StructNewtype(&'a str),
-
-    EnumStart(&'a str),
-    EnumUnit(&'a str, &'a str),
-    EnumNewtype(&'a str, &'a str),
-    EnumSeqStart(&'a str, &'a str, Option<usize>),
-    EnumMapStart(&'a str, &'a str, Option<usize>),
-
-    SeqStart(Option<usize>),
-    TupleStructStart(&'a str, Option<usize>),
-    SeqSep,
-    SeqEnd,
-
-    MapStart(Option<usize>),
-    StructStart(&'a str, Option<usize>),
-    MapSep,
-    MapEnd,
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-pub struct Serializer<I> {
-    tokens: I,
-}
-
-impl<'a, I> Serializer<I>
-    where I: Iterator<Item=&'a Token<'a>>
-{
-    pub fn new(tokens: I) -> Serializer<I> {
-        Serializer {
-            tokens: tokens,
-        }
-    }
-
-    fn visit_sequence<V>(&mut self, mut visitor: V) -> Result<(), ()>
-        where V: ser::SeqVisitor
-    {
-        while let Some(()) = try!(visitor.visit(self)) { }
-
-        assert_eq!(self.tokens.next(), Some(&Token::SeqEnd));
-
-        Ok(())
-    }
-
-    fn visit_mapping<V>(&mut self, mut visitor: V) -> Result<(), ()>
-        where V: ser::MapVisitor
-    {
-        while let Some(()) = try!(visitor.visit(self)) { }
-
-        assert_eq!(self.tokens.next(), Some(&Token::MapEnd));
-
-        Ok(())
-    }
-}
-
-impl<'a, I> ser::Serializer for Serializer<I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
-    type Error = ();
-
-    fn visit_unit(&mut self) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Unit));
-        Ok(())
-    }
-
-    fn visit_newtype_variant<T>(&mut self,
-                                name: &str,
-                                _variant_index: usize,
-                                variant: &str,
-                                value: T) -> Result<(), ()>
-        where T: ser::Serialize,
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumNewtype(name, variant)));
-        value.serialize(self)
-    }
-
-    fn visit_unit_struct(&mut self, name: &str) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::UnitStruct(name)));
-        Ok(())
-    }
-
-    fn visit_unit_variant(&mut self,
-                          name: &str,
-                          _variant_index: usize,
-                          variant: &str) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumUnit(name, variant)));
-
-        Ok(())
-    }
-
-    fn visit_bool(&mut self, v: bool) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Bool(v)));
-        Ok(())
-    }
-
-    fn visit_isize(&mut self, v: isize) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Isize(v)));
-        Ok(())
-    }
-
-    fn visit_i8(&mut self, v: i8) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::I8(v)));
-        Ok(())
-    }
-
-    fn visit_i16(&mut self, v: i16) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::I16(v)));
-        Ok(())
-    }
-
-    fn visit_i32(&mut self, v: i32) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::I32(v)));
-        Ok(())
-    }
-
-    fn visit_i64(&mut self, v: i64) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::I64(v)));
-        Ok(())
-    }
-
-    fn visit_usize(&mut self, v: usize) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Usize(v)));
-        Ok(())
-    }
-
-    fn visit_u8(&mut self, v: u8) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::U8(v)));
-        Ok(())
-    }
-
-    fn visit_u16(&mut self, v: u16) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::U16(v)));
-        Ok(())
-    }
-
-    fn visit_u32(&mut self, v: u32) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::U32(v)));
-        Ok(())
-    }
-
-    fn visit_u64(&mut self, v: u64) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::U64(v)));
-        Ok(())
-    }
-
-    fn visit_f32(&mut self, v: f32) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::F32(v)));
-        Ok(())
-    }
-
-    fn visit_f64(&mut self, v: f64) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::F64(v)));
-        Ok(())
-    }
-
-    fn visit_char(&mut self, v: char) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Char(v)));
-        Ok(())
-    }
-
-    fn visit_str(&mut self, v: &str) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Str(v)));
-        Ok(())
-    }
-
-    fn visit_none(&mut self) -> Result<(), ()> {
-        assert_eq!(self.tokens.next(), Some(&Token::Option(false)));
-        Ok(())
-    }
-
-    fn visit_some<V>(&mut self, value: V) -> Result<(), ()>
-        where V: ser::Serialize,
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::Option(true)));
-        value.serialize(self)
-    }
-
-
-    fn visit_seq<V>(&mut self, visitor: V) -> Result<(), ()>
-        where V: ser::SeqVisitor
-    {
-        let len = visitor.len();
-
-        assert_eq!(self.tokens.next(), Some(&Token::SeqStart(len)));
-
-        self.visit_sequence(visitor)
-    }
-
-    fn visit_newtype_struct<T>(&mut self,
-                               name: &'static str,
-                               value: T) -> Result<(), ()>
-        where T: ser::Serialize,
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::StructNewtype(name)));
-        value.serialize(self)
-    }
-
-    fn visit_tuple_struct<V>(&mut self, name: &str, visitor: V) -> Result<(), ()>
-        where V: ser::SeqVisitor
-    {
-        let len = visitor.len();
-
-        assert_eq!(self.tokens.next(), Some(&Token::TupleStructStart(name, len)));
-
-        self.visit_sequence(visitor)
-    }
-
-    fn visit_tuple_variant<V>(&mut self,
-                              name: &str,
-                              _variant_index: usize,
-                              variant: &str,
-                              visitor: V) -> Result<(), ()>
-        where V: ser::SeqVisitor
-    {
-        let len = visitor.len();
-
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqStart(name, variant, len)));
-
-        self.visit_sequence(visitor)
-    }
-
-    fn visit_seq_elt<T>(&mut self, value: T) -> Result<(), ()>
-        where T: ser::Serialize
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::SeqSep));
-        value.serialize(self)
-    }
-
-    fn visit_map<V>(&mut self, visitor: V) -> Result<(), ()>
-        where V: ser::MapVisitor
-    {
-        let len = visitor.len();
-
-        assert_eq!(self.tokens.next(), Some(&Token::MapStart(len)));
-
-        self.visit_mapping(visitor)
-    }
-
-    fn visit_struct<V>(&mut self, name: &str, visitor: V) -> Result<(), ()>
-        where V: ser::MapVisitor
-    {
-        let len = visitor.len();
-
-        assert_eq!(self.tokens.next(), Some(&Token::StructStart(name, len)));
-
-        self.visit_mapping(visitor)
-    }
-
-    fn visit_struct_variant<V>(&mut self,
-                               name: &str,
-                               _variant_index: usize,
-                               variant: &str,
-                               visitor: V) -> Result<(), ()>
-        where V: ser::MapVisitor
-    {
-        let len = visitor.len();
-
-        assert_eq!(self.tokens.next(), Some(&Token::EnumMapStart(name, variant, len)));
-
-        self.visit_mapping(visitor)
-    }
-
-    fn visit_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), ()>
-        where K: ser::Serialize,
-              V: ser::Serialize,
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::MapSep));
-
-        try!(key.serialize(self));
-        value.serialize(self)
-    }
-
-    fn format() -> &'static str {
-        "token"
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(Clone, PartialEq, Debug)]
-enum Error {
-    SyntaxError,
-    EndOfStreamError,
-    UnknownFieldError(String),
-    MissingFieldError(&'static str),
-    InvalidName(&'static str),
-    UnexpectedToken(Token<'static>),
-    ValueError(value::Error),
-}
-
-impl de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
-
-    fn end_of_stream() -> Error { Error::EndOfStreamError }
-
-    fn unknown_field(field: &str) -> Error {
-        Error::UnknownFieldError(field.to_string())
-    }
-
-    fn missing_field(field: &'static str) -> Error {
-        Error::MissingFieldError(field)
-    }
-}
-
-impl From<value::Error> for Error {
-    fn from(error: value::Error) -> Error {
-        Error::ValueError(error)
-    }
-}
-
-struct Deserializer<I> where I: Iterator<Item=Token<'static>> {
-    tokens: iter::Peekable<I>,
-}
-
-impl<I> Deserializer<I>
-    where I: Iterator<Item=Token<'static>>
-{
-    fn new(tokens: I) -> Deserializer<I> {
-        Deserializer {
-            tokens: tokens.peekable(),
-        }
-    }
-
-    fn visit_seq<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        visitor.visit_seq(DeserializerSeqVisitor {
-            de: self,
-            len: len,
-        })
-    }
-
-    fn visit_map<V>(&mut self, len: Option<usize>, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        visitor.visit_map(DeserializerMapVisitor {
-            de: self,
-            len: len,
-        })
-    }
-}
-
-impl<I> de::Deserializer for Deserializer<I>
-    where I: Iterator<Item=Token<'static>>
-{
-    type Error = Error;
-
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        println!("visit {:?}", self.tokens.peek());
-        match self.tokens.next() {
-            Some(Token::Bool(v)) => visitor.visit_bool(v),
-            Some(Token::Isize(v)) => visitor.visit_isize(v),
-            Some(Token::I8(v)) => visitor.visit_i8(v),
-            Some(Token::I16(v)) => visitor.visit_i16(v),
-            Some(Token::I32(v)) => visitor.visit_i32(v),
-            Some(Token::I64(v)) => visitor.visit_i64(v),
-            Some(Token::Usize(v)) => visitor.visit_usize(v),
-            Some(Token::U8(v)) => visitor.visit_u8(v),
-            Some(Token::U16(v)) => visitor.visit_u16(v),
-            Some(Token::U32(v)) => visitor.visit_u32(v),
-            Some(Token::U64(v)) => visitor.visit_u64(v),
-            Some(Token::F32(v)) => visitor.visit_f32(v),
-            Some(Token::F64(v)) => visitor.visit_f64(v),
-            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(),
-            Some(Token::UnitStruct(name)) => visitor.visit_unit_struct(name),
-            Some(Token::SeqStart(len)) | Some(Token::TupleStructStart(_, len)) => {
-                self.visit_seq(len, visitor)
-            }
-            Some(Token::MapStart(len)) | Some(Token::StructStart(_, len)) => {
-                self.visit_map(len, visitor)
-            }
-            //Some(Token::Name(_)) => self.visit(visitor),
-            Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    /// Hook into `Option` deserializing so we can treat `Unit` as a
-    /// `None`, or a regular value as `Some(value)`.
-    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::Option(false)) => {
-                self.tokens.next();
-                visitor.visit_none()
-            }
-            Some(&Token::Option(true)) => {
-                self.tokens.next();
-                visitor.visit_some(self)
-            }
-            Some(&Token::Unit) => {
-                self.tokens.next();
-                visitor.visit_none()
-            }
-            Some(_) => visitor.visit_some(self),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_enum<V>(&mut self,
-                     name: &str,
-                     _variants: &'static [&'static str],
-                     mut visitor: V) -> Result<V::Value, Error>
-        where V: de::EnumVisitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::EnumStart(n)) if name == n => {
-                self.tokens.next();
-
-                visitor.visit(DeserializerVariantVisitor {
-                    de: self,
-                })
-            }
-            Some(&Token::EnumUnit(n, _))
-            | Some(&Token::EnumNewtype(n, _))
-            | Some(&Token::EnumSeqStart(n, _, _))
-            | Some(&Token::EnumMapStart(n, _, _)) if name == n => {
-                visitor.visit(DeserializerVariantVisitor {
-                    de: self,
-                })
-            }
-            Some(_) => {
-                let token = self.tokens.next().unwrap();
-                Err(Error::UnexpectedToken(token))
-            }
-            None => { return Err(Error::EndOfStreamError); }
-        }
-    }
-
-    fn visit_unit_struct<V>(&mut self, name: &str, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::UnitStruct(n)) => {
-                self.tokens.next();
-                if name == n {
-                    visitor.visit_unit()
-                } else {
-                    Err(Error::InvalidName(n))
-                }
-            }
-            Some(_) => self.visit(visitor),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_newtype_struct<V>(&mut self,
-                               name: &str,
-                               mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::StructNewtype(n)) => {
-                self.tokens.next();
-                if name == n {
-                    visitor.visit_newtype_struct(self)
-                } else {
-                    Err(Error::InvalidName(n))
-                }
-            }
-            Some(_) => self.visit(visitor),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_tuple_struct<V>(&mut self,
-                             name: &str,
-                             len: usize,
-                             mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::UnitStruct(n)) => {
-                self.tokens.next();
-                if name == n {
-                    visitor.visit_unit()
-                } else {
-                    Err(Error::InvalidName(n))
-                }
-            }
-            Some(&Token::TupleStructStart(n, _)) => {
-                self.tokens.next();
-                if name == n {
-                    self.visit_seq(Some(len), visitor)
-                } else {
-                    Err(Error::InvalidName(n))
-                }
-            }
-            Some(&Token::SeqStart(_)) => {
-                self.tokens.next();
-                self.visit_seq(Some(len), visitor)
-            }
-            Some(_) => self.visit(visitor),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_struct<V>(&mut self,
-                       name: &str,
-                       fields: &'static [&'static str],
-                       visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::StructStart(n, _)) => {
-                self.tokens.next();
-                if name == n {
-                    self.visit_map(Some(fields.len()), visitor)
-                } else {
-                    Err(Error::InvalidName(n))
-                }
-            }
-            Some(&Token::MapStart(_)) => {
-                self.tokens.next();
-                self.visit_map(Some(fields.len()), visitor)
-            }
-            Some(_) => self.visit(visitor),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn format() -> &'static str {
-        "token"
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-struct DeserializerSeqVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
-    de: &'a mut Deserializer<I>,
-    len: Option<usize>,
-}
-
-impl<'a, I> de::SeqVisitor for DeserializerSeqVisitor<'a, I>
-    where I: Iterator<Item=Token<'static>>,
-{
-    type Error = Error;
-
-    fn visit<T>(&mut self) -> Result<Option<T>, Error>
-        where T: de::Deserialize,
-    {
-        match self.de.tokens.peek() {
-            Some(&Token::SeqSep) => {
-                self.de.tokens.next();
-                self.len = self.len.map(|len| len - 1);
-                Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-            }
-            Some(&Token::SeqEnd) => Ok(None),
-            Some(_) => {
-                let token = self.de.tokens.next().unwrap();
-                Err(Error::UnexpectedToken(token))
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn end(&mut self) -> Result<(), Error> {
-        //assert_eq!(self.len.unwrap_or(0), 0);
-        match self.de.tokens.next() {
-            Some(Token::SeqEnd) => Ok(()),
-            Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.len.unwrap_or(0);
-        (len, self.len)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-struct DeserializerMapVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
-    de: &'a mut Deserializer<I>,
-    len: Option<usize>,
-}
-
-impl<'a, I> de::MapVisitor for DeserializerMapVisitor<'a, I>
-    where I: Iterator<Item=Token<'static>>,
-{
-    type Error = Error;
-
-    fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
-        where K: de::Deserialize,
-    {
-        match self.de.tokens.peek() {
-            Some(&Token::MapSep) => {
-                self.de.tokens.next();
-                self.len = self.len.map(|len| len - 1);
-                Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-            }
-            Some(&Token::MapEnd) => Ok(None),
-            Some(_) => {
-                let token = self.de.tokens.next().unwrap();
-                Err(Error::UnexpectedToken(token))
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_value<V>(&mut self) -> Result<V, Error>
-        where V: de::Deserialize,
-    {
-        Ok(try!(de::Deserialize::deserialize(self.de)))
-    }
-
-    fn end(&mut self) -> Result<(), Error> {
-        //assert_eq!(self.len.unwrap_or(0), 0);
-        match self.de.tokens.next() {
-            Some(Token::MapEnd) => Ok(()),
-            Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.len.unwrap_or(0);
-        (len, self.len)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-struct DeserializerVariantVisitor<'a, I: 'a> where I: Iterator<Item=Token<'static>> {
-    de: &'a mut Deserializer<I>,
-}
-
-impl<'a, I> de::VariantVisitor for DeserializerVariantVisitor<'a, I>
-    where I: Iterator<Item=Token<'static>>,
-{
-    type Error = Error;
-
-    fn visit_variant<V>(&mut self) -> Result<V, Error>
-        where V: de::Deserialize,
-    {
-        match self.de.tokens.peek() {
-            Some(&Token::EnumUnit(_, v))
-            | Some(&Token::EnumNewtype(_, v))
-            | Some(&Token::EnumSeqStart(_, v, _))
-            | Some(&Token::EnumMapStart(_, v, _)) => {
-                let value = try!(de::Deserialize::deserialize(&mut v.into_deserializer()));
-                Ok(value)
-            }
-            Some(_) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_unit(&mut self) -> Result<(), Error> {
-        match self.de.tokens.peek() {
-            Some(&Token::EnumUnit(_, _)) => {
-                self.de.tokens.next();
-                Ok(())
-            }
-            Some(_) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
-        where T: de::Deserialize,
-    {
-        match self.de.tokens.peek() {
-            Some(&Token::EnumNewtype(_, _)) => {
-                self.de.tokens.next();
-                de::Deserialize::deserialize(self.de)
-            }
-            Some(_) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_tuple<V>(&mut self,
-                      len: usize,
-                      visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.de.tokens.peek() {
-            Some(&Token::EnumSeqStart(_, _, Some(enum_len))) => {
-                let token = self.de.tokens.next().unwrap();
-
-                if len == enum_len {
-                    self.de.visit_seq(Some(len), visitor)
-                } else {
-                    Err(Error::UnexpectedToken(token))
-                }
-            }
-            Some(_) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-    fn visit_struct<V>(&mut self,
-                       fields: &'static [&'static str],
-                       visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.de.tokens.peek() {
-            Some(&Token::EnumMapStart(_, _, Some(enum_len))) => {
-                let token = self.de.tokens.next().unwrap();
-
-                if fields.len() == enum_len {
-                    self.de.visit_map(Some(fields.len()), visitor)
-                } else {
-                    Err(Error::UnexpectedToken(token))
-                }
-            }
-            Some(_) => {
-                de::Deserialize::deserialize(self.de)
-            }
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-pub fn assert_ser_tokens<T>(value: &T, tokens: &[Token])
-    where T: ser::Serialize,
-{
-    let mut ser = Serializer::new(tokens.iter());
-    assert_eq!(ser::Serialize::serialize(value, &mut ser), Ok(()));
-    assert_eq!(ser.tokens.next(), None);
-}
-
-pub fn assert_de_tokens<T>(value: &T, tokens: Vec<Token<'static>>)
-    where T: de::Deserialize + PartialEq + fmt::Debug,
-{
-    let mut de = Deserializer::new(tokens.into_iter());
-    let v: Result<T, Error> = de::Deserialize::deserialize(&mut de);
-    assert_eq!(v.as_ref(), Ok(value));
-    assert_eq!(de.tokens.next(), None);
-}
-
-pub fn assert_tokens<T>(value: &T, tokens: Vec<Token<'static>>)
-    where T: ser::Serialize + de::Deserialize + PartialEq + fmt::Debug,
-{
-    assert_ser_tokens(value, &tokens[..]);
-    assert_de_tokens(value, tokens);
-}

testing/Cargo.toml

@@ -1,25 +1,30 @@
 [package]
-name = "serde_tests"
-version = "0.6.2"
+name = "serde_testing"
+version = "0.8.3"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "http://serde-rs.github.io/serde/serde"
+documentation = "https://docs.serde.rs/serde/"
 readme = "README.md"
 keywords = ["serialization"]
 build = "build.rs"
 
+[features]
+unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
+
 [build-dependencies]
-syntex = { version = "^0.22.0" }
-syntex_syntax = { version = "^0.22.0" }
-serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
+serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] }
 
 [dev-dependencies]
-num = "^0.1.27"
+fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = { version = "*", path = "../serde" }
-syntex = "^0.22.0"
+serde = { path = "../serde" }
+serde_test = { path = "../serde_test" }
+
+[dependencies]
+clippy = { version = "^0.*", optional = true }
 
 [[test]]
 name = "test"

testing/benches/bench.rs

@@ -1,6 +1,7 @@
 #![feature(test)]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
 
-extern crate num;
 extern crate rustc_serialize;
 extern crate serde;
 extern crate test;

testing/benches/bench_enum.rs

@@ -1,7 +1,9 @@
 use test::Bencher;
-use rustc_serialize::{Decoder, Decodable};
+use std::error;
+use std::fmt;
+use rustc_serialize::Decodable;
 use serde;
-use serde::de::{Deserializer, Deserialize};
+use serde::de::Deserialize;
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -15,18 +17,34 @@ pub enum Animal {
 
 #[derive(Debug)]
 pub enum Error {
-    EndOfStreamError,
-    SyntaxError,
+    EndOfStream,
+    Syntax,
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn custom<T: Into<String>>(_: T) -> Error { Error::Syntax }
 
-    fn end_of_stream() -> Error { Error::EndOfStreamError }
+    fn end_of_stream() -> Error { Error::EndOfStream }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field(_: &str) -> Error { Error::Syntax }
 
-    fn missing_field(_: &'static str) -> Error { Error::SyntaxError }
+    fn missing_field(_: &'static str) -> Error { Error::Syntax }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(format!("{:?}", self).as_ref())
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Deserialization Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -36,12 +54,11 @@ mod decoder {
 
     use super::{Animal, Error};
     use super::Animal::{Dog, Frog};
-    use self::State::{AnimalState, IsizeState, StringState};
 
     enum State {
-        AnimalState(Animal),
-        IsizeState(isize),
-        StringState(String),
+        Animal(Animal),
+        Isize(isize),
+        String(String),
     }
 
     pub struct AnimalDecoder {
@@ -53,7 +70,7 @@ mod decoder {
         #[inline]
         pub fn new(animal: Animal) -> AnimalDecoder {
             AnimalDecoder {
-                stack: vec!(AnimalState(animal)),
+                stack: vec!(State::Animal(animal)),
             }
         }
     }
@@ -61,35 +78,35 @@ mod decoder {
     impl Decoder for AnimalDecoder {
         type Error = Error;
 
-        fn error(&mut self, _: &str) -> Error { Error::SyntaxError }
+        fn error(&mut self, _: &str) -> Error { Error::Syntax }
 
         // Primitive types:
-        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::SyntaxError) }
-        fn read_usize(&mut self) -> Result<usize, Error> { Err(Error::SyntaxError) }
-        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::SyntaxError) }
-        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::SyntaxError) }
-        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::SyntaxError) }
-        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::SyntaxError) }
+        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::Syntax) }
+        fn read_usize(&mut self) -> Result<usize, Error> { Err(Error::Syntax) }
+        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::Syntax) }
+        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::Syntax) }
+        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::Syntax) }
+        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::Syntax) }
         #[inline]
         fn read_isize(&mut self) -> Result<isize, Error> {
             match self.stack.pop() {
-                Some(IsizeState(x)) => Ok(x),
-                _ => Err(Error::SyntaxError),
+                Some(State::Isize(x)) => Ok(x),
+                _ => Err(Error::Syntax),
             }
         }
-        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::SyntaxError) }
-        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::SyntaxError) }
-        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::SyntaxError) }
-        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::SyntaxError) }
-        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::SyntaxError) }
-        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::SyntaxError) }
-        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::SyntaxError) }
-        fn read_char(&mut self) -> Result<char, Error> { Err(Error::SyntaxError) }
+        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::Syntax) }
+        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::Syntax) }
+        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::Syntax) }
+        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::Syntax) }
+        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::Syntax) }
+        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::Syntax) }
+        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::Syntax) }
+        fn read_char(&mut self) -> Result<char, Error> { Err(Error::Syntax) }
         #[inline]
         fn read_str(&mut self) -> Result<String, Error> {
             match self.stack.pop() {
-                Some(StringState(x)) => Ok(x),
-                _ => Err(Error::SyntaxError),
+                Some(State::String(x)) => Ok(x),
+                _ => Err(Error::Syntax),
             }
         }
 
@@ -99,15 +116,15 @@ mod decoder {
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
             match self.stack.pop() {
-                Some(AnimalState(animal)) => {
-                    self.stack.push(AnimalState(animal));
+                Some(State::Animal(animal)) => {
+                    self.stack.push(State::Animal(animal));
                     if name == "Animal" {
                         f(self)
                     } else {
-                        Err(Error::SyntaxError)
+                        Err(Error::Syntax)
                     }
                 }
-                _ => Err(Error::SyntaxError)
+                _ => Err(Error::Syntax)
             }
         }
 
@@ -116,18 +133,18 @@ mod decoder {
             F: FnOnce(&mut AnimalDecoder, usize) -> Result<T, Error>,
         {
             let name = match self.stack.pop() {
-                Some(AnimalState(Dog)) => "Dog",
-                Some(AnimalState(Frog(x0, x1))) => {
-                    self.stack.push(IsizeState(x1));
-                    self.stack.push(StringState(x0));
+                Some(State::Animal(Dog)) => "Dog",
+                Some(State::Animal(Frog(x0, x1))) => {
+                    self.stack.push(State::Isize(x1));
+                    self.stack.push(State::String(x0));
                     "Frog"
                 }
-                _ => { return Err(Error::SyntaxError); }
+                _ => { return Err(Error::Syntax); }
             };
 
             let idx = match names.iter().position(|n| *n == name) {
                 Some(idx) => idx,
-                None => { return Err(Error::SyntaxError); }
+                None => { return Err(Error::Syntax); }
             };
 
             f(self, idx)
@@ -143,56 +160,56 @@ mod decoder {
         fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple<T, F>(&mut self, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         // Specialized types:
         fn read_option<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder, bool) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         #[inline]
@@ -212,19 +229,19 @@ mod decoder {
         fn read_map<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_map_elt_key<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_map_elt_val<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
     }
 }
@@ -238,10 +255,10 @@ mod deserializer {
 
     #[derive(Debug)]
     enum State {
-        AnimalState(Animal),
-        IsizeState(isize),
-        StrState(&'static str),
-        StringState(String),
+        Animal(Animal),
+        Isize(isize),
+        Str(&'static str),
+        String(String),
         UnitState,
     }
 
@@ -253,7 +270,7 @@ mod deserializer {
         #[inline]
         pub fn new(animal: Animal) -> AnimalDeserializer {
             AnimalDeserializer {
-                stack: vec!(State::AnimalState(animal)),
+                stack: vec!(State::Animal(animal)),
             }
         }
     }
@@ -262,60 +279,60 @@ mod deserializer {
         type Error = Error;
 
         #[inline]
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.stack.pop() {
-                Some(State::IsizeState(value)) => {
+                Some(State::Isize(value)) => {
                     visitor.visit_isize(value)
                 }
-                Some(State::StringState(value)) => {
+                Some(State::String(value)) => {
                     visitor.visit_string(value)
                 }
-                Some(State::StrState(value)) => {
+                Some(State::Str(value)) => {
                     visitor.visit_str(value)
                 }
                 Some(State::UnitState) => {
                     visitor.visit_unit()
                 }
                 Some(_) => {
-                    Err(Error::SyntaxError)
+                    Err(Error::Syntax)
                 }
                 None => {
-                    Err(Error::EndOfStreamError)
+                    Err(Error::EndOfStream)
                 }
             }
         }
 
         #[inline]
-        fn visit_enum<V>(&mut self,
+        fn deserialize_enum<V>(&mut self,
                          _name: &str,
                          _variants: &[&str],
                          mut visitor: V) -> Result<V::Value, Error>
             where V: de::EnumVisitor,
         {
             match self.stack.pop() {
-                Some(State::AnimalState(Animal::Dog)) => {
+                Some(State::Animal(Animal::Dog)) => {
                     self.stack.push(State::UnitState);
-                    self.stack.push(State::StrState("Dog"));
+                    self.stack.push(State::Str("Dog"));
                     visitor.visit(DogVisitor {
                         de: self,
                     })
                 }
-                Some(State::AnimalState(Animal::Frog(x0, x1))) => {
-                    self.stack.push(State::IsizeState(x1));
-                    self.stack.push(State::StringState(x0));
-                    self.stack.push(State::StrState("Frog"));
+                Some(State::Animal(Animal::Frog(x0, x1))) => {
+                    self.stack.push(State::Isize(x1));
+                    self.stack.push(State::String(x0));
+                    self.stack.push(State::Str("Frog"));
                     visitor.visit(FrogVisitor {
                         de: self,
                         state: 0,
                     })
                 }
                 Some(_) => {
-                    Err(Error::SyntaxError)
+                    Err(Error::Syntax)
                 }
                 None => {
-                    Err(Error::EndOfStreamError)
+                    Err(Error::EndOfStream)
                 }
             }
         }
@@ -387,7 +404,7 @@ mod deserializer {
             if self.state == 2 {
                 Ok(())
             } else {
-                Err(Error::SyntaxError)
+                Err(Error::Syntax)
             }
         }
 
@@ -415,7 +432,7 @@ fn bench_decoder_dog(b: &mut Bencher) {
 #[bench]
 fn bench_decoder_frog(b: &mut Bencher) {
     b.iter(|| {
-        let animal = Animal::Frog("Henry".to_string(), 349);
+        let animal = Animal::Frog("Henry".to_owned(), 349);
 
         let mut d = decoder::AnimalDecoder::new(animal.clone());
         let value: Animal = Decodable::decode(&mut d).unwrap();
@@ -439,7 +456,7 @@ fn bench_deserializer_dog(b: &mut Bencher) {
 #[bench]
 fn bench_deserializer_frog(b: &mut Bencher) {
     b.iter(|| {
-        let animal = Animal::Frog("Henry".to_string(), 349);
+        let animal = Animal::Frog("Henry".to_owned(), 349);
 
         let mut d = deserializer::AnimalDeserializer::new(animal.clone());
         let value: Animal = Deserialize::deserialize(&mut d).unwrap();

testing/benches/bench_map.rs

@@ -1,4 +1,6 @@
 use std::fmt::Debug;
+use std::fmt;
+use std::error;
 use std::collections::HashMap;
 use test::Bencher;
 
@@ -12,22 +14,37 @@ use serde::de::{Deserializer, Deserialize};
 #[derive(PartialEq, Debug)]
 pub enum Error {
     EndOfStream,
-    SyntaxError,
+    Syntax,
     MissingField,
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn custom<T: Into<String>>(_: T) -> Error { Error::Syntax }
 
     fn end_of_stream() -> Error { Error::EndOfStream }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field(_: &str) -> Error { Error::Syntax }
 
     fn missing_field(_: &'static str) -> Error {
         Error::MissingField
     }
 }
 
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(format!("{:?}", self).as_ref())
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Deserialization Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
 //////////////////////////////////////////////////////////////////////////////
 
 mod decoder {
@@ -36,11 +53,10 @@ mod decoder {
     use rustc_serialize;
 
     use super::Error;
-    use self::Value::{StringValue, IsizeValue};
 
     enum Value {
-        StringValue(String),
-        IsizeValue(isize),
+        String(String),
+        Isize(isize),
     }
 
     pub struct IsizeDecoder {
@@ -64,37 +80,37 @@ mod decoder {
         type Error = Error;
 
         fn error(&mut self, _msg: &str) -> Error {
-            Error::SyntaxError
+            Error::Syntax
         }
 
         // Primitive types:
-        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::SyntaxError) }
-        fn read_usize(&mut self) -> Result<usize, Error> { Err(Error::SyntaxError) }
-        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::SyntaxError) }
-        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::SyntaxError) }
-        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::SyntaxError) }
-        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::SyntaxError) }
+        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::Syntax) }
+        fn read_usize(&mut self) -> Result<usize, Error> { Err(Error::Syntax) }
+        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::Syntax) }
+        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::Syntax) }
+        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::Syntax) }
+        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::Syntax) }
         #[inline]
         fn read_isize(&mut self) -> Result<isize, Error> {
             match self.stack.pop() {
-                Some(IsizeValue(x)) => Ok(x),
-                Some(_) => Err(Error::SyntaxError),
+                Some(Value::Isize(x)) => Ok(x),
+                Some(_) => Err(Error::Syntax),
                 None => Err(Error::EndOfStream),
             }
         }
-        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::SyntaxError) }
-        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::SyntaxError) }
-        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::SyntaxError) }
-        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::SyntaxError) }
-        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::SyntaxError) }
-        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::SyntaxError) }
-        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::SyntaxError) }
-        fn read_char(&mut self) -> Result<char, Error> { Err(Error::SyntaxError) }
+        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::Syntax) }
+        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::Syntax) }
+        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::Syntax) }
+        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::Syntax) }
+        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::Syntax) }
+        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::Syntax) }
+        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::Syntax) }
+        fn read_char(&mut self) -> Result<char, Error> { Err(Error::Syntax) }
         #[inline]
         fn read_str(&mut self) -> Result<String, Error> {
             match self.stack.pop() {
-                Some(StringValue(x)) => Ok(x),
-                Some(_) => Err(Error::SyntaxError),
+                Some(Value::String(x)) => Ok(x),
+                Some(_) => Err(Error::Syntax),
                 None => Err(Error::EndOfStream),
             }
         }
@@ -103,86 +119,86 @@ mod decoder {
         fn read_enum<T, F>(&mut self, _name: &str, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple<T, F>(&mut self, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         // Specialized types:
         fn read_option<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder, bool) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_seq<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_seq_elt<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         #[inline]
@@ -198,12 +214,12 @@ mod decoder {
         {
             match self.iter.next() {
                 Some((key, value)) => {
-                    self.stack.push(IsizeValue(value));
-                    self.stack.push(StringValue(key));
+                    self.stack.push(Value::Isize(value));
+                    self.stack.push(Value::String(key));
                     f(self)
                 }
                 None => {
-                    Err(Error::SyntaxError)
+                    Err(Error::Syntax)
                 }
             }
         }
@@ -230,8 +246,8 @@ mod deserializer {
     #[derive(PartialEq, Debug)]
     enum State {
         StartState,
-        KeyState(String),
-        ValueState(isize),
+        Key(String),
+        Value(isize),
     }
 
     pub struct IsizeDeserializer {
@@ -252,17 +268,17 @@ mod deserializer {
     impl de::Deserializer for IsizeDeserializer {
         type Error = Error;
 
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.stack.pop() {
                 Some(State::StartState) => {
                     visitor.visit_map(self)
                 }
-                Some(State::KeyState(key)) => {
+                Some(State::Key(key)) => {
                     visitor.visit_string(key)
                 }
-                Some(State::ValueState(value)) => {
+                Some(State::Value(value)) => {
                     visitor.visit_isize(value)
                 }
                 None => {
@@ -280,8 +296,8 @@ mod deserializer {
         {
             match self.iter.next() {
                 Some((key, value)) => {
-                    self.stack.push(State::ValueState(value));
-                    self.stack.push(State::KeyState(key));
+                    self.stack.push(State::Value(value));
+                    self.stack.push(State::Key(key));
                     Ok(Some(try!(de::Deserialize::deserialize(self))))
                 }
                 None => {
@@ -298,7 +314,7 @@ mod deserializer {
 
         fn end(&mut self) -> Result<(), Error> {
             match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
+                Some(_) => Err(Error::Syntax),
                 None => Ok(()),
             }
         }
@@ -315,14 +331,14 @@ mod deserializer {
         #[inline]
         fn next(&mut self) -> Option<Result<de::Token, Error>> {
             match self.stack.pop() {
-                Some(StartState) => {
+                Some(State::StartState) => {
                     self.stack.push(KeyOrEndState);
                     Some(Ok(de::Token::MapStart(self.len)))
                 }
-                Some(KeyOrEndState) => {
+                Some(State::KeyOrEndState) => {
                     match self.iter.next() {
                         Some((key, value)) => {
-                            self.stack.push(ValueState(value));
+                            self.stack.push(Value(value));
                             Some(Ok(de::Token::String(key)))
                         }
                         None => {
@@ -331,7 +347,7 @@ mod deserializer {
                         }
                     }
                 }
-                Some(ValueState(x)) => {
+                Some(State::Value(x)) => {
                     self.stack.push(KeyOrEndState);
                     Some(Ok(de::Token::Isize(x)))
                 }
@@ -353,24 +369,24 @@ mod deserializer {
 
         #[inline]
         fn syntax(&mut self, _token: de::Token, _expected: &[de::TokenKind]) -> Error {
-            SyntaxError
+            Syntax
         }
 
         #[inline]
         fn unexpected_name(&mut self, _token: de::Token) -> Error {
-            SyntaxError
+            Syntax
         }
 
         #[inline]
         fn conversion_error(&mut self, _token: de::Token) -> Error {
-            SyntaxError
+            Syntax
         }
 
         #[inline]
         fn missing_field<
             T: de::Deserialize<IsizeDeserializer, Error>
         >(&mut self, _field: &'static str) -> Result<T, Error> {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
     }
 */
@@ -399,7 +415,7 @@ fn bench_decoder_000(b: &mut Bencher) {
 fn bench_decoder_003(b: &mut Bencher) {
     b.iter(|| {
         let mut m: HashMap<String, isize> = HashMap::new();
-        for i in (0 .. 3) {
+        for i in 0 .. 3 {
             m.insert(i.to_string(), i);
         }
         run_decoder(decoder::IsizeDecoder::new(m.clone()), m)
@@ -410,7 +426,7 @@ fn bench_decoder_003(b: &mut Bencher) {
 fn bench_decoder_100(b: &mut Bencher) {
     b.iter(|| {
         let mut m: HashMap<String, isize> = HashMap::new();
-        for i in (0 .. 100) {
+        for i in 0 .. 100 {
             m.insert(i.to_string(), i);
         }
         run_decoder(decoder::IsizeDecoder::new(m.clone()), m)
@@ -439,7 +455,7 @@ fn bench_deserializer_000(b: &mut Bencher) {
 fn bench_deserializer_003(b: &mut Bencher) {
     b.iter(|| {
         let mut m: HashMap<String, isize> = HashMap::new();
-        for i in (0 .. 3) {
+        for i in 0 .. 3 {
             m.insert(i.to_string(), i);
         }
         run_deserializer(deserializer::IsizeDeserializer::new(m.clone()), m)
@@ -450,7 +466,7 @@ fn bench_deserializer_003(b: &mut Bencher) {
 fn bench_deserializer_100(b: &mut Bencher) {
     b.iter(|| {
         let mut m: HashMap<String, isize> = HashMap::new();
-        for i in (0 .. 100) {
+        for i in 0 .. 100 {
             m.insert(i.to_string(), i);
         }
         run_deserializer(deserializer::IsizeDeserializer::new(m.clone()), m)

testing/benches/bench_struct.rs

@@ -1,10 +1,12 @@
 use std::collections::HashMap;
 use test::Bencher;
+use std::fmt;
+use std::error;
 
-use rustc_serialize::{Decoder, Decodable};
+use rustc_serialize::Decodable;
 
 use serde;
-use serde::de::{Deserializer, Deserialize};
+use serde::de::Deserialize;
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -27,54 +29,57 @@ pub struct Outer {
 #[derive(Debug, PartialEq)]
 pub enum Error {
     EndOfStream,
-    SyntaxError,
+    Syntax,
     MissingField,
     OtherError,
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn custom<T: Into<String>>(_: T) -> Error { Error::Syntax }
 
     fn end_of_stream() -> Error { Error::EndOfStream }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field(_: &str) -> Error { Error::Syntax }
 
     fn missing_field(_: &'static str) -> Error {
         Error::MissingField
     }
 }
 
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(format!("{:?}", self).as_ref())
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Deserialization Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
 mod decoder {
     use std::collections::HashMap;
     use rustc_serialize::Decoder;
 
     use super::{Outer, Inner, Error};
 
-    use self::State::{
-        OuterState,
-        InnerState,
-        NullState,
-        UsizeState,
-        CharState,
-        StringState,
-        FieldState,
-        VecState,
-        MapState,
-        OptionState,
-    };
-
     #[derive(Debug)]
     enum State {
-        OuterState(Outer),
-        InnerState(Inner),
-        NullState,
-        UsizeState(usize),
-        CharState(char),
-        StringState(String),
-        FieldState(&'static str),
-        VecState(Vec<Inner>),
-        MapState(HashMap<String, Option<char>>),
-        OptionState(bool),
+        Outer(Outer),
+        Inner(Inner),
+        Null,
+        Usize(usize),
+        Char(char),
+        String(String),
+        Field(&'static str),
+        Vec(Vec<Inner>),
+        Map(HashMap<String, Option<char>>),
+        Option(bool),
     }
 
     pub struct OuterDecoder {
@@ -86,7 +91,7 @@ mod decoder {
         #[inline]
         pub fn new(animal: Outer) -> OuterDecoder {
             OuterDecoder {
-                stack: vec!(OuterState(animal)),
+                stack: vec!(State::Outer(animal)),
             }
         }
     }
@@ -102,41 +107,41 @@ mod decoder {
         #[inline]
         fn read_nil(&mut self) -> Result<(), Error> {
             match self.stack.pop() {
-                Some(NullState) => Ok(()),
-                _ => Err(Error::SyntaxError),
+                Some(State::Null) => Ok(()),
+                _ => Err(Error::Syntax),
             }
         }
         #[inline]
         fn read_usize(&mut self) -> Result<usize, Error> {
             match self.stack.pop() {
-                Some(UsizeState(value)) => Ok(value),
-                _ => Err(Error::SyntaxError),
+                Some(State::Usize(value)) => Ok(value),
+                _ => Err(Error::Syntax),
             }
         }
-        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::SyntaxError) }
-        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::SyntaxError) }
-        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::SyntaxError) }
-        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::SyntaxError) }
-        fn read_isize(&mut self) -> Result<isize, Error> { Err(Error::SyntaxError) }
-        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::SyntaxError) }
-        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::SyntaxError) }
-        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::SyntaxError) }
-        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::SyntaxError) }
-        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::SyntaxError) }
-        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::SyntaxError) }
-        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::SyntaxError) }
+        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::Syntax) }
+        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::Syntax) }
+        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::Syntax) }
+        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::Syntax) }
+        fn read_isize(&mut self) -> Result<isize, Error> { Err(Error::Syntax) }
+        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::Syntax) }
+        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::Syntax) }
+        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::Syntax) }
+        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::Syntax) }
+        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::Syntax) }
+        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::Syntax) }
+        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::Syntax) }
         #[inline]
         fn read_char(&mut self) -> Result<char, Error> {
             match self.stack.pop() {
-                Some(CharState(c)) => Ok(c),
-                _ => Err(Error::SyntaxError),
+                Some(State::Char(c)) => Ok(c),
+                _ => Err(Error::Syntax),
             }
         }
         #[inline]
         fn read_str(&mut self) -> Result<String, Error> {
             match self.stack.pop() {
-                Some(StringState(value)) => Ok(value),
-                _ => Err(Error::SyntaxError),
+                Some(State::String(value)) => Ok(value),
+                _ => Err(Error::Syntax),
             }
         }
 
@@ -144,31 +149,31 @@ mod decoder {
         fn read_enum<T, F>(&mut self, _name: &str, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         #[inline]
@@ -176,31 +181,31 @@ mod decoder {
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
             match self.stack.pop() {
-                Some(OuterState(Outer { inner })) => {
+                Some(State::Outer(Outer { inner })) => {
                     if s_name == "Outer" {
-                        self.stack.push(VecState(inner));
-                        self.stack.push(FieldState("inner"));
+                        self.stack.push(State::Vec(inner));
+                        self.stack.push(State::Field("inner"));
                         f(self)
                     } else {
-                        Err(Error::SyntaxError)
+                        Err(Error::Syntax)
                     }
                 }
-                Some(InnerState(Inner { a: (), b, c })) => {
+                Some(State::Inner(Inner { a: (), b, c })) => {
                     if s_name == "Inner" {
-                        self.stack.push(MapState(c));
-                        self.stack.push(FieldState("c"));
+                        self.stack.push(State::Map(c));
+                        self.stack.push(State::Field("c"));
 
-                        self.stack.push(UsizeState(b));
-                        self.stack.push(FieldState("b"));
+                        self.stack.push(State::Usize(b));
+                        self.stack.push(State::Field("b"));
 
-                        self.stack.push(NullState);
-                        self.stack.push(FieldState("a"));
+                        self.stack.push(State::Null);
+                        self.stack.push(State::Field("a"));
                         f(self)
                     } else {
-                        Err(Error::SyntaxError)
+                        Err(Error::Syntax)
                     }
                 }
-                _ => Err(Error::SyntaxError),
+                _ => Err(Error::Syntax),
             }
         }
         #[inline]
@@ -208,39 +213,39 @@ mod decoder {
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
             match self.stack.pop() {
-                Some(FieldState(name)) => {
+                Some(State::Field(name)) => {
                     if f_name == name {
                         f(self)
                     } else {
-                        Err(Error::SyntaxError)
+                        Err(Error::Syntax)
                     }
                 }
-                _ => Err(Error::SyntaxError)
+                _ => Err(Error::Syntax)
             }
         }
 
         fn read_tuple<T, F>(&mut self, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         // Specialized types:
@@ -249,8 +254,8 @@ mod decoder {
             F: FnOnce(&mut OuterDecoder, bool) -> Result<T, Error>,
         {
             match self.stack.pop() {
-                Some(OptionState(b)) => f(self, b),
-                _ => Err(Error::SyntaxError),
+                Some(State::Option(b)) => f(self, b),
+                _ => Err(Error::Syntax),
             }
         }
 
@@ -259,14 +264,14 @@ mod decoder {
             F: FnOnce(&mut OuterDecoder, usize) -> Result<T, Error>,
         {
             match self.stack.pop() {
-                Some(VecState(value)) => {
+                Some(State::Vec(value)) => {
                     let len = value.len();
                     for inner in value.into_iter().rev() {
-                        self.stack.push(InnerState(inner));
+                        self.stack.push(State::Inner(inner));
                     }
                     f(self, len)
                 }
-                _ => Err(Error::SyntaxError)
+                _ => Err(Error::Syntax)
             }
         }
         #[inline]
@@ -281,23 +286,23 @@ mod decoder {
             F: FnOnce(&mut OuterDecoder, usize) -> Result<T, Error>,
         {
             match self.stack.pop() {
-                Some(MapState(map)) => {
+                Some(State::Map(map)) => {
                     let len = map.len();
                     for (key, value) in map {
                         match value {
                             Some(c) => {
-                                self.stack.push(CharState(c));
-                                self.stack.push(OptionState(true));
+                                self.stack.push(State::Char(c));
+                                self.stack.push(State::Option(true));
                             }
                             None => {
-                                self.stack.push(OptionState(false));
+                                self.stack.push(State::Option(false));
                             }
                         }
-                        self.stack.push(StringState(key));
+                        self.stack.push(State::String(key));
                     }
                     f(self, len)
                 }
-                _ => Err(Error::SyntaxError),
+                _ => Err(Error::Syntax),
             }
         }
         #[inline]
@@ -328,16 +333,16 @@ mod deserializer {
 
     #[derive(Debug)]
     enum State {
-        OuterState(Outer),
-        InnerState(Inner),
-        StrState(&'static str),
-        NullState,
-        UsizeState(usize),
-        CharState(char),
-        StringState(String),
-        OptionState(bool),
-        VecState(Vec<Inner>),
-        MapState(HashMap<String, Option<char>>),
+        Outer(Outer),
+        Inner(Inner),
+        Str(&'static str),
+        Null,
+        Usize(usize),
+        Char(char),
+        String(String),
+        Option(bool),
+        Vec(Vec<Inner>),
+        Map(HashMap<String, Option<char>>),
     }
 
     pub struct OuterDeserializer {
@@ -348,7 +353,7 @@ mod deserializer {
         #[inline]
         pub fn new(outer: Outer) -> OuterDeserializer {
             OuterDeserializer {
-                stack: vec!(State::OuterState(outer)),
+                stack: vec!(State::Outer(outer)),
             }
         }
     }
@@ -356,81 +361,81 @@ mod deserializer {
     impl de::Deserializer for OuterDeserializer {
         type Error = Error;
 
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.stack.pop() {
-                Some(State::VecState(value)) => {
+                Some(State::Vec(value)) => {
                     visitor.visit_seq(OuterSeqVisitor {
                         de: self,
                         iter: value.into_iter(),
                     })
                 }
-                Some(State::MapState(value)) => {
+                Some(State::Map(value)) => {
                     visitor.visit_map(MapVisitor {
                         de: self,
                         iter: value.into_iter(),
                     })
                 }
-                Some(State::NullState) => {
+                Some(State::Null) => {
                     visitor.visit_unit()
                 }
-                Some(State::UsizeState(x)) => {
+                Some(State::Usize(x)) => {
                     visitor.visit_usize(x)
                 }
-                Some(State::CharState(x)) => {
+                Some(State::Char(x)) => {
                     visitor.visit_char(x)
                 }
-                Some(State::StrState(x)) => {
+                Some(State::Str(x)) => {
                     visitor.visit_str(x)
                 }
-                Some(State::StringState(x)) => {
+                Some(State::String(x)) => {
                     visitor.visit_string(x)
                 }
-                Some(State::OptionState(false)) => {
+                Some(State::Option(false)) => {
                     visitor.visit_none()
                 }
-                Some(State::OptionState(true)) => {
+                Some(State::Option(true)) => {
                     visitor.visit_some(self)
                 }
-                Some(_) => Err(Error::SyntaxError),
+                Some(_) => Err(Error::Syntax),
                 None => Err(Error::EndOfStream),
             }
         }
 
-        fn visit_struct<V>(&mut self,
+        fn deserialize_struct<V>(&mut self,
                            name: &str,
                            _fields: &'static [&'static str],
                            mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.stack.pop() {
-                Some(State::OuterState(Outer { inner })) => {
+                Some(State::Outer(Outer { inner })) => {
                     if name != "Outer" {
-                        return Err(Error::SyntaxError);
+                        return Err(Error::Syntax);
                     }
 
-                    self.stack.push(State::VecState(inner));
-                    self.stack.push(State::StrState("inner"));
+                    self.stack.push(State::Vec(inner));
+                    self.stack.push(State::Str("inner"));
 
                     visitor.visit_map(OuterMapVisitor {
                         de: self,
                         state: 0,
                     })
                 }
-                Some(State::InnerState(Inner { a: (), b, c })) => {
+                Some(State::Inner(Inner { a: (), b, c })) => {
                     if name != "Inner" {
-                        return Err(Error::SyntaxError);
+                        return Err(Error::Syntax);
                     }
 
-                    self.stack.push(State::MapState(c));
-                    self.stack.push(State::StrState("c"));
+                    self.stack.push(State::Map(c));
+                    self.stack.push(State::Str("c"));
 
-                    self.stack.push(State::UsizeState(b));
-                    self.stack.push(State::StrState("b"));
+                    self.stack.push(State::Usize(b));
+                    self.stack.push(State::Str("b"));
 
-                    self.stack.push(State::NullState);
-                    self.stack.push(State::StrState("a"));
+                    self.stack.push(State::Null);
+                    self.stack.push(State::Str("a"));
 
                     visitor.visit_map(InnerMapVisitor {
                         de: self,
@@ -438,7 +443,7 @@ mod deserializer {
                     })
                 }
                 _ => {
-                    Err(Error::SyntaxError)
+                    Err(Error::Syntax)
                 }
             }
         }
@@ -476,7 +481,7 @@ mod deserializer {
             if self.state == 1 {
                 Ok(())
             } else {
-                Err(Error::SyntaxError)
+                Err(Error::Syntax)
             }
         }
 
@@ -499,7 +504,7 @@ mod deserializer {
         {
             match self.iter.next() {
                 Some(value) => {
-                    self.de.stack.push(State::InnerState(value));
+                    self.de.stack.push(State::Inner(value));
                     Ok(Some(try!(de::Deserialize::deserialize(self.de))))
                 }
                 None => {
@@ -510,7 +515,7 @@ mod deserializer {
 
         fn end(&mut self) -> Result<(), Error> {
             match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
+                Some(_) => Err(Error::Syntax),
                 None => Ok(()),
             }
         }
@@ -552,7 +557,7 @@ mod deserializer {
             if self.state == 3 {
                 Ok(())
             } else {
-                Err(Error::SyntaxError)
+                Err(Error::Syntax)
             }
         }
 
@@ -575,14 +580,14 @@ mod deserializer {
         {
             match self.iter.next() {
                 Some((key, Some(value))) => {
-                    self.de.stack.push(State::CharState(value));
-                    self.de.stack.push(State::OptionState(true));
-                    self.de.stack.push(State::StringState(key));
+                    self.de.stack.push(State::Char(value));
+                    self.de.stack.push(State::Option(true));
+                    self.de.stack.push(State::String(key));
                     Ok(Some(try!(de::Deserialize::deserialize(self.de))))
                 }
                 Some((key, None)) => {
-                    self.de.stack.push(State::OptionState(false));
-                    self.de.stack.push(State::StringState(key));
+                    self.de.stack.push(State::Option(false));
+                    self.de.stack.push(State::String(key));
                     Ok(Some(try!(de::Deserialize::deserialize(self.de))))
                 }
                 None => {
@@ -599,7 +604,7 @@ mod deserializer {
 
         fn end(&mut self) -> Result<(), Error> {
             match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
+                Some(_) => Err(Error::Syntax),
                 None => Ok(()),
             }
         }
@@ -614,7 +619,7 @@ mod deserializer {
 fn bench_decoder_0_0(b: &mut Bencher) {
     b.iter(|| {
         let mut map = HashMap::new();
-        map.insert("abc".to_string(), Some('c'));
+        map.insert("abc".to_owned(), Some('c'));
 
         let outer = Outer {
             inner: vec!(),
@@ -653,11 +658,11 @@ fn bench_decoder_1_0(b: &mut Bencher) {
 fn bench_decoder_1_5(b: &mut Bencher) {
     b.iter(|| {
         let mut map = HashMap::new();
-        map.insert("1".to_string(), Some('a'));
-        map.insert("2".to_string(), None);
-        map.insert("3".to_string(), Some('b'));
-        map.insert("4".to_string(), None);
-        map.insert("5".to_string(), Some('c'));
+        map.insert("1".to_owned(), Some('a'));
+        map.insert("2".to_owned(), None);
+        map.insert("3".to_owned(), Some('b'));
+        map.insert("4".to_owned(), None);
+        map.insert("5".to_owned(), Some('c'));
 
         let outer = Outer {
             inner: vec!(
@@ -716,11 +721,11 @@ fn bench_deserializer_1_0(b: &mut Bencher) {
 fn bench_deserializer_1_5(b: &mut Bencher) {
     b.iter(|| {
         let mut map = HashMap::new();
-        map.insert("1".to_string(), Some('a'));
-        map.insert("2".to_string(), None);
-        map.insert("3".to_string(), Some('b'));
-        map.insert("4".to_string(), None);
-        map.insert("5".to_string(), Some('c'));
+        map.insert("1".to_owned(), Some('a'));
+        map.insert("2".to_owned(), None);
+        map.insert("3".to_owned(), Some('b'));
+        map.insert("4".to_owned(), None);
+        map.insert("5".to_owned(), Some('c'));
 
         let outer = Outer {
             inner: vec!(

testing/benches/bench_vec.rs

@@ -1,4 +1,6 @@
 use std::fmt::Debug;
+use std::fmt;
+use std::error;
 use test::Bencher;
 
 use rustc_serialize::{Decoder, Decodable};
@@ -10,20 +12,35 @@ use serde::de::{Deserializer, Deserialize};
 
 #[derive(PartialEq, Debug)]
 pub enum Error {
-    EndOfStreamError,
-    SyntaxError,
+    EndOfStream,
+    Syntax,
 }
 
 impl serde::de::Error for Error {
-    fn syntax(_: &str) -> Error { Error::SyntaxError }
+    fn custom<T: Into<String>>(_: T) -> Error { Error::Syntax }
 
-    fn end_of_stream() -> Error { Error::EndOfStreamError }
+    fn end_of_stream() -> Error { Error::EndOfStream }
 
-    fn unknown_field(_: &str) -> Error { Error::SyntaxError }
+    fn unknown_field(_: &str) -> Error { Error::Syntax }
 
-    fn missing_field(_: &'static str) -> Error { Error::SyntaxError }
+    fn missing_field(_: &'static str) -> Error { Error::Syntax }
 }
 
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(format!("{:?}", self).as_ref())
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Deserialization Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
 //////////////////////////////////////////////////////////////////////////////
 
 mod decoder {
@@ -50,104 +67,104 @@ mod decoder {
     impl rustc_serialize::Decoder for UsizeDecoder {
         type Error = Error;
 
-        fn error(&mut self, _: &str) -> Error { Error::SyntaxError }
+        fn error(&mut self, _: &str) -> Error { Error::Syntax }
 
         // Primitive types:
-        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::SyntaxError) }
+        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::Syntax) }
         #[inline]
         fn read_usize(&mut self) -> Result<usize, Error> {
             match self.iter.next() {
                 Some(value) => Ok(value),
-                None => Err(Error::EndOfStreamError),
+                None => Err(Error::EndOfStream),
             }
         }
-        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::SyntaxError) }
-        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::SyntaxError) }
-        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::SyntaxError) }
-        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::SyntaxError) }
-        fn read_isize(&mut self) -> Result<isize, Error> { Err(Error::SyntaxError) }
-        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::SyntaxError) }
-        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::SyntaxError) }
-        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::SyntaxError) }
-        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::SyntaxError) }
-        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::SyntaxError) }
-        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::SyntaxError) }
-        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::SyntaxError) }
-        fn read_char(&mut self) -> Result<char, Error> { Err(Error::SyntaxError) }
-        fn read_str(&mut self) -> Result<String, Error> { Err(Error::SyntaxError) }
+        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::Syntax) }
+        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::Syntax) }
+        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::Syntax) }
+        fn read_u8(&mut self) -> Result<u8, Error> { Err(Error::Syntax) }
+        fn read_isize(&mut self) -> Result<isize, Error> { Err(Error::Syntax) }
+        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::Syntax) }
+        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::Syntax) }
+        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::Syntax) }
+        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::Syntax) }
+        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::Syntax) }
+        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::Syntax) }
+        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::Syntax) }
+        fn read_char(&mut self) -> Result<char, Error> { Err(Error::Syntax) }
+        fn read_str(&mut self) -> Result<String, Error> { Err(Error::Syntax) }
 
         // Compound types:
         fn read_enum<T, F>(&mut self, _name: &str, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple<T, F>(&mut self, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         // Specialized types:
         fn read_option<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder, bool) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         #[inline]
@@ -167,19 +184,19 @@ mod decoder {
         fn read_map<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_map_elt_key<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_map_elt_val<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
     }
 
@@ -202,105 +219,105 @@ mod decoder {
     impl rustc_serialize::Decoder for U8Decoder {
         type Error = Error;
 
-        fn error(&mut self, _: &str) -> Error { Error::SyntaxError }
+        fn error(&mut self, _: &str) -> Error { Error::Syntax }
 
         // Primitive types:
-        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::SyntaxError) }
-        fn read_usize(&mut self) -> Result<usize, Error> { Err(Error::SyntaxError) }
-        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::SyntaxError) }
-        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::SyntaxError) }
-        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::SyntaxError) }
+        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::Syntax) }
+        fn read_usize(&mut self) -> Result<usize, Error> { Err(Error::Syntax) }
+        fn read_u64(&mut self) -> Result<u64, Error> { Err(Error::Syntax) }
+        fn read_u32(&mut self) -> Result<u32, Error> { Err(Error::Syntax) }
+        fn read_u16(&mut self) -> Result<u16, Error> { Err(Error::Syntax) }
         #[inline]
         fn read_u8(&mut self) -> Result<u8, Error> {
             match self.iter.next() {
                 Some(value) => Ok(value),
-                None => Err(Error::EndOfStreamError),
+                None => Err(Error::EndOfStream),
             }
         }
         #[inline]
-        fn read_isize(&mut self) -> Result<isize, Error> { Err(Error::SyntaxError) }
-        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::SyntaxError) }
-        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::SyntaxError) }
-        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::SyntaxError) }
-        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::SyntaxError) }
-        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::SyntaxError) }
-        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::SyntaxError) }
-        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::SyntaxError) }
-        fn read_char(&mut self) -> Result<char, Error> { Err(Error::SyntaxError) }
-        fn read_str(&mut self) -> Result<String, Error> { Err(Error::SyntaxError) }
+        fn read_isize(&mut self) -> Result<isize, Error> { Err(Error::Syntax) }
+        fn read_i64(&mut self) -> Result<i64, Error> { Err(Error::Syntax) }
+        fn read_i32(&mut self) -> Result<i32, Error> { Err(Error::Syntax) }
+        fn read_i16(&mut self) -> Result<i16, Error> { Err(Error::Syntax) }
+        fn read_i8(&mut self) -> Result<i8, Error> { Err(Error::Syntax) }
+        fn read_bool(&mut self) -> Result<bool, Error> { Err(Error::Syntax) }
+        fn read_f64(&mut self) -> Result<f64, Error> { Err(Error::Syntax) }
+        fn read_f32(&mut self) -> Result<f32, Error> { Err(Error::Syntax) }
+        fn read_char(&mut self) -> Result<char, Error> { Err(Error::Syntax) }
+        fn read_str(&mut self) -> Result<String, Error> { Err(Error::Syntax) }
 
         // Compound types:
         fn read_enum<T, F>(&mut self, _name: &str, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant<T, F>(&mut self, _names: &[&str], _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple<T, F>(&mut self, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct<T, F>(&mut self, _s_name: &str, _len: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_tuple_struct_arg<T, F>(&mut self, _a_idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         // Specialized types:
         fn read_option<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder, bool) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         #[inline]
@@ -320,19 +337,19 @@ mod decoder {
         fn read_map<T, F>(&mut self, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder, usize) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_map_elt_key<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
 
         fn read_map_elt_val<T, F>(&mut self, _idx: usize, _f: F) -> Result<T, Error> where
             F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
         {
-            Err(Error::SyntaxError)
+            Err(Error::Syntax)
         }
     }
 }
@@ -349,9 +366,9 @@ mod deserializer {
 
     #[derive(PartialEq, Debug)]
     enum State {
-        StartState,
-        SepOrEndState,
-        EndState,
+        Start,
+        SepOrEnd,
+        End,
     }
 
     pub struct Deserializer<A> {
@@ -366,7 +383,7 @@ mod deserializer {
         pub fn new(values: Vec<A>) -> Deserializer<A> {
             let len = values.len();
             Deserializer {
-                state: State::StartState,
+                state: State::Start,
                 iter: values.into_iter(),
                 len: len,
                 value: None,
@@ -378,19 +395,19 @@ mod deserializer {
         type Error = Error;
 
         #[inline]
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.state {
-                State::StartState => {
-                    self.state = State::SepOrEndState;
+                State::Start => {
+                    self.state = State::SepOrEnd;
                     visitor.visit_seq(self)
                 }
-                State::SepOrEndState => {
+                State::SepOrEnd => {
                     visitor.visit_usize(self.value.take().unwrap())
                 }
-                State::EndState => {
-                    Err(Error::EndOfStreamError)
+                State::End => {
+                    Err(Error::EndOfStream)
                 }
             }
         }
@@ -410,7 +427,7 @@ mod deserializer {
                     Ok(Some(try!(de::Deserialize::deserialize(self))))
                 }
                 None => {
-                    self.state = State::EndState;
+                    self.state = State::End;
                     Ok(None)
                 }
             }
@@ -419,9 +436,9 @@ mod deserializer {
         #[inline]
         fn end(&mut self) -> Result<(), Error> {
             match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
+                Some(_) => Err(Error::Syntax),
                 None => {
-                    self.state = State::EndState;
+                    self.state = State::End;
                     Ok(())
                 }
             }
@@ -437,19 +454,19 @@ mod deserializer {
         type Error = Error;
 
         #[inline]
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
             where V: de::Visitor,
         {
             match self.state {
-                State::StartState => {
-                    self.state = State::SepOrEndState;
+                State::Start => {
+                    self.state = State::SepOrEnd;
                     visitor.visit_seq(self)
                 }
-                State::SepOrEndState => {
+                State::SepOrEnd => {
                     visitor.visit_u8(self.value.take().unwrap())
                 }
-                State::EndState => {
-                    Err(Error::EndOfStreamError)
+                State::End => {
+                    Err(Error::EndOfStream)
                 }
             }
         }
@@ -469,7 +486,7 @@ mod deserializer {
                     Ok(Some(try!(de::Deserialize::deserialize(self))))
                 }
                 None => {
-                    self.state = State::EndState;
+                    self.state = State::End;
                     Ok(None)
                 }
             }
@@ -478,9 +495,9 @@ mod deserializer {
         #[inline]
         fn end(&mut self) -> Result<(), Error> {
             match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
+                Some(_) => Err(Error::Syntax),
                 None => {
-                    self.state = State::EndState;
+                    self.state = State::End;
                     Ok(())
                 }
             }

testing/build.rs

@@ -1,4 +1,3 @@
-extern crate syntex;
 extern crate serde_codegen;
 
 use std::env;
@@ -13,10 +12,6 @@ fn main() {
     ] {
         let src = Path::new(src);
         let dst = Path::new(&out_dir).join(dst);
-
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }

testing/tests/macros.rs

@@ -5,7 +5,7 @@ macro_rules! declare_ser_tests {
             #[test]
             fn $name() {
                 $(
-                    ::token::assert_ser_tokens(&$value, $tokens);
+                    assert_ser_tokens(&$value, $tokens);
                 )+
             }
         )+
@@ -62,6 +62,14 @@ macro_rules! hashset {
             $(set.insert($value);)+
             set
         }
+    };
+    ($hasher:ident @ $($value:expr),+) => {
+        {
+            use std::hash::BuildHasherDefault;
+            let mut set = HashSet::with_hasher(BuildHasherDefault::<$hasher>::default());
+            $(set.insert($value);)+
+            set
+        }
     }
 }
 
@@ -75,5 +83,13 @@ macro_rules! hashmap {
             $(map.insert($key, $value);)+
             map
         }
+    };
+    ($hasher:ident @ $($key:expr => $value:expr),+) => {
+        {
+            use std::hash::BuildHasherDefault;
+            let mut map = HashMap::with_hasher(BuildHasherDefault::<$hasher>::default());
+            $(map.insert($key, $value);)+
+            map
+        }
     }
 }

testing/tests/test.rs

@@ -0,0 +1,4 @@
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+
+include!(concat!(env!("OUT_DIR"), "/test.rs"));

testing/tests/test.rs.in

@@ -1,10 +1,11 @@
+extern crate serde;
+
 #[macro_use]
 mod macros;
 
-mod token;
-
 mod test_annotations;
 mod test_bytes;
 mod test_de;
+mod test_gen;
 mod test_macros;
 mod test_ser;

testing/tests/test_annotations.rs

@@ -0,0 +1,976 @@
+extern crate serde;
+use self::serde::{Serialize, Serializer, Deserialize, Deserializer};
+
+extern crate serde_test;
+use self::serde_test::{
+    Error,
+    Token,
+    assert_tokens,
+    assert_ser_tokens,
+    assert_de_tokens,
+    assert_de_tokens_error
+};
+
+trait MyDefault: Sized {
+    fn my_default() -> Self;
+}
+
+trait ShouldSkip: Sized {
+    fn should_skip(&self) -> bool;
+}
+
+trait SerializeWith: Sized {
+    fn serialize_with<S>(&self, ser: &mut S) -> Result<(), S::Error>
+        where S: Serializer;
+}
+
+trait DeserializeWith: Sized {
+    fn deserialize_with<D>(de: &mut D) -> Result<Self, D::Error>
+        where D: Deserializer;
+}
+
+impl MyDefault for i32 {
+    fn my_default() -> Self { 123 }
+}
+
+impl ShouldSkip for i32 {
+    fn should_skip(&self) -> bool { *self == 123 }
+}
+
+impl SerializeWith for i32 {
+    fn serialize_with<S>(&self, ser: &mut S) -> Result<(), S::Error>
+        where S: Serializer
+    {
+        if *self == 123 {
+            true.serialize(ser)
+        } else {
+            false.serialize(ser)
+        }
+    }
+}
+
+impl DeserializeWith for i32 {
+    fn deserialize_with<D>(de: &mut D) -> Result<Self, D::Error>
+        where D: Deserializer
+    {
+        if try!(Deserialize::deserialize(de)) {
+            Ok(123)
+        } else {
+            Ok(2)
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+struct DefaultStruct<A, B, C, D, E>
+    where C: MyDefault,
+          E: MyDefault,
+{
+    a1: A,
+    #[serde(default)]
+    a2: B,
+    #[serde(default="MyDefault::my_default")]
+    a3: C,
+    #[serde(skip_deserializing)]
+    a4: D,
+    #[serde(skip_deserializing, default="MyDefault::my_default")]
+    a5: E,
+}
+
+#[test]
+fn test_default_struct() {
+    assert_de_tokens(
+        &DefaultStruct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
+        &[
+            Token::StructStart("DefaultStruct", 3),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructSep,
+            Token::Str("a2"),
+            Token::I32(2),
+
+            Token::StructSep,
+            Token::Str("a3"),
+            Token::I32(3),
+
+            Token::StructSep,
+            Token::Str("a4"),
+            Token::I32(4),
+
+            Token::StructSep,
+            Token::Str("a5"),
+            Token::I32(5),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &DefaultStruct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 },
+        &[
+            Token::StructStart("DefaultStruct", 1),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+enum DefaultEnum<A, B, C, D, E>
+    where C: MyDefault,
+          E: MyDefault
+{
+    Struct {
+        a1: A,
+        #[serde(default)]
+        a2: B,
+        #[serde(default="MyDefault::my_default")]
+        a3: C,
+        #[serde(skip_deserializing)]
+        a4: D,
+        #[serde(skip_deserializing, default="MyDefault::my_default")]
+        a5: E,
+    }
+}
+
+#[test]
+fn test_default_enum() {
+    assert_de_tokens(
+        &DefaultEnum::Struct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
+        &[
+            Token::EnumMapStart("DefaultEnum", "Struct", 5),
+
+            Token::EnumMapSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::EnumMapSep,
+            Token::Str("a2"),
+            Token::I32(2),
+
+            Token::EnumMapSep,
+            Token::Str("a3"),
+            Token::I32(3),
+
+            Token::EnumMapSep,
+            Token::Str("a4"),
+            Token::I32(4),
+
+            Token::EnumMapSep,
+            Token::Str("a5"),
+            Token::I32(5),
+
+            Token::EnumMapEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &DefaultEnum::Struct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 },
+        &[
+            Token::EnumMapStart("DefaultEnum", "Struct", 5),
+
+            Token::EnumMapSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::EnumMapEnd,
+        ]
+    );
+}
+
+// Does not implement std::default::Default.
+#[derive(Debug, PartialEq, Deserialize)]
+struct NoStdDefault(i8);
+
+impl MyDefault for NoStdDefault {
+    fn my_default() -> Self {
+        NoStdDefault(123)
+    }
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+struct ContainsNoStdDefault<A: MyDefault> {
+    #[serde(default="MyDefault::my_default")]
+    a: A,
+}
+
+// Tests that a struct field does not need to implement std::default::Default if
+// it is annotated with `default=...`.
+#[test]
+fn test_no_std_default() {
+    assert_de_tokens(
+        &ContainsNoStdDefault { a: NoStdDefault(123) },
+        &[
+            Token::StructStart("ContainsNoStdDefault", 1),
+            Token::StructEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &ContainsNoStdDefault { a: NoStdDefault(8) },
+        &[
+            Token::StructStart("ContainsNoStdDefault", 1),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::StructNewType("NoStdDefault"),
+            Token::I8(8),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+// Does not implement Deserialize.
+#[derive(Debug, PartialEq)]
+struct NotDeserializeStruct(i8);
+
+impl Default for NotDeserializeStruct {
+    fn default() -> Self {
+        NotDeserializeStruct(123)
+    }
+}
+
+impl DeserializeWith for NotDeserializeStruct {
+    fn deserialize_with<D>(_: &mut D) -> Result<Self, D::Error>
+        where D: Deserializer
+    {
+        panic!()
+    }
+}
+
+// Does not implement Deserialize.
+#[derive(Debug, PartialEq)]
+enum NotDeserializeEnum { Trouble }
+
+impl MyDefault for NotDeserializeEnum {
+    fn my_default() -> Self {
+        NotDeserializeEnum::Trouble
+    }
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+struct ContainsNotDeserialize<A, B, C: DeserializeWith, E: MyDefault> {
+    #[serde(skip_deserializing)]
+    a: A,
+    #[serde(skip_deserializing, default)]
+    b: B,
+    #[serde(deserialize_with="DeserializeWith::deserialize_with", default)]
+    c: C,
+    #[serde(skip_deserializing, default="MyDefault::my_default")]
+    e: E,
+}
+
+// Tests that a struct field does not need to implement Deserialize if it is
+// annotated with skip_deserializing, whether using the std Default or a
+// custom default.
+#[test]
+fn test_elt_not_deserialize() {
+    assert_de_tokens(
+        &ContainsNotDeserialize {
+            a: NotDeserializeStruct(123),
+            b: NotDeserializeStruct(123),
+            c: NotDeserializeStruct(123),
+            e: NotDeserializeEnum::Trouble,
+        },
+        &[
+            Token::StructStart("ContainsNotDeserialize", 3),
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+struct DenyUnknown {
+    a1: i32,
+}
+
+#[test]
+fn test_ignore_unknown() {
+    // 'Default' allows unknown. Basic smoke test of ignore...
+    assert_de_tokens(
+        &DefaultStruct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
+        &[
+            Token::StructStart("DefaultStruct", 5),
+
+            Token::StructSep,
+            Token::Str("whoops1"),
+            Token::I32(2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructSep,
+            Token::Str("whoops2"),
+            Token::SeqStart(Some(1)),
+            Token::SeqSep,
+            Token::I32(2),
+            Token::SeqEnd,
+
+            Token::StructSep,
+            Token::Str("a2"),
+            Token::I32(2),
+
+            Token::StructSep,
+            Token::Str("whoops3"),
+            Token::I32(2),
+
+            Token::StructSep,
+            Token::Str("a3"),
+            Token::I32(3),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_de_tokens_error::<DenyUnknown>(
+        &[
+            Token::StructStart("DenyUnknown", 2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructSep,
+            Token::Str("whoops"),
+        ],
+        Error::UnknownField("whoops".to_owned())
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename="Superhero")]
+struct RenameStruct {
+    a1: i32,
+    #[serde(rename="a3")]
+    a2: i32,
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename(serialize="SuperheroSer", deserialize="SuperheroDe"))]
+struct RenameStructSerializeDeserialize {
+    a1: i32,
+    #[serde(rename(serialize="a4", deserialize="a5"))]
+    a2: i32,
+}
+
+#[test]
+fn test_rename_struct() {
+    assert_tokens(
+        &RenameStruct { a1: 1, a2: 2 },
+        &[
+            Token::StructStart("Superhero", 2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructSep,
+            Token::Str("a3"),
+            Token::I32(2),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_ser_tokens(
+        &RenameStructSerializeDeserialize { a1: 1, a2: 2 },
+        &[
+            Token::StructStart("SuperheroSer", 2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructSep,
+            Token::Str("a4"),
+            Token::I32(2),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &RenameStructSerializeDeserialize { a1: 1, a2: 2 },
+        &[
+            Token::StructStart("SuperheroDe", 2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructSep,
+            Token::Str("a5"),
+            Token::I32(2),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename="Superhero")]
+enum RenameEnum {
+    #[serde(rename="bruce_wayne")]
+    Batman,
+    #[serde(rename="clark_kent")]
+    Superman(i8),
+    #[serde(rename="diana_prince")]
+    WonderWoman(i8, i8),
+    #[serde(rename="barry_allan")]
+    Flash {
+        #[serde(rename="b")]
+        a: i32,
+    },
+}
+
+#[derive(Debug, PartialEq, Deserialize, Serialize)]
+#[serde(rename(serialize="SuperheroSer", deserialize="SuperheroDe"))]
+enum RenameEnumSerializeDeserialize<A> {
+    #[serde(rename(serialize="dick_grayson", deserialize="jason_todd"))]
+    Robin {
+        a: i8,
+        #[serde(rename(serialize="c"))]
+        #[serde(rename(deserialize="d"))]
+        b: A,
+    },
+}
+
+#[test]
+fn test_rename_enum() {
+    assert_tokens(
+        &RenameEnum::Batman,
+        &[
+            Token::EnumUnit("Superhero", "bruce_wayne"),
+        ]
+    );
+
+    assert_tokens(
+        &RenameEnum::Superman(0),
+        &[
+            Token::EnumNewType("Superhero", "clark_kent"),
+            Token::I8(0),
+        ]
+    );
+
+    assert_tokens(
+        &RenameEnum::WonderWoman(0, 1),
+        &[
+            Token::EnumSeqStart("Superhero", "diana_prince", 2),
+
+            Token::EnumSeqSep,
+            Token::I8(0),
+
+            Token::EnumSeqSep,
+            Token::I8(1),
+
+            Token::EnumSeqEnd,
+        ]
+    );
+
+    assert_tokens(
+        &RenameEnum::Flash { a: 1 },
+        &[
+            Token::EnumMapStart("Superhero", "barry_allan", 1),
+
+            Token::EnumMapSep,
+            Token::Str("b"),
+            Token::I32(1),
+
+            Token::EnumMapEnd,
+        ]
+    );
+
+    assert_ser_tokens(
+        &RenameEnumSerializeDeserialize::Robin {
+            a: 0,
+            b: String::new(),
+        },
+        &[
+            Token::EnumMapStart("SuperheroSer", "dick_grayson", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(0),
+
+            Token::EnumMapSep,
+            Token::Str("c"),
+            Token::Str(""),
+
+            Token::EnumMapEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &RenameEnumSerializeDeserialize::Robin {
+            a: 0,
+            b: String::new(),
+        },
+        &[
+            Token::EnumMapStart("SuperheroDe", "jason_todd", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(0),
+
+            Token::EnumMapSep,
+            Token::Str("d"),
+            Token::Str(""),
+
+            Token::EnumMapEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+struct SkipSerializingStruct<'a, B, C> where C: ShouldSkip {
+    a: &'a i8,
+    #[serde(skip_serializing)]
+    b: B,
+    #[serde(skip_serializing_if="ShouldSkip::should_skip")]
+    c: C,
+}
+
+#[test]
+fn test_skip_serializing_struct() {
+    let a = 1;
+    assert_ser_tokens(
+        &SkipSerializingStruct {
+            a: &a,
+            b: 2,
+            c: 3,
+        },
+        &[
+            Token::StructStart("SkipSerializingStruct", 2),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::StructSep,
+            Token::Str("c"),
+            Token::I32(3),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_ser_tokens(
+        &SkipSerializingStruct {
+            a: &a,
+            b: 2,
+            c: 123,
+        },
+        &[
+            Token::StructStart("SkipSerializingStruct", 1),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+enum SkipSerializingEnum<'a, B, C> where C: ShouldSkip {
+    Struct {
+        a: &'a i8,
+        #[serde(skip_serializing)]
+        _b: B,
+        #[serde(skip_serializing_if="ShouldSkip::should_skip")]
+        c: C,
+    }
+}
+
+#[test]
+fn test_skip_serializing_enum() {
+    let a = 1;
+    assert_ser_tokens(
+        &SkipSerializingEnum::Struct {
+            a: &a,
+            _b: 2,
+            c: 3,
+        },
+        &[
+            Token::EnumMapStart("SkipSerializingEnum", "Struct", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::EnumMapSep,
+            Token::Str("c"),
+            Token::I32(3),
+
+            Token::EnumMapEnd,
+        ]
+    );
+
+    assert_ser_tokens(
+        &SkipSerializingEnum::Struct {
+            a: &a,
+            _b: 2,
+            c: 123,
+        },
+        &[
+            Token::EnumMapStart("SkipSerializingEnum", "Struct", 1),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::EnumMapEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq)]
+struct NotSerializeStruct(i8);
+
+#[derive(Debug, PartialEq)]
+enum NotSerializeEnum { Trouble }
+
+impl SerializeWith for NotSerializeEnum {
+    fn serialize_with<S>(&self, ser: &mut S) -> Result<(), S::Error>
+        where S: Serializer
+    {
+        "trouble".serialize(ser)
+    }
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+struct ContainsNotSerialize<'a, B, C, D> where B: 'a, D: SerializeWith {
+    a: &'a Option<i8>,
+    #[serde(skip_serializing)]
+    b: &'a B,
+    #[serde(skip_serializing)]
+    c: Option<C>,
+    #[serde(serialize_with="SerializeWith::serialize_with")]
+    d: D,
+}
+
+#[test]
+fn test_elt_not_serialize() {
+    let a = 1;
+    assert_ser_tokens(
+        &ContainsNotSerialize {
+            a: &Some(a),
+            b: &NotSerializeStruct(2),
+            c: Some(NotSerializeEnum::Trouble),
+            d: NotSerializeEnum::Trouble,
+        },
+        &[
+            Token::StructStart("ContainsNotSerialize", 2),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::Option(true),
+            Token::I8(1),
+
+            Token::StructSep,
+            Token::Str("d"),
+            Token::Str("trouble"),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+struct SerializeWithStruct<'a, B> where B: SerializeWith {
+    a: &'a i8,
+    #[serde(serialize_with="SerializeWith::serialize_with")]
+    b: B,
+}
+
+#[test]
+fn test_serialize_with_struct() {
+    let a = 1;
+    assert_ser_tokens(
+        &SerializeWithStruct {
+            a: &a,
+            b: 2,
+        },
+        &[
+            Token::StructStart("SerializeWithStruct", 2),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::StructSep,
+            Token::Str("b"),
+            Token::Bool(false),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_ser_tokens(
+        &SerializeWithStruct {
+            a: &a,
+            b: 123,
+        },
+        &[
+            Token::StructStart("SerializeWithStruct", 2),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::StructSep,
+            Token::Str("b"),
+            Token::Bool(true),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+enum SerializeWithEnum<'a, B> where B: SerializeWith {
+    Struct {
+        a: &'a i8,
+        #[serde(serialize_with="SerializeWith::serialize_with")]
+        b: B,
+    }
+}
+
+#[test]
+fn test_serialize_with_enum() {
+    let a = 1;
+    assert_ser_tokens(
+        &SerializeWithEnum::Struct {
+            a: &a,
+            b: 2,
+        },
+        &[
+            Token::EnumMapStart("SerializeWithEnum", "Struct", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::EnumMapSep,
+            Token::Str("b"),
+            Token::Bool(false),
+
+            Token::EnumMapEnd,
+        ]
+    );
+
+    assert_ser_tokens(
+        &SerializeWithEnum::Struct {
+            a: &a,
+            b: 123,
+        },
+        &[
+            Token::EnumMapStart("SerializeWithEnum", "Struct", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::EnumMapSep,
+            Token::Str("b"),
+            Token::Bool(true),
+
+            Token::EnumMapEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+struct DeserializeWithStruct<B> where B: DeserializeWith {
+    a: i8,
+    #[serde(deserialize_with="DeserializeWith::deserialize_with")]
+    b: B,
+}
+
+#[test]
+fn test_deserialize_with_struct() {
+    assert_de_tokens(
+        &DeserializeWithStruct {
+            a: 1,
+            b: 2,
+        },
+        &[
+            Token::StructStart("DeserializeWithStruct", 2),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::StructSep,
+            Token::Str("b"),
+            Token::Bool(false),
+
+            Token::StructEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &DeserializeWithStruct {
+            a: 1,
+            b: 123,
+        },
+        &[
+            Token::StructStart("DeserializeWithStruct", 2),
+
+            Token::StructSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::StructSep,
+            Token::Str("b"),
+            Token::Bool(true),
+
+            Token::StructEnd,
+        ]
+    );
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+enum DeserializeWithEnum<B> where B: DeserializeWith {
+    Struct {
+        a: i8,
+        #[serde(deserialize_with="DeserializeWith::deserialize_with")]
+        b: B,
+    }
+}
+
+#[test]
+fn test_deserialize_with_enum() {
+    assert_de_tokens(
+        &DeserializeWithEnum::Struct {
+            a: 1,
+            b: 2,
+        },
+        &[
+            Token::EnumMapStart("DeserializeWithEnum", "Struct", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::EnumMapSep,
+            Token::Str("b"),
+            Token::Bool(false),
+
+            Token::EnumMapEnd,
+        ]
+    );
+
+    assert_de_tokens(
+        &DeserializeWithEnum::Struct {
+            a: 1,
+            b: 123,
+        },
+        &[
+            Token::EnumMapStart("DeserializeWithEnum", "Struct", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(1),
+
+            Token::EnumMapSep,
+            Token::Str("b"),
+            Token::Bool(true),
+
+            Token::EnumMapEnd,
+        ]
+    );
+}
+
+#[test]
+fn test_missing_renamed_field_struct() {
+    assert_de_tokens_error::<RenameStruct>(
+        &[
+            Token::StructStart("Superhero", 2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructEnd,
+        ],
+        Error::MissingField("a3"),
+    );
+
+    assert_de_tokens_error::<RenameStructSerializeDeserialize>(
+        &[
+            Token::StructStart("SuperheroDe", 2),
+
+            Token::StructSep,
+            Token::Str("a1"),
+            Token::I32(1),
+
+            Token::StructEnd,
+        ],
+        Error::MissingField("a5"),
+    );
+}
+
+#[test]
+fn test_missing_renamed_field_enum() {
+    assert_de_tokens_error::<RenameEnum>(
+        &[
+            Token::EnumMapStart("Superhero", "barry_allan", 1),
+
+            Token::EnumMapEnd,
+        ],
+        Error::MissingField("b"),
+    );
+
+    assert_de_tokens_error::<RenameEnumSerializeDeserialize<i8>>(
+        &[
+            Token::EnumMapStart("SuperheroDe", "jason_todd", 2),
+
+            Token::EnumMapSep,
+            Token::Str("a"),
+            Token::I8(0),
+
+            Token::EnumMapEnd,
+        ],
+        Error::MissingField("d"),
+    );
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+enum InvalidLengthEnum {
+    A(i32, i32, i32),
+    B(#[serde(skip_deserializing)] i32, i32, i32),
+}
+
+#[test]
+fn test_invalid_length_enum() {
+    assert_de_tokens_error::<InvalidLengthEnum>(
+        &[
+            Token::EnumSeqStart("InvalidLengthEnum", "A", 3),
+                Token::EnumSeqSep,
+                Token::I32(1),
+            Token::EnumSeqEnd,
+        ],
+        Error::InvalidLength(1),
+    );
+    assert_de_tokens_error::<InvalidLengthEnum>(
+        &[
+            Token::EnumSeqStart("InvalidLengthEnum", "B", 3),
+                Token::EnumSeqSep,
+                Token::I32(1),
+            Token::EnumSeqEnd,
+        ],
+        Error::InvalidLength(1),
+    );
+}

testing/tests/test_bytes.rs

@@ -0,0 +1,460 @@
+use std::fmt;
+use std::error;
+
+use serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::bytes::{ByteBuf, Bytes};
+use serde::ser;
+use serde::de;
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, PartialEq)]
+struct Error;
+
+impl ser::Error for Error {
+    fn custom<T: Into<String>>(_: T) -> Error { Error }
+}
+
+impl de::Error for Error {
+    fn custom<T: Into<String>>(_: T) -> Error { Error }
+
+    fn end_of_stream() -> Error { Error }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(format!("{:?}", self).as_ref())
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "Serde Deserialization Error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct BytesSerializer {
+    bytes: Vec<u8>,
+}
+
+impl BytesSerializer {
+    fn new(bytes: Vec<u8>) -> Self {
+        BytesSerializer {
+            bytes: bytes,
+        }
+    }
+}
+
+impl Serializer for BytesSerializer {
+    type Error = Error;
+    type SeqState = ();
+    type MapState = ();
+    type TupleState = ();
+    type TupleStructState = ();
+    type TupleVariantState = ();
+    type StructState = ();
+    type StructVariantState = ();
+
+    fn serialize_unit(&mut self) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_unit_struct(&mut self, _name: &'static str) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_unit_variant(&mut self, _: &'static str, _: usize, _: &'static str) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_bool(&mut self, _v: bool) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_isize(&mut self, _v: isize) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_usize(&mut self, _v: usize) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_i8(&mut self, _v: i8) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_u8(&mut self, _v: u8) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_i16(&mut self, _v: i16) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_u16(&mut self, _v: u16) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_i32(&mut self, _v: i32) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_u32(&mut self, _v: u32) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_i64(&mut self, _v: i64) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_u64(&mut self, _v: u64) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_f32(&mut self, _v: f32) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_f64(&mut self, _v: f64) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_char(&mut self, _v: char) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_str(&mut self, _v: &str) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_none(&mut self) -> Result<(), Error> {
+        Err(Error)
+    }
+
+    fn serialize_some<V>(&mut self, _value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        Err(Error)
+    }
+
+    fn serialize_newtype_struct<V>(&mut self, _: &'static str, _value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        Err(Error)
+    }
+
+    fn serialize_newtype_variant<V>(&mut self, _: &'static str, _: usize, _: &'static str, _value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        Err(Error)
+    }
+
+    fn serialize_seq(&mut self, _len: Option<usize>) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_seq_fixed_size(&mut self, _len: usize) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_seq_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_seq_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple(&mut self, _len: usize) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_struct(&mut self, _: &'static str, _len: usize) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_struct_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_struct_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_variant(&mut self, _: &'static str, _: usize, _: &'static str, _len: usize) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_variant_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_tuple_variant_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_map(&mut self, _: Option<usize>) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_map_key<T>(&mut self, _: &mut (), _key: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_map_value<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_map_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_struct(&mut self, _: &'static str, _: usize) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_struct_elt<V>(&mut self, _: &mut (), _key: &'static str, _value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        Err(Error)
+    }
+
+    fn serialize_struct_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_struct_variant(&mut self, _: &'static str, _: usize, _: &'static str, _: usize) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_struct_variant_elt<V>(&mut self, _: &mut (), _key: &'static str, _value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        Err(Error)
+    }
+
+    fn serialize_struct_variant_end(&mut self, _: ()) -> Result<(), Error>
+    {
+        Err(Error)
+    }
+
+    fn serialize_bytes(&mut self, bytes: &[u8]) -> Result<(), Error> {
+        assert_eq!(self.bytes, bytes);
+        Ok(())
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct BytesDeserializer {
+    bytes: Option<Vec<u8>>,
+}
+
+impl BytesDeserializer {
+    fn new(bytes: Vec<u8>) -> Self {
+        BytesDeserializer {
+            bytes: Some(bytes),
+        }
+    }
+}
+
+impl Deserializer for BytesDeserializer {
+    type Error = Error;
+
+    fn deserialize<V>(&mut self, _visitor: V) -> Result<V::Value, Error>
+        where V: de::Visitor,
+    {
+        Err(Error)
+    }
+
+    fn deserialize_bytes<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
+        where V: de::Visitor,
+    {
+        visitor.visit_byte_buf(self.bytes.take().unwrap())
+    }
+
+    fn deserialize_seq<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_struct_field<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_map<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_unit<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_ignored_any<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_string<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_str<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_char<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_bool<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_usize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_isize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_option<__V>(&mut self, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_seq_fixed_size<__V>(&mut self, _: usize, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_unit_struct<__V>(&mut self, _: &str, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_newtype_struct<__V>(&mut self, _: &str, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_tuple_struct<__V>(&mut self, _: &str, _: usize, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_struct<__V>(&mut self, _: &str, _: &[&str], visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_tuple<__V>(&mut self, _: usize, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::EnumVisitor {
+        Err(Error)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[test]
+fn test_bytes_ser_bytes() {
+    let buf = vec![];
+    let bytes = Bytes::from(&buf);
+    let mut ser = BytesSerializer::new(vec![]);
+    bytes.serialize(&mut ser).unwrap();
+
+    let buf = vec![1, 2, 3];
+    let bytes = Bytes::from(&buf);
+    let mut ser = BytesSerializer::new(vec![1, 2, 3]);
+    bytes.serialize(&mut ser).unwrap();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[test]
+fn test_byte_buf_de_bytes() {
+    let mut de = BytesDeserializer::new(vec![]);
+    let bytes = Deserialize::deserialize(&mut de);
+    assert_eq!(bytes, Ok(ByteBuf::new()));
+
+    let mut de = BytesDeserializer::new(vec![1, 2, 3]);
+    let bytes = Deserialize::deserialize(&mut de);
+    assert_eq!(bytes, Ok(ByteBuf::from(vec![1, 2, 3])));
+}

testing/tests/test_de.rs

@@ -0,0 +1,838 @@
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
+use std::net;
+use std::path::PathBuf;
+use std::time::Duration;
+
+use serde::Deserialize;
+
+extern crate fnv;
+use self::fnv::FnvHasher;
+
+extern crate serde_test;
+use self::serde_test::{
+    Error,
+    Token,
+    assert_de_tokens,
+    assert_de_tokens_error,
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+#[derive(Copy, Clone, PartialEq, Debug, Deserialize)]
+struct UnitStruct;
+
+#[derive(PartialEq, Debug, Deserialize)]
+struct TupleStruct(i32, i32, i32);
+
+#[derive(PartialEq, Debug, Deserialize)]
+struct Struct {
+    a: i32,
+    b: i32,
+    #[serde(skip_deserializing)]
+    c: i32,
+}
+
+#[derive(PartialEq, Debug, Deserialize)]
+enum Enum {
+    Unit,
+    Simple(i32),
+    Seq(i32, i32, i32),
+    Map { a: i32, b: i32, c: i32 }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+macro_rules! declare_test {
+    ($name:ident { $($value:expr => $tokens:expr,)+ }) => {
+        #[test]
+        fn $name() {
+            $(
+                // Test ser/de roundtripping
+                assert_de_tokens(&$value, $tokens);
+
+                // Test that the tokens are ignorable
+                assert_de_tokens_ignore($tokens);
+            )+
+        }
+    }
+}
+
+macro_rules! declare_tests {
+    ($($name:ident { $($value:expr => $tokens:expr,)+ })+) => {
+        $(
+            declare_test!($name { $($value => $tokens,)+ });
+        )+
+    }
+}
+
+macro_rules! declare_error_tests {
+    ($($name:ident<$target:ident> { $tokens:expr, $expected:expr, })+) => {
+        $(
+            #[test]
+            fn $name() {
+                assert_de_tokens_error::<$target>($tokens, $expected);
+            }
+        )+
+    }
+}
+
+fn assert_de_tokens_ignore(ignorable_tokens: &[Token<'static>]) {
+    #[derive(PartialEq, Debug, Deserialize)]
+    struct IgnoreBase {
+        a: i32,
+    }
+
+    let expected = IgnoreBase{a: 1};
+
+    // Embed the tokens to be ignored in the normal token
+    // stream for an IgnoreBase type
+    let concated_tokens : Vec<Token<'static>> = vec![
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::MapSep,
+                Token::Str("ignored")
+        ]
+        .into_iter()
+        .chain(ignorable_tokens.to_vec().into_iter())
+        .chain(vec![
+            Token::MapEnd,
+        ].into_iter())
+        .collect();
+
+    let mut de = serde_test::Deserializer::new(concated_tokens.into_iter());
+    let v: Result<IgnoreBase, Error> = Deserialize::deserialize(&mut de);
+
+    // We run this test on every token stream for convenience, but
+    // some token streams don't make sense embedded as a map value,
+    // so we ignore those. SyntaxError is the real sign of trouble.
+    if let Err(Error::UnexpectedToken(_)) = v {
+        return;
+    }
+
+    assert_eq!(v.as_ref(), Ok(&expected));
+    assert_eq!(de.next_token(), None);
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+declare_tests! {
+    test_bool {
+        true => &[Token::Bool(true)],
+        false => &[Token::Bool(false)],
+    }
+    test_isize {
+        0isize => &[Token::Isize(0)],
+        0isize => &[Token::I8(0)],
+        0isize => &[Token::I16(0)],
+        0isize => &[Token::I32(0)],
+        0isize => &[Token::I64(0)],
+        0isize => &[Token::Usize(0)],
+        0isize => &[Token::U8(0)],
+        0isize => &[Token::U16(0)],
+        0isize => &[Token::U32(0)],
+        0isize => &[Token::U64(0)],
+        0isize => &[Token::F32(0.)],
+        0isize => &[Token::F64(0.)],
+    }
+    test_ints {
+        0isize => &[Token::Isize(0)],
+        0i8 => &[Token::I8(0)],
+        0i16 => &[Token::I16(0)],
+        0i32 => &[Token::I32(0)],
+        0i64 => &[Token::I64(0)],
+    }
+    test_uints {
+        0usize => &[Token::Usize(0)],
+        0u8 => &[Token::U8(0)],
+        0u16 => &[Token::U16(0)],
+        0u32 => &[Token::U32(0)],
+        0u64 => &[Token::U64(0)],
+    }
+    test_floats {
+        0f32 => &[Token::F32(0.)],
+        0f64 => &[Token::F64(0.)],
+    }
+    test_char {
+        'a' => &[Token::Char('a')],
+        'a' => &[Token::Str("a")],
+        'a' => &[Token::String("a".to_owned())],
+    }
+    test_string {
+        "abc".to_owned() => &[Token::Str("abc")],
+        "abc".to_owned() => &[Token::String("abc".to_owned())],
+        "a".to_owned() => &[Token::Char('a')],
+    }
+    test_option {
+        None::<i32> => &[Token::Unit],
+        None::<i32> => &[Token::Option(false)],
+        Some(1) => &[Token::I32(1)],
+        Some(1) => &[
+            Token::Option(true),
+            Token::I32(1),
+        ],
+    }
+    test_result {
+        Ok::<i32, i32>(0) => &[
+            Token::EnumStart("Result"),
+            Token::Str("Ok"),
+            Token::I32(0),
+        ],
+        Err::<i32, i32>(1) => &[
+            Token::EnumStart("Result"),
+            Token::Str("Err"),
+            Token::I32(1),
+        ],
+    }
+    test_unit {
+        () => &[Token::Unit],
+        () => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        () => &[
+            Token::SeqStart(None),
+            Token::SeqEnd,
+        ],
+        () => &[
+            Token::TupleStructStart("Anything", 0),
+            Token::SeqEnd,
+        ],
+    }
+    test_unit_struct {
+        UnitStruct => &[Token::Unit],
+        UnitStruct => &[
+            Token::UnitStruct("UnitStruct"),
+        ],
+        UnitStruct => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        UnitStruct => &[
+            Token::SeqStart(None),
+            Token::SeqEnd,
+        ],
+    }
+    test_tuple_struct {
+        TupleStruct(1, 2, 3) => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+
+                Token::SeqSep,
+                Token::I32(3),
+            Token::SeqEnd,
+        ],
+        TupleStruct(1, 2, 3) => &[
+            Token::SeqStart(None),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+
+                Token::SeqSep,
+                Token::I32(3),
+            Token::SeqEnd,
+        ],
+        TupleStruct(1, 2, 3) => &[
+            Token::TupleStructStart("TupleStruct", 3),
+                Token::TupleStructSep,
+                Token::I32(1),
+
+                Token::TupleStructSep,
+                Token::I32(2),
+
+                Token::TupleStructSep,
+                Token::I32(3),
+            Token::TupleStructEnd,
+        ],
+        TupleStruct(1, 2, 3) => &[
+            Token::TupleStructStart("TupleStruct", 3),
+                Token::TupleStructSep,
+                Token::I32(1),
+
+                Token::TupleStructSep,
+                Token::I32(2),
+
+                Token::TupleStructSep,
+                Token::I32(3),
+            Token::TupleStructEnd,
+        ],
+    }
+    test_btreeset {
+        BTreeSet::<isize>::new() => &[
+            Token::Unit,
+        ],
+        BTreeSet::<isize>::new() => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        btreeset![btreeset![], btreeset![1], btreeset![2, 3]] => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::SeqStart(Some(0)),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqStart(Some(1)),
+                    Token::SeqSep,
+                    Token::I32(1),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqStart(Some(2)),
+                    Token::SeqSep,
+                    Token::I32(2),
+
+                    Token::SeqSep,
+                    Token::I32(3),
+                Token::SeqEnd,
+            Token::SeqEnd,
+        ],
+        BTreeSet::<isize>::new() => &[
+            Token::UnitStruct("Anything"),
+        ],
+        BTreeSet::<isize>::new() => &[
+            Token::TupleStructStart("Anything", 0),
+            Token::SeqEnd,
+        ],
+    }
+    test_hashset {
+        HashSet::<isize>::new() => &[
+            Token::Unit,
+        ],
+        HashSet::<isize>::new() => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        hashset![1, 2, 3] => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+
+                Token::SeqSep,
+                Token::I32(3),
+            Token::SeqEnd,
+        ],
+        HashSet::<isize>::new() => &[
+            Token::UnitStruct("Anything"),
+        ],
+        HashSet::<isize>::new() => &[
+            Token::TupleStructStart("Anything", 0),
+            Token::SeqEnd,
+        ],
+        hashset![FnvHasher @ 1, 2, 3] => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+
+                Token::SeqSep,
+                Token::I32(3),
+            Token::SeqEnd,
+        ],
+    }
+    test_vec {
+        Vec::<isize>::new() => &[
+            Token::Unit,
+        ],
+        Vec::<isize>::new() => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        vec![vec![], vec![1], vec![2, 3]] => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::SeqStart(Some(0)),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqStart(Some(1)),
+                    Token::SeqSep,
+                    Token::I32(1),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqStart(Some(2)),
+                    Token::SeqSep,
+                    Token::I32(2),
+
+                    Token::SeqSep,
+                    Token::I32(3),
+                Token::SeqEnd,
+            Token::SeqEnd,
+        ],
+        Vec::<isize>::new() => &[
+            Token::UnitStruct("Anything"),
+        ],
+        Vec::<isize>::new() => &[
+            Token::TupleStructStart("Anything", 0),
+            Token::SeqEnd,
+        ],
+    }
+    test_array {
+        [0; 0] => &[
+            Token::Unit,
+        ],
+        [0; 0] => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        [0; 0] => &[
+            Token::SeqArrayStart(0),
+            Token::SeqEnd,
+        ],
+        ([0; 0], [1], [2, 3]) => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::SeqStart(Some(0)),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqStart(Some(1)),
+                    Token::SeqSep,
+                    Token::I32(1),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqStart(Some(2)),
+                    Token::SeqSep,
+                    Token::I32(2),
+
+                    Token::SeqSep,
+                    Token::I32(3),
+                Token::SeqEnd,
+            Token::SeqEnd,
+        ],
+        ([0; 0], [1], [2, 3]) => &[
+            Token::SeqArrayStart(3),
+                Token::SeqSep,
+                Token::SeqArrayStart(0),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqArrayStart(1),
+                    Token::SeqSep,
+                    Token::I32(1),
+                Token::SeqEnd,
+
+                Token::SeqSep,
+                Token::SeqArrayStart(2),
+                    Token::SeqSep,
+                    Token::I32(2),
+
+                    Token::SeqSep,
+                    Token::I32(3),
+                Token::SeqEnd,
+            Token::SeqEnd,
+        ],
+        [0; 0] => &[
+            Token::UnitStruct("Anything"),
+        ],
+        [0; 0] => &[
+            Token::TupleStructStart("Anything", 0),
+            Token::SeqEnd,
+        ],
+    }
+    test_tuple {
+        (1,) => &[
+            Token::SeqStart(Some(1)),
+                Token::SeqSep,
+                Token::I32(1),
+            Token::SeqEnd,
+        ],
+        (1, 2, 3) => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+
+                Token::SeqSep,
+                Token::I32(3),
+            Token::SeqEnd,
+        ],
+        (1,) => &[
+            Token::TupleStart(1),
+                Token::TupleSep,
+                Token::I32(1),
+            Token::TupleEnd,
+        ],
+        (1, 2, 3) => &[
+            Token::TupleStart(3),
+                Token::TupleSep,
+                Token::I32(1),
+
+                Token::TupleSep,
+                Token::I32(2),
+
+                Token::TupleSep,
+                Token::I32(3),
+            Token::TupleEnd,
+        ],
+    }
+    test_btreemap {
+        BTreeMap::<isize, isize>::new() => &[
+            Token::Unit,
+        ],
+        BTreeMap::<isize, isize>::new() => &[
+            Token::MapStart(Some(0)),
+            Token::MapEnd,
+        ],
+        btreemap![1 => 2] => &[
+            Token::MapStart(Some(1)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+        btreemap![1 => 2, 3 => 4] => &[
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+
+                Token::MapSep,
+                Token::I32(3),
+                Token::I32(4),
+            Token::MapEnd,
+        ],
+        btreemap![1 => btreemap![], 2 => btreemap![3 => 4, 5 => 6]] => &[
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::MapStart(Some(0)),
+                Token::MapEnd,
+
+                Token::MapSep,
+                Token::I32(2),
+                Token::MapStart(Some(2)),
+                    Token::MapSep,
+                    Token::I32(3),
+                    Token::I32(4),
+
+                    Token::MapSep,
+                    Token::I32(5),
+                    Token::I32(6),
+                Token::MapEnd,
+            Token::MapEnd,
+        ],
+        BTreeMap::<isize, isize>::new() => &[
+            Token::UnitStruct("Anything"),
+        ],
+        BTreeMap::<isize, isize>::new() => &[
+            Token::StructStart("Anything", 0),
+            Token::MapEnd,
+        ],
+    }
+    test_hashmap {
+        HashMap::<isize, isize>::new() => &[
+            Token::Unit,
+        ],
+        HashMap::<isize, isize>::new() => &[
+            Token::MapStart(Some(0)),
+            Token::MapEnd,
+        ],
+        hashmap![1 => 2] => &[
+            Token::MapStart(Some(1)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+        hashmap![1 => 2, 3 => 4] => &[
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+
+                Token::MapSep,
+                Token::I32(3),
+                Token::I32(4),
+            Token::MapEnd,
+        ],
+        hashmap![1 => hashmap![], 2 => hashmap![3 => 4, 5 => 6]] => &[
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::MapStart(Some(0)),
+                Token::MapEnd,
+
+                Token::MapSep,
+                Token::I32(2),
+                Token::MapStart(Some(2)),
+                    Token::MapSep,
+                    Token::I32(3),
+                    Token::I32(4),
+
+                    Token::MapSep,
+                    Token::I32(5),
+                    Token::I32(6),
+                Token::MapEnd,
+            Token::MapEnd,
+        ],
+        HashMap::<isize, isize>::new() => &[
+            Token::UnitStruct("Anything"),
+        ],
+        HashMap::<isize, isize>::new() => &[
+            Token::StructStart("Anything", 0),
+            Token::MapEnd,
+        ],
+        hashmap![FnvHasher @ 1 => 2, 3 => 4] => &[
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+
+                Token::MapSep,
+                Token::I32(3),
+                Token::I32(4),
+            Token::MapEnd,
+        ],
+    }
+    test_struct {
+        Struct { a: 1, b: 2, c: 0 } => &[
+            Token::MapStart(Some(3)),
+                Token::MapSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::MapSep,
+                Token::Str("b"),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+        Struct { a: 1, b: 2, c: 0 } => &[
+            Token::StructStart("Struct", 3),
+                Token::StructSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::StructSep,
+                Token::Str("b"),
+                Token::I32(2),
+            Token::StructEnd,
+        ],
+        Struct { a: 1, b: 2, c: 0 } => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+            Token::SeqEnd,
+        ],
+    }
+    test_struct_with_skip {
+        Struct { a: 1, b: 2, c: 0 } => &[
+            Token::MapStart(Some(3)),
+                Token::MapSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::MapSep,
+                Token::Str("b"),
+                Token::I32(2),
+
+                Token::MapSep,
+                Token::Str("c"),
+                Token::I32(3),
+
+                Token::MapSep,
+                Token::Str("d"),
+                Token::I32(4),
+            Token::MapEnd,
+        ],
+        Struct { a: 1, b: 2, c: 0 } => &[
+            Token::StructStart("Struct", 3),
+                Token::StructSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::StructSep,
+                Token::Str("b"),
+                Token::I32(2),
+
+                Token::StructSep,
+                Token::Str("c"),
+                Token::I32(3),
+
+                Token::StructSep,
+                Token::Str("d"),
+                Token::I32(4),
+            Token::StructEnd,
+        ],
+    }
+    test_enum_unit {
+        Enum::Unit => &[
+            Token::EnumUnit("Enum", "Unit"),
+        ],
+    }
+    test_enum_simple {
+        Enum::Simple(1) => &[
+            Token::EnumNewType("Enum", "Simple"),
+            Token::I32(1),
+        ],
+    }
+    test_enum_seq {
+        Enum::Seq(1, 2, 3) => &[
+            Token::EnumSeqStart("Enum", "Seq", 3),
+                Token::EnumSeqSep,
+                Token::I32(1),
+
+                Token::EnumSeqSep,
+                Token::I32(2),
+
+                Token::EnumSeqSep,
+                Token::I32(3),
+            Token::EnumSeqEnd,
+        ],
+    }
+    test_enum_map {
+        Enum::Map { a: 1, b: 2, c: 3 } => &[
+            Token::EnumMapStart("Enum", "Map", 3),
+                Token::EnumMapSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::EnumMapSep,
+                Token::Str("b"),
+                Token::I32(2),
+
+                Token::EnumMapSep,
+                Token::Str("c"),
+                Token::I32(3),
+            Token::EnumMapEnd,
+        ],
+    }
+    test_enum_unit_usize {
+        Enum::Unit => &[
+            Token::EnumStart("Enum"),
+            Token::Usize(0),
+            Token::Unit,
+        ],
+    }
+    test_enum_unit_bytes {
+        Enum::Unit => &[
+            Token::EnumStart("Enum"),
+            Token::Bytes(b"Unit"),
+            Token::Unit,
+        ],
+    }
+    test_box {
+        Box::new(0i32) => &[Token::I32(0)],
+    }
+    test_boxed_slice {
+        Box::new([0, 1, 2]) => &[
+            Token::SeqStart(Some(3)),
+            Token::SeqSep,
+            Token::I32(0),
+            Token::SeqSep,
+            Token::I32(1),
+            Token::SeqSep,
+            Token::I32(2),
+            Token::SeqEnd,
+        ],
+    }
+    test_duration {
+        Duration::new(1, 2) => &[
+            Token::StructStart("Duration", 2),
+                Token::StructSep,
+                Token::Str("secs"),
+                Token::U64(1),
+
+                Token::StructSep,
+                Token::Str("nanos"),
+                Token::U32(2),
+            Token::StructEnd,
+        ],
+        Duration::new(1, 2) => &[
+            Token::SeqStart(Some(2)),
+                Token::SeqSep,
+                Token::I64(1),
+
+                Token::SeqSep,
+                Token::I64(2),
+            Token::SeqEnd,
+        ],
+    }
+    test_net_ipv4addr {
+        "1.2.3.4".parse::<net::Ipv4Addr>().unwrap() => &[Token::Str("1.2.3.4")],
+    }
+    test_net_ipv6addr {
+        "::1".parse::<net::Ipv6Addr>().unwrap() => &[Token::Str("::1")],
+    }
+    test_net_socketaddr {
+        "1.2.3.4:1234".parse::<net::SocketAddr>().unwrap() => &[Token::Str("1.2.3.4:1234")],
+        "1.2.3.4:1234".parse::<net::SocketAddrV4>().unwrap() => &[Token::Str("1.2.3.4:1234")],
+        "[::1]:1234".parse::<net::SocketAddrV6>().unwrap() => &[Token::Str("[::1]:1234")],
+    }
+    test_path_buf {
+        PathBuf::from("/usr/local/lib") => &[
+            Token::String("/usr/local/lib".to_owned()),
+        ],
+    }
+}
+
+#[cfg(feature = "unstable")]
+#[test]
+fn test_net_ipaddr() {
+    assert_de_tokens(
+        "1.2.3.4".parse::<net::IpAddr>().unwrap(),
+        &[Token::Str("1.2.3.4")],
+    );
+}
+
+declare_error_tests! {
+    test_unknown_variant<Enum> {
+        &[
+            Token::EnumUnit("Enum", "Foo"),
+        ],
+        Error::UnknownVariant("Foo".to_owned()),
+    }
+    test_struct_seq_too_long<Struct> {
+        &[
+            Token::SeqStart(Some(4)),
+                Token::SeqSep, Token::I32(1),
+                Token::SeqSep, Token::I32(2),
+                Token::SeqSep, Token::I32(3),
+        ],
+        Error::UnexpectedToken(Token::SeqSep),
+    }
+    test_duplicate_field_struct<Struct> {
+        &[
+            Token::MapStart(Some(3)),
+                Token::MapSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::MapSep,
+                Token::Str("a"),
+        ],
+        Error::DuplicateField("a"),
+    }
+    test_duplicate_field_enum<Enum> {
+        &[
+            Token::EnumMapStart("Enum", "Map", 3),
+                Token::EnumMapSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::EnumMapSep,
+                Token::Str("a"),
+        ],
+        Error::DuplicateField("a"),
+    }
+}

testing/tests/test_gen.rs

@@ -0,0 +1,226 @@
+// These just test that serde_codegen is able to produce code that compiles
+// successfully when there are a variety of generics and non-(de)serializable
+// types involved.
+
+extern crate serde;
+use self::serde::ser::{Serialize, Serializer};
+use self::serde::de::{Deserialize, Deserializer};
+
+use std::borrow::Cow;
+use std::marker::PhantomData;
+
+//////////////////////////////////////////////////////////////////////////
+
+#[test]
+fn test_gen() {
+    #[derive(Serialize, Deserialize)]
+    struct With<T> {
+        t: T,
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        x: X,
+    }
+    assert::<With<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct WithRef<'a, T: 'a> {
+        #[serde(skip_deserializing)]
+        t: Option<&'a T>,
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        x: X,
+    }
+    assert::<WithRef<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct PhantomX {
+        x: PhantomData<X>,
+    }
+    assert::<PhantomX>();
+
+    #[derive(Serialize, Deserialize)]
+    struct PhantomT<T> {
+        t: PhantomData<T>,
+    }
+    assert::<PhantomT<X>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct Bounds<T: Serialize + Deserialize> {
+        t: T,
+        option: Option<T>,
+        boxed: Box<T>,
+        option_boxed: Option<Box<T>>,
+    }
+    assert::<Bounds<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct NoBounds<T> {
+        t: T,
+        option: Option<T>,
+        boxed: Box<T>,
+        option_boxed: Option<Box<T>>,
+    }
+    assert::<NoBounds<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    enum EnumWith<T> {
+        Unit,
+        Newtype(
+            #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+            X),
+        Tuple(
+            T,
+            #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+            X),
+        Struct {
+            t: T,
+            #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+            x: X },
+    }
+    assert::<EnumWith<i32>>();
+
+    #[derive(Serialize)]
+    struct MultipleRef<'a, 'b, 'c, T> where T: 'c, 'c: 'b, 'b: 'a {
+        t: T,
+        rrrt: &'a &'b &'c T,
+    }
+    assert_ser::<MultipleRef<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct Newtype(
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        X
+    );
+    assert::<Newtype>();
+
+    #[derive(Serialize, Deserialize)]
+    struct Tuple<T>(
+        T,
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        X,
+    );
+    assert::<Tuple<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    enum TreeNode<D> {
+        Split {
+            left: Box<TreeNode<D>>,
+            right: Box<TreeNode<D>>,
+        },
+        Leaf {
+            data: D,
+        },
+    }
+    assert::<TreeNode<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct ListNode<D> {
+        data: D,
+        next: Box<ListNode<D>>,
+    }
+    assert::<ListNode<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct RecursiveA {
+        b: Box<RecursiveB>,
+    }
+    assert::<RecursiveA>();
+
+    #[derive(Serialize, Deserialize)]
+    enum RecursiveB {
+        A(RecursiveA),
+    }
+    assert::<RecursiveB>();
+
+    #[derive(Serialize, Deserialize)]
+    struct RecursiveGenericA<T> {
+        t: T,
+        b: Box<RecursiveGenericB<T>>,
+    }
+    assert::<RecursiveGenericA<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    enum RecursiveGenericB<T> {
+        T(T),
+        A(RecursiveGenericA<T>),
+    }
+    assert::<RecursiveGenericB<i32>>();
+
+    #[derive(Serialize)]
+    struct OptionStatic<'a> {
+        a: Option<&'a str>,
+        b: Option<&'static str>,
+    }
+    assert_ser::<OptionStatic>();
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(bound="D: SerializeWith + DeserializeWith")]
+    struct WithTraits1<D, E> {
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                deserialize_with="DeserializeWith::deserialize_with")]
+        d: D,
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                deserialize_with="DeserializeWith::deserialize_with",
+                bound="E: SerializeWith + DeserializeWith")]
+        e: E,
+    }
+    assert::<WithTraits1<X, X>>();
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(bound(serialize="D: SerializeWith",
+                deserialize="D: DeserializeWith"))]
+    struct WithTraits2<D, E> {
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                deserialize_with="DeserializeWith::deserialize_with")]
+        d: D,
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                bound(serialize="E: SerializeWith"))]
+        #[serde(deserialize_with="DeserializeWith::deserialize_with",
+                bound(deserialize="E: DeserializeWith"))]
+        e: E,
+    }
+    assert::<WithTraits2<X, X>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct CowStr<'a>(Cow<'a, str>);
+    assert::<CowStr>();
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(bound(deserialize = "T::Owned: Deserialize"))]
+    struct CowT<'a, T: ?Sized + 'a + ToOwned>(Cow<'a, T>);
+    assert::<CowT<str>>();
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+fn assert<T: Serialize + Deserialize>() {}
+fn assert_ser<T: Serialize>() {}
+
+trait SerializeWith {
+    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> Result<(), S::Error>;
+}
+
+trait DeserializeWith: Sized {
+    fn deserialize_with<D: Deserializer>(_: &mut D) -> Result<Self, D::Error>;
+}
+
+// Implements neither Serialize nor Deserialize
+struct X;
+
+fn ser_x<S: Serializer>(_: &X, _: &mut S) -> Result<(), S::Error> {
+    unimplemented!()
+}
+
+fn de_x<D: Deserializer>(_: &mut D) -> Result<X, D::Error> {
+    unimplemented!()
+}
+
+impl SerializeWith for X {
+    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> Result<(), S::Error> {
+        unimplemented!()
+    }
+}
+
+impl DeserializeWith for X {
+    fn deserialize_with<D: Deserializer>(_: &mut D) -> Result<Self, D::Error> {
+        unimplemented!()
+    }
+}

testing/tests/test_macros.rs

@@ -1,10 +1,19 @@
-use token::{Token, assert_tokens, assert_ser_tokens, assert_de_tokens};
+extern crate serde_test;
+use self::serde_test::{
+    Token,
+    assert_tokens,
+    assert_ser_tokens,
+    assert_de_tokens,
+};
 
-/*
-trait Trait {
-    type Type;
-}
-*/
+use std::marker::PhantomData;
+
+// That tests that the derived Serialize implementation doesn't trigger
+// any warning about `serializer` not being used, in case of empty enums.
+#[derive(Serialize)]
+#[allow(dead_code)]
+#[deny(unused_variables)]
+enum Void {}
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct NamedUnit;
@@ -30,23 +39,19 @@ struct DeNamedMap<A, B, C> {
 }
 
 #[derive(Debug, PartialEq, Serialize)]
-enum SerEnum<'a, B: 'a, C: /* Trait + */ 'a, D> where D: /* Trait + */ 'a {
+enum SerEnum<'a, B: 'a, C: 'a, D> where D: 'a {
     Unit,
     Seq(
         i8,
         B,
         &'a C,
-        //C::Type,
         &'a mut D,
-        //<D as Trait>::Type,
     ),
     Map {
         a: i8,
         b: B,
         c: &'a C,
-        //d: C::Type,
-        e: &'a mut D,
-        //f: <D as Trait>::Type,
+        d: &'a mut D,
     },
 
     // Make sure we can support more than one variant.
@@ -55,38 +60,30 @@ enum SerEnum<'a, B: 'a, C: /* Trait + */ 'a, D> where D: /* Trait + */ 'a {
         i8,
         B,
         &'a C,
-        //C::Type,
         &'a mut D,
-        //<D as Trait>::Type,
     ),
     _Map2 {
         a: i8,
         b: B,
         c: &'a C,
-        //d: C::Type,
-        e: &'a mut D,
-        //f: <D as Trait>::Type,
+        d: &'a mut D,
     },
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-enum DeEnum<B, C: /* Trait */, D> /* where D: Trait */ {
+enum DeEnum<B, C, D> {
     Unit,
     Seq(
         i8,
         B,
         C,
-        //C::Type,
         D,
-        //<D as Trait>::Type,
     ),
     Map {
         a: i8,
         b: B,
         c: C,
-        //d: C::Type,
-        e: D,
-        //f: <D as Trait>::Type,
+        d: D,
     },
 
     // Make sure we can support more than one variant.
@@ -95,17 +92,13 @@ enum DeEnum<B, C: /* Trait */, D> /* where D: Trait */ {
         i8,
         B,
         C,
-        //C::Type,
         D,
-        //<D as Trait>::Type,
     ),
     _Map2 {
         a: i8,
         b: B,
         c: C,
-        //d: C::Type,
-        e: D,
-        //f: <D as Trait>::Type,
+        d: D,
     },
 }
 
@@ -123,7 +116,7 @@ pub struct GenericStruct<T> {
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct GenericNewtypeStruct<T>(T);
+pub struct GenericNewTypeStruct<T>(T);
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct GenericTupleStruct<T, U>(T, U);
@@ -131,16 +124,29 @@ pub struct GenericTupleStruct<T, U>(T, U);
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub enum GenericEnum<T, U> {
     Unit,
-    Newtype(T),
+    NewType(T),
     Seq(T, U),
     Map { x: T, y: U },
 }
 
+trait AssociatedType {
+    type X;
+}
+
+impl AssociatedType for i32 {
+    type X = i32;
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+struct DefaultTyParam<T: AssociatedType<X=i32> = i32> {
+    phantom: PhantomData<T>
+}
+
 #[test]
 fn test_named_unit() {
     assert_tokens(
         &NamedUnit,
-        vec![Token::UnitStruct("NamedUnit")]
+        &[Token::UnitStruct("NamedUnit")]
     );
 }
 
@@ -152,17 +158,17 @@ fn test_ser_named_tuple() {
     assert_ser_tokens(
         &SerNamedTuple(&a, &mut b, c),
         &[
-            Token::TupleStructStart("SerNamedTuple", Some(3)),
-            Token::SeqSep,
+            Token::TupleStructStart("SerNamedTuple", 3),
+            Token::TupleStructSep,
             Token::I32(5),
 
-            Token::SeqSep,
+            Token::TupleStructSep,
             Token::I32(6),
 
-            Token::SeqSep,
+            Token::TupleStructSep,
             Token::I32(7),
 
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
     );
 }
@@ -171,8 +177,8 @@ fn test_ser_named_tuple() {
 fn test_de_named_tuple() {
     assert_de_tokens(
         &DeNamedTuple(5, 6, 7),
-        vec![
-            Token::TupleStructStart("DeNamedTuple", Some(3)),
+        &[
+            Token::SeqStart(Some(3)),
             Token::SeqSep,
             Token::I32(5),
 
@@ -185,6 +191,23 @@ fn test_de_named_tuple() {
             Token::SeqEnd,
         ]
     );
+
+    assert_de_tokens(
+        &DeNamedTuple(5, 6, 7),
+        &[
+            Token::TupleStructStart("DeNamedTuple", 3),
+            Token::TupleStructSep,
+            Token::I32(5),
+
+            Token::TupleStructSep,
+            Token::I32(6),
+
+            Token::TupleStructSep,
+            Token::I32(7),
+
+            Token::TupleStructEnd,
+        ]
+    );
 }
 
 #[test]
@@ -200,21 +223,21 @@ fn test_ser_named_map() {
             c: c,
         },
         &[
-            Token::StructStart("SerNamedMap", Some(3)),
+            Token::StructStart("SerNamedMap", 3),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("a"),
             Token::I32(5),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("b"),
             Token::I32(6),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("c"),
             Token::I32(7),
 
-            Token::MapEnd,
+            Token::StructEnd,
         ]
     );
 }
@@ -227,22 +250,22 @@ fn test_de_named_map() {
             b: 6,
             c: 7,
         },
-        vec![
-            Token::StructStart("DeNamedMap", Some(3)),
+        &[
+            Token::StructStart("DeNamedMap", 3),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("a"),
             Token::I32(5),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("b"),
             Token::I32(6),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("c"),
             Token::I32(7),
 
-            Token::MapEnd,
+            Token::StructEnd,
         ]
     );
 }
@@ -262,35 +285,31 @@ fn test_ser_enum_seq() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let mut e = 5;
-    //let f = 6;
+    let mut d = 4;
 
     assert_ser_tokens(
         &SerEnum::Seq(
             a,
             b,
             &c,
-            //d,
-            &mut e,
-            //f,
+            &mut d,
         ),
         &[
-            Token::EnumSeqStart("SerEnum", "Seq", Some(4)),
+            Token::EnumSeqStart("SerEnum", "Seq", 4),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::I8(1),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::I32(2),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::I32(3),
 
-            Token::SeqSep,
-            Token::I32(5),
+            Token::EnumSeqSep,
+            Token::I32(4),
 
-            Token::SeqEnd,
+            Token::EnumSeqEnd,
         ],
     );
 }
@@ -300,39 +319,35 @@ fn test_ser_enum_map() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let mut e = 5;
-    //let f = 6;
+    let mut d = 4;
 
     assert_ser_tokens(
         &SerEnum::Map {
             a: a,
             b: b,
             c: &c,
-            //d: d,
-            e: &mut e,
-            //f: f,
+            d: &mut d,
         },
         &[
-            Token::EnumMapStart("SerEnum", "Map", Some(4)),
+            Token::EnumMapStart("SerEnum", "Map", 4),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("a"),
             Token::I8(1),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("b"),
             Token::I32(2),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("c"),
             Token::I32(3),
 
-            Token::MapSep,
-            Token::Str("e"),
-            Token::I32(5),
+            Token::EnumMapSep,
+            Token::Str("d"),
+            Token::I32(4),
 
-            Token::MapEnd,
+            Token::EnumMapEnd,
         ],
     );
 }
@@ -341,7 +356,7 @@ fn test_ser_enum_map() {
 fn test_de_enum_unit() {
     assert_tokens(
         &DeEnum::Unit::<u32, u32, u32>,
-        vec![
+        &[
             Token::EnumUnit("DeEnum", "Unit"),
         ],
     );
@@ -352,35 +367,31 @@ fn test_de_enum_seq() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let e = 5;
-    //let f = 6;
+    let d = 4;
 
     assert_tokens(
         &DeEnum::Seq(
             a,
             b,
             c,
-            //d,
-            e,
-            //f,
+            d,
         ),
-        vec![
-            Token::EnumSeqStart("DeEnum", "Seq", Some(4)),
+        &[
+            Token::EnumSeqStart("DeEnum", "Seq", 4),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::I8(1),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::I32(2),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::I32(3),
 
-            Token::SeqSep,
-            Token::I32(5),
+            Token::EnumSeqSep,
+            Token::I32(4),
 
-            Token::SeqEnd,
+            Token::EnumSeqEnd,
         ],
     );
 }
@@ -390,39 +401,35 @@ fn test_de_enum_map() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let e = 5;
-    //let f = 6;
+    let d = 4;
 
     assert_tokens(
         &DeEnum::Map {
             a: a,
             b: b,
             c: c,
-            //d: d,
-            e: e,
-            //f: f,
+            d: d,
         },
-        vec![
-            Token::EnumMapStart("DeEnum", "Map", Some(4)),
+        &[
+            Token::EnumMapStart("DeEnum", "Map", 4),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("a"),
             Token::I8(1),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("b"),
             Token::I32(2),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("c"),
             Token::I32(3),
 
-            Token::MapSep,
-            Token::Str("e"),
-            Token::I32(5),
+            Token::EnumMapSep,
+            Token::Str("d"),
+            Token::I32(4),
 
-            Token::MapEnd,
+            Token::EnumMapEnd,
         ],
     );
 }
@@ -434,7 +441,7 @@ fn test_lifetimes() {
     assert_ser_tokens(
         &Lifetimes::LifetimeSeq(&value),
         &[
-            Token::EnumNewtype("Lifetimes", "LifetimeSeq"),
+            Token::EnumNewType("Lifetimes", "LifetimeSeq"),
             Token::I32(5),
         ]
     );
@@ -442,7 +449,7 @@ fn test_lifetimes() {
     assert_ser_tokens(
         &Lifetimes::NoLifetimeSeq(5),
         &[
-            Token::EnumNewtype("Lifetimes", "NoLifetimeSeq"),
+            Token::EnumNewType("Lifetimes", "NoLifetimeSeq"),
             Token::I32(5),
         ]
     );
@@ -450,26 +457,26 @@ fn test_lifetimes() {
     assert_ser_tokens(
         &Lifetimes::LifetimeMap { a: &value },
         &[
-            Token::EnumMapStart("Lifetimes", "LifetimeMap", Some(1)),
+            Token::EnumMapStart("Lifetimes", "LifetimeMap", 1),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("a"),
             Token::I32(5),
 
-            Token::MapEnd,
+            Token::EnumMapEnd,
         ]
     );
 
     assert_ser_tokens(
         &Lifetimes::NoLifetimeMap { a: 5 },
         &[
-            Token::EnumMapStart("Lifetimes", "NoLifetimeMap", Some(1)),
+            Token::EnumMapStart("Lifetimes", "NoLifetimeMap", 1),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("a"),
             Token::I32(5),
 
-            Token::MapEnd,
+            Token::EnumMapEnd,
         ]
     );
 }
@@ -478,14 +485,14 @@ fn test_lifetimes() {
 fn test_generic_struct() {
     assert_tokens(
         &GenericStruct { x: 5u32 },
-        vec![
-            Token::StructStart("GenericStruct", Some(1)),
+        &[
+            Token::StructStart("GenericStruct", 1),
 
-            Token::MapSep,
+            Token::StructSep,
             Token::Str("x"),
             Token::U32(5),
 
-            Token::MapEnd,
+            Token::StructEnd,
         ]
     );
 }
@@ -493,9 +500,9 @@ fn test_generic_struct() {
 #[test]
 fn test_generic_newtype_struct() {
     assert_tokens(
-        &GenericNewtypeStruct(5u32),
-        vec![
-            Token::StructNewtype("GenericNewtypeStruct"),
+        &GenericNewTypeStruct(5u32),
+        &[
+            Token::StructNewType("GenericNewTypeStruct"),
             Token::U32(5),
         ]
     );
@@ -505,16 +512,16 @@ fn test_generic_newtype_struct() {
 fn test_generic_tuple_struct() {
     assert_tokens(
         &GenericTupleStruct(5u32, 6u32),
-        vec![
-            Token::TupleStructStart("GenericTupleStruct", Some(2)),
+        &[
+            Token::TupleStructStart("GenericTupleStruct", 2),
 
-            Token::SeqSep,
+            Token::TupleStructSep,
             Token::U32(5),
 
-            Token::SeqSep,
+            Token::TupleStructSep,
             Token::U32(6),
 
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ]
     );
 }
@@ -523,7 +530,7 @@ fn test_generic_tuple_struct() {
 fn test_generic_enum_unit() {
     assert_tokens(
         &GenericEnum::Unit::<u32, u32>,
-        vec![
+        &[
             Token::EnumUnit("GenericEnum", "Unit"),
         ]
     );
@@ -532,9 +539,9 @@ fn test_generic_enum_unit() {
 #[test]
 fn test_generic_enum_newtype() {
     assert_tokens(
-        &GenericEnum::Newtype::<u32, u32>(5),
-        vec![
-            Token::EnumNewtype("GenericEnum", "Newtype"),
+        &GenericEnum::NewType::<u32, u32>(5),
+        &[
+            Token::EnumNewType("GenericEnum", "NewType"),
             Token::U32(5),
         ]
     );
@@ -544,16 +551,16 @@ fn test_generic_enum_newtype() {
 fn test_generic_enum_seq() {
     assert_tokens(
         &GenericEnum::Seq::<u32, u32>(5, 6),
-        vec![
-            Token::EnumSeqStart("GenericEnum", "Seq", Some(2)),
+        &[
+            Token::EnumSeqStart("GenericEnum", "Seq", 2),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::U32(5),
 
-            Token::SeqSep,
+            Token::EnumSeqSep,
             Token::U32(6),
 
-            Token::SeqEnd,
+            Token::EnumSeqEnd,
         ]
     );
 }
@@ -562,18 +569,34 @@ fn test_generic_enum_seq() {
 fn test_generic_enum_map() {
     assert_tokens(
         &GenericEnum::Map::<u32, u32> { x: 5, y: 6 },
-        vec![
-            Token::EnumMapStart("GenericEnum", "Map", Some(2)),
+        &[
+            Token::EnumMapStart("GenericEnum", "Map", 2),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("x"),
             Token::U32(5),
 
-            Token::MapSep,
+            Token::EnumMapSep,
             Token::Str("y"),
             Token::U32(6),
 
-            Token::MapEnd,
+            Token::EnumMapEnd,
+        ]
+    );
+}
+
+#[test]
+fn test_default_ty_param() {
+    assert_tokens(
+        &DefaultTyParam::<i32> { phantom: PhantomData },
+        &[
+            Token::StructStart("DefaultTyParam", 1),
+
+            Token::StructSep,
+            Token::Str("phantom"),
+            Token::UnitStruct("PhantomData"),
+
+            Token::StructEnd,
         ]
     );
 }

testing/tests/test_ser.rs

@@ -1,6 +1,19 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap, HashSet};
+use std::net;
+use std::path::{Path, PathBuf};
+use std::str;
+use std::time::Duration;
 
-use token::Token;
+extern crate serde_test;
+use self::serde_test::{
+    Error,
+    Token,
+    assert_ser_tokens,
+    assert_ser_tokens_error,
+};
+
+extern crate fnv;
+use self::fnv::FnvHasher;
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -58,7 +71,7 @@ declare_ser_tests! {
     }
     test_str {
         "abc" => &[Token::Str("abc")],
-        "abc".to_string() => &[Token::Str("abc")],
+        "abc".to_owned() => &[Token::Str("abc")],
     }
     test_option {
         None::<i32> => &[Token::Option(false)],
@@ -69,11 +82,11 @@ declare_ser_tests! {
     }
     test_result {
         Ok::<i32, i32>(0) => &[
-            Token::EnumNewtype("Result", "Ok"),
+            Token::EnumNewType("Result", "Ok"),
             Token::I32(0),
         ],
         Err::<i32, i32>(1) => &[
-            Token::EnumNewtype("Result", "Err"),
+            Token::EnumNewType("Result", "Err"),
             Token::I32(1),
         ],
     }
@@ -97,11 +110,11 @@ declare_ser_tests! {
     }
     test_array {
         [0; 0] => &[
-            Token::SeqStart(Some(0)),
+            Token::SeqArrayStart(0),
             Token::SeqEnd,
         ],
         [1, 2, 3] => &[
-            Token::SeqStart(Some(3)),
+            Token::SeqArrayStart(3),
                 Token::SeqSep,
                 Token::I32(1),
 
@@ -141,24 +154,42 @@ declare_ser_tests! {
             Token::SeqEnd,
         ],
     }
-    test_tuple {
-        (1,) => &[
+    test_hashset {
+        HashSet::<isize>::new() => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        hashset![1] => &[
             Token::SeqStart(Some(1)),
                 Token::SeqSep,
                 Token::I32(1),
             Token::SeqEnd,
         ],
-        (1, 2, 3) => &[
-            Token::SeqStart(Some(3)),
+        hashset![FnvHasher @ 1] => &[
+            Token::SeqStart(Some(1)),
                 Token::SeqSep,
                 Token::I32(1),
+            Token::SeqEnd,
+        ],
+    }
+    test_tuple {
+        (1,) => &[
+            Token::TupleStart(1),
+                Token::TupleSep,
+                Token::I32(1),
+            Token::TupleEnd,
+        ],
+        (1, 2, 3) => &[
+            Token::TupleStart(3),
+                Token::TupleSep,
+                Token::I32(1),
 
-                Token::SeqSep,
+                Token::TupleSep,
                 Token::I32(2),
 
-                Token::SeqSep,
+                Token::TupleSep,
                 Token::I32(3),
-            Token::SeqEnd,
+            Token::TupleEnd,
         ],
     }
     test_btreemap {
@@ -201,62 +232,159 @@ declare_ser_tests! {
             Token::MapEnd,
         ],
     }
+    test_hashmap {
+        HashMap::<isize, isize>::new() => &[
+            Token::MapStart(Some(0)),
+            Token::MapEnd,
+        ],
+        hashmap![1 => 2] => &[
+            Token::MapStart(Some(1)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+        hashmap![FnvHasher @ 1 => 2] => &[
+            Token::MapStart(Some(1)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+    }
     test_unit_struct {
         UnitStruct => &[Token::UnitStruct("UnitStruct")],
     }
     test_tuple_struct {
         TupleStruct(1, 2, 3) => &[
-            Token::TupleStructStart("TupleStruct", Some(3)),
-                Token::SeqSep,
+            Token::TupleStructStart("TupleStruct", 3),
+                Token::TupleStructSep,
                 Token::I32(1),
 
-                Token::SeqSep,
+                Token::TupleStructSep,
                 Token::I32(2),
 
-                Token::SeqSep,
+                Token::TupleStructSep,
                 Token::I32(3),
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
     }
     test_struct {
         Struct { a: 1, b: 2, c: 3 } => &[
-            Token::StructStart("Struct", Some(3)),
-                Token::MapSep,
+            Token::StructStart("Struct", 3),
+                Token::StructSep,
                 Token::Str("a"),
                 Token::I32(1),
 
-                Token::MapSep,
+                Token::StructSep,
                 Token::Str("b"),
                 Token::I32(2),
 
-                Token::MapSep,
+                Token::StructSep,
                 Token::Str("c"),
                 Token::I32(3),
-            Token::MapEnd,
+            Token::StructEnd,
         ],
     }
     test_enum {
         Enum::Unit => &[Token::EnumUnit("Enum", "Unit")],
-        Enum::One(42) => &[Token::EnumNewtype("Enum", "One"), Token::I32(42)],
+        Enum::One(42) => &[Token::EnumNewType("Enum", "One"), Token::I32(42)],
         Enum::Seq(1, 2) => &[
-            Token::EnumSeqStart("Enum", "Seq", Some(2)),
-                Token::SeqSep,
+            Token::EnumSeqStart("Enum", "Seq", 2),
+                Token::EnumSeqSep,
                 Token::I32(1),
 
-                Token::SeqSep,
+                Token::EnumSeqSep,
                 Token::I32(2),
-            Token::SeqEnd,
+            Token::EnumSeqEnd,
         ],
         Enum::Map { a: 1, b: 2 } => &[
-            Token::EnumMapStart("Enum", "Map", Some(2)),
-                Token::MapSep,
+            Token::EnumMapStart("Enum", "Map", 2),
+                Token::EnumMapSep,
                 Token::Str("a"),
                 Token::I32(1),
 
-                Token::MapSep,
+                Token::EnumMapSep,
                 Token::Str("b"),
                 Token::I32(2),
-            Token::MapEnd,
+            Token::EnumMapEnd,
+        ],
+    }
+    test_box {
+        Box::new(0i32) => &[Token::I32(0)],
+    }
+    test_boxed_slice {
+        Box::new([0, 1, 2]) => &[
+            Token::SeqArrayStart(3),
+            Token::SeqSep,
+            Token::I32(0),
+            Token::SeqSep,
+            Token::I32(1),
+            Token::SeqSep,
+            Token::I32(2),
+            Token::SeqEnd,
+        ],
+    }
+    test_duration {
+        Duration::new(1, 2) => &[
+            Token::StructStart("Duration", 2),
+                Token::StructSep,
+                Token::Str("secs"),
+                Token::U64(1),
+
+                Token::StructSep,
+                Token::Str("nanos"),
+                Token::U32(2),
+            Token::StructEnd,
+        ],
+    }
+    test_net_ipv4addr {
+        "1.2.3.4".parse::<net::Ipv4Addr>().unwrap() => &[Token::Str("1.2.3.4")],
+    }
+    test_net_ipv6addr {
+        "::1".parse::<net::Ipv6Addr>().unwrap() => &[Token::Str("::1")],
+    }
+    test_net_socketaddr {
+        "1.2.3.4:1234".parse::<net::SocketAddr>().unwrap() => &[Token::Str("1.2.3.4:1234")],
+        "1.2.3.4:1234".parse::<net::SocketAddrV4>().unwrap() => &[Token::Str("1.2.3.4:1234")],
+        "[::1]:1234".parse::<net::SocketAddrV6>().unwrap() => &[Token::Str("[::1]:1234")],
+    }
+    test_path {
+        Path::new("/usr/local/lib") => &[
+            Token::Str("/usr/local/lib"),
+        ],
+    }
+    test_path_buf {
+        PathBuf::from("/usr/local/lib") => &[
+            Token::Str("/usr/local/lib"),
         ],
     }
 }
+
+#[cfg(feature = "unstable")]
+#[test]
+fn test_net_ipaddr() {
+    assert_ser_tokens(
+        "1.2.3.4".parse::<net::IpAddr>().unwrap(),
+        &[Token::Str("1.2.3.4")],
+    );
+}
+
+#[test]
+fn test_cannot_serialize_paths() {
+    let path = unsafe {
+        str::from_utf8_unchecked(b"Hello \xF0\x90\x80World")
+    };
+    assert_ser_tokens_error(
+        &Path::new(path),
+        &[],
+        Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
+
+    let mut path_buf = PathBuf::new();
+    path_buf.push(path);
+
+    assert_ser_tokens_error(
+        &path_buf,
+        &[],
+        Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
+}