Release 0.9.13

Deserialize OsString on Windows

.gitignore

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

.travis.yml

@@ -1,13 +1,17 @@
+sudo: false
 language: rust
+cache: cargo
 
+# run builds for all the trains (and more)
 rust:
+  - 1.13.0
+  - stable
+  - beta
   - nightly
 
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo bench --verbose
-  - cd serde2
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo bench --verbose
+matrix:
+  include:
+    - rust: nightly
+      env: CLIPPY=true
+
+script: ./travis.sh

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).

Cargo.toml

@@ -1,16 +1,9 @@
-[package]
-name = "serde"
-version = "0.2.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-license = "MIT/Apache-2.0"
-description = "A quasi-quoting macro system"
-repository = "https://github.com/erickt/rust-quasi"
-
-[lib]
-name = "serde"
-
-[dependencies]
-rustc-serialize = "*"
-
-[dev-dependencies]
-serde_macros = "0.2.0"
+[workspace]
+members = [
+    "serde",
+    "serde_codegen_internals",
+    "serde_derive",
+    "serde_test",
+    "test_suite",
+    "test_suite/no_std",
+]

LICENSE

@@ -1,33 +0,0 @@
-See LICENSE-APACHE and LICENSE-MIT.
-
-----
-
-bench_log is derived from https://github.com/cloudflare/goser, which has the
-following license:
-
-Copyright (c) 2013, CloudFlare, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-* Neither the name of the author nor the
-  names of its contributors may be used to endorse or promote products
-  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

README.md

@@ -1,34 +1,71 @@
-Experimental Rust Serialization Library.
+# Serde   [![Build Status](https://api.travis-ci.org/serde-rs/serde.svg?branch=master)](https://travis-ci.org/serde-rs/serde) [![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde)
 
-[![Build Status](https://travis-ci.org/erickt/rust-serde.png?branch=master)](https://travis-ci.org/erickt/rust-serde)
-
-This is an experiment to modernize rust's `libserialize` library. It is designed to implement https://github.com/rust-lang/rfcs/pull/22. `rust-serde` is an attempt to address a major shortcoming in `libserialize`. For normal structures, when you say you want to deserialize into:
-
-```rust
-struct Foo {
-    x: int,
-    y: int,
-}
-```
-
-`libserialize`'s deserializer essentially asks for:
-
-* Is the next value a struct named "Foo"? If not, error.
-* Is the next field named "x"? If not, error.
-* Is the next value an "int"? If not, error.
-* Is the next field named "y"? If not, error.
-* Is the next value an "int"? If not, error.
-* Is the struct finished? If not, error.
-
-While this works for user defined structures, it cannot support deserializing into a value like `json::Json`, which is an enum that can represent every JSON value. In order to support that, it needs to be able to do some lookahead:
-
-* What is the next value type?
-    * If a struct, parse a struct.
-    * If an integer, parse an integer.
-    * ...
-
-More formally, `libserialize` implements a LL(0) grammar, whereas `json::Json` requires a LL(1) grammar. `rust-serde` provides this by implementing a serializer and deserializer that produces a tagged token stream of values. This enables a `Deserializable` for `json::Json` to look at the next token before deciding on how to parse the value.
+**Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
 
 ---
 
-There is now also a new library variation called `serde2`. This removes the need for tagged values and replaces them with a `Visitor` pattern. This pattern is very similar to the `Iterator` pattern, but it threads some custom state through visiting each type. This gets many of the benefits of the `serde` library without needing to always pay for tagging the variants.
+You may be looking for:
+
+- [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/)
+- [Release notes](https://github.com/serde-rs/serde/releases)
+
+## Serde in action
+
+```rust
+#[macro_use]
+extern crate serde_derive;
+
+extern crate serde_json;
+
+#[derive(Serialize, Deserialize, Debug)]
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+fn main() {
+    let point = Point { x: 1, y: 2 };
+
+    // Convert the Point to a JSON string.
+    let serialized = serde_json::to_string(&point).unwrap();
+
+    // 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();
+
+    // Prints deserialized = Point { x: 1, y: 2 }
+    println!("deserialized = {:?}", deserialized);
+}
+```
+
+## Getting help
+
+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 or you don't get a good response, we are
+happy to respond to [GitHub issues](https://github.com/serde-rs/serde/issues/new)
+as well.
+
+## License
+
+Serde is licensed under either of
+
+ * 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)
+
+at your option.
+
+### Contribution
+
+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.

appveyor.yml

@@ -0,0 +1,17 @@
+environment:
+  matrix:
+    - APPVEYOR_RUST_CHANNEL: stable
+    - APPVEYOR_RUST_CHANNEL: nightly
+
+install:
+  # Install rust, x86_64-pc-windows-msvc host
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain %APPVEYOR_RUST_CHANNEL%
+  - set PATH=C:\msys64\usr\bin;%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
+build: false
+
+test_script:
+  - sh -c 'PATH=`rustc --print sysroot`/bin:$PATH ./travis.sh'

benches/bench_enum.rs

@@ -1,417 +0,0 @@
-#![feature(custom_derive, plugin, test)]
-#![plugin(serde_macros)]
-
-extern crate serde;
-extern crate "rustc-serialize" as rustc_serialize;
-extern crate test;
-
-use test::Bencher;
-
-use rustc_serialize::{Decoder, Decodable};
-
-use serde::de::{Deserializer, Deserialize};
-
-use Animal::{Dog, Frog};
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(Clone, PartialEq, Debug, RustcDecodable)]
-#[derive_deserialize]
-enum Animal {
-    Dog,
-    Frog(String, isize)
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(Debug)]
-pub enum Error {
-    EndOfStreamError,
-    SyntaxError,
-}
-
-impl serde::de::Error for Error {
-    fn syntax_error() -> Error { Error::SyntaxError }
-
-    fn end_of_stream_error() -> Error { Error::EndOfStreamError }
-
-    fn missing_field_error(_: &'static str) -> Error { Error::SyntaxError }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod decoder {
-    use rustc_serialize::Decoder;
-
-    use super::{Animal, Error};
-    use super::Animal::{Dog, Frog};
-    use self::State::{AnimalState, IsizeState, StringState};
-
-    enum State {
-        AnimalState(Animal),
-        IsizeState(isize),
-        StringState(String),
-    }
-
-    pub struct AnimalDecoder {
-        stack: Vec<State>,
-
-    }
-
-    impl AnimalDecoder {
-        #[inline]
-        pub fn new(animal: Animal) -> AnimalDecoder {
-            AnimalDecoder {
-                stack: vec!(AnimalState(animal)),
-            }
-        }
-    }
-
-    impl Decoder for AnimalDecoder {
-        type Error = Error;
-
-        fn error(&mut self, _: &str) -> Error { Error::SyntaxError }
-
-        // 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) }
-        #[inline]
-        fn read_isize(&mut self) -> Result<isize, Error> {
-            match self.stack.pop() {
-                Some(IsizeState(x)) => Ok(x),
-                _ => 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) }
-        #[inline]
-        fn read_str(&mut self) -> Result<String, Error> {
-            match self.stack.pop() {
-                Some(StringState(x)) => Ok(x),
-                _ => Err(Error::SyntaxError),
-            }
-        }
-
-        // Compound types:
-        #[inline]
-        fn read_enum<T, F>(&mut self, name: &str, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
-        {
-            match self.stack.pop() {
-                Some(AnimalState(animal)) => {
-                    self.stack.push(AnimalState(animal));
-                    if name == "Animal" {
-                        f(self)
-                    } else {
-                        Err(Error::SyntaxError)
-                    }
-                }
-                _ => Err(Error::SyntaxError)
-            }
-        }
-
-        #[inline]
-        fn read_enum_variant<T, F>(&mut self, names: &[&str], f: F) -> Result<T, Error> where
-            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));
-                    "Frog"
-                }
-                _ => { return Err(Error::SyntaxError); }
-            };
-
-            let idx = match names.iter().position(|n| *n == name) {
-                Some(idx) => idx,
-                None => { return Err(Error::SyntaxError); }
-            };
-
-            f(self, idx)
-        }
-
-        #[inline]
-        fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        // 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)
-        }
-
-        #[inline]
-        fn read_seq<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut AnimalDecoder, usize) -> Result<T, Error>,
-        {
-            f(self, 3)
-        }
-
-        #[inline]
-        fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut AnimalDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-
-        fn read_map<T, F>(&mut self, _f: F) -> Result<T, Error> where
-            F: FnOnce(&mut AnimalDecoder, usize) -> Result<T, Error>,
-        {
-            Err(Error::SyntaxError)
-        }
-
-        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)
-        }
-
-        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)
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod deserializer {
-    use super::{Animal, Error};
-
-    use serde::de;
-
-    enum State {
-        AnimalState(Animal),
-        IsizeState(isize),
-        StringState(String),
-        UnitState,
-    }
-
-    pub struct AnimalDeserializer {
-        stack: Vec<State>,
-    }
-
-    impl AnimalDeserializer {
-        #[inline]
-        pub fn new(animal: Animal) -> AnimalDeserializer {
-            AnimalDeserializer {
-                stack: vec!(State::AnimalState(animal)),
-            }
-        }
-    }
-
-    impl de::Deserializer for AnimalDeserializer {
-        type Error = Error;
-
-        #[inline]
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-            where V: de::Visitor,
-        {
-            match self.stack.pop() {
-                Some(State::AnimalState(Animal::Dog)) => {
-                    self.stack.push(State::UnitState);
-                    visitor.visit_enum("Animal", "Dog", DogVisitor {
-                        de: self,
-                    })
-                }
-                Some(State::AnimalState(Animal::Frog(x0, x1))) => {
-                    self.stack.push(State::IsizeState(x1));
-                    self.stack.push(State::StringState(x0));
-                    visitor.visit_enum("Animal", "Frog", FrogVisitor {
-                        de: self,
-                        state: 0,
-                    })
-                }
-                Some(State::IsizeState(value)) => {
-                    visitor.visit_isize(value)
-                }
-                Some(State::StringState(value)) => {
-                    visitor.visit_string(value)
-                }
-                Some(State::UnitState) => {
-                    visitor.visit_unit()
-                }
-                None => {
-                    Err(Error::EndOfStreamError)
-                }
-            }
-        }
-    }
-
-    struct DogVisitor<'a> {
-        de: &'a mut AnimalDeserializer,
-    }
-
-    impl<'a> de::EnumVisitor for DogVisitor<'a> {
-        type Error = Error;
-
-        fn visit_unit(&mut self) -> Result<(), Error> {
-            de::Deserialize::deserialize(self.de)
-        }
-    }
-
-    struct FrogVisitor<'a> {
-        de: &'a mut AnimalDeserializer,
-        state: usize,
-    }
-
-    impl<'a> de::EnumVisitor for FrogVisitor<'a> {
-        type Error = Error;
-
-        fn visit_seq<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-            where V: de::EnumSeqVisitor,
-        {
-            visitor.visit(self)
-        }
-    }
-
-    impl<'a> de::SeqVisitor for FrogVisitor<'a> {
-        type Error = Error;
-
-        fn visit<T>(&mut self) -> Result<Option<T>, Error>
-            where T: de::Deserialize,
-        {
-            match self.state {
-                0 => {
-                    self.state += 1;
-                    Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-                }
-                1 => {
-                    self.state += 1;
-                    Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-                }
-                _ => {
-                    Ok(None)
-                }
-            }
-        }
-
-        fn end(&mut self) -> Result<(), Error> {
-            if self.state == 2 {
-                Ok(())
-            } else {
-                Err(Error::SyntaxError)
-            }
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            let len = 2 - self.state;
-            (len, Some(len))
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[bench]
-fn bench_decoder_dog(b: &mut Bencher) {
-    b.iter(|| {
-        let animal = Dog;
-
-        let mut d = decoder::AnimalDecoder::new(animal.clone());
-        let value: Animal = Decodable::decode(&mut d).unwrap();
-
-        assert_eq!(value, animal);
-    })
-}
-
-#[bench]
-fn bench_decoder_frog(b: &mut Bencher) {
-    b.iter(|| {
-        let animal = Frog("Henry".to_string(), 349);
-
-        let mut d = decoder::AnimalDecoder::new(animal.clone());
-        let value: Animal = Decodable::decode(&mut d).unwrap();
-
-        assert_eq!(value, animal);
-    })
-}
-
-#[bench]
-fn bench_deserializer_dog(b: &mut Bencher) {
-    b.iter(|| {
-        let animal = Dog;
-
-        let mut d = deserializer::AnimalDeserializer::new(animal.clone());
-        let value: Animal = Deserialize::deserialize(&mut d).unwrap();
-
-        assert_eq!(value, animal);
-    })
-}
-
-#[bench]
-fn bench_deserializer_frog(b: &mut Bencher) {
-    b.iter(|| {
-        let animal = Frog("Henry".to_string(), 349);
-
-        let mut d = deserializer::AnimalDeserializer::new(animal.clone());
-        let value: Animal = Deserialize::deserialize(&mut d).unwrap();
-
-        assert_eq!(value, animal);
-    })
-}

benches/bench_map.rs

@@ -1,462 +0,0 @@
-#![feature(custom_derive, core, plugin, test)]
-#![plugin(serde_macros)]
-
-extern crate serde;
-extern crate "rustc-serialize" as rustc_serialize;
-extern crate test;
-
-use std::fmt::Debug;
-use std::collections::HashMap;
-use test::Bencher;
-
-use rustc_serialize::{Decoder, Decodable};
-
-use serde::de::{Deserializer, Deserialize};
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(PartialEq, Debug)]
-pub enum Error {
-    EndOfStream,
-    SyntaxError,
-    MissingField,
-}
-
-impl serde::de::Error for Error {
-    fn syntax_error() -> Error { Error::SyntaxError }
-
-    fn end_of_stream_error() -> Error { Error::EndOfStream }
-
-    fn missing_field_error(_: &'static str) -> Error {
-        Error::MissingField
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod decoder {
-    use std::collections::HashMap;
-    use std::collections::hash_map::IntoIter;
-    use rustc_serialize;
-
-    use super::Error;
-    use self::Value::{StringValue, IsizeValue};
-
-    enum Value {
-        StringValue(String),
-        IsizeValue(isize),
-    }
-
-    pub struct IsizeDecoder {
-        len: usize,
-        iter: IntoIter<String, isize>,
-        stack: Vec<Value>,
-    }
-
-    impl IsizeDecoder {
-        #[inline]
-        pub fn new(values: HashMap<String, isize>) -> IsizeDecoder {
-            IsizeDecoder {
-                len: values.len(),
-                iter: values.into_iter(),
-                stack: vec!(),
-            }
-        }
-    }
-
-    impl rustc_serialize::Decoder for IsizeDecoder {
-        type Error = Error;
-
-        fn error(&mut self, _msg: &str) -> Error {
-            Error::SyntaxError
-        }
-
-        // 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) }
-        #[inline]
-        fn read_isize(&mut self) -> Result<isize, Error> {
-            match self.stack.pop() {
-                Some(IsizeValue(x)) => Ok(x),
-                Some(_) => Err(Error::SyntaxError),
-                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) }
-        #[inline]
-        fn read_str(&mut self) -> Result<String, Error> {
-            match self.stack.pop() {
-                Some(StringValue(x)) => Ok(x),
-                Some(_) => Err(Error::SyntaxError),
-                None => Err(Error::EndOfStream),
-            }
-        }
-
-        // Compound types:
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        // 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)
-        }
-
-        fn read_seq<T, F>(&mut self, _f: F) -> Result<T, Error> where
-            F: FnOnce(&mut IsizeDecoder, usize) -> Result<T, Error>,
-        {
-            Err(Error::SyntaxError)
-        }
-
-        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)
-        }
-
-        #[inline]
-        fn read_map<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut IsizeDecoder, usize) -> Result<T, Error>,
-        {
-            let len = self.len;
-            f(self, len)
-        }
-        #[inline]
-        fn read_map_elt_key<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
-        {
-            match self.iter.next() {
-                Some((key, value)) => {
-                    self.stack.push(IsizeValue(value));
-                    self.stack.push(StringValue(key));
-                    f(self)
-                }
-                None => {
-                    Err(Error::SyntaxError)
-                }
-            }
-        }
-
-        #[inline]
-        fn read_map_elt_val<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut IsizeDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod deserializer {
-    use std::collections::HashMap;
-    use std::collections::hash_map;
-
-    use super::Error;
-
-    use serde::de;
-
-    #[derive(PartialEq, Debug)]
-    enum State {
-        StartState,
-        KeyState(String),
-        ValueState(isize),
-    }
-
-    pub struct IsizeDeserializer {
-        stack: Vec<State>,
-        iter: hash_map::IntoIter<String, isize>,
-    }
-
-    impl IsizeDeserializer {
-        #[inline]
-        pub fn new(values: HashMap<String, isize>) -> IsizeDeserializer {
-            IsizeDeserializer {
-                stack: vec!(State::StartState),
-                iter: values.into_iter(),
-            }
-        }
-    }
-
-    impl de::Deserializer for IsizeDeserializer {
-        type Error = Error;
-
-        fn visit<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)) => {
-                    visitor.visit_string(key)
-                }
-                Some(State::ValueState(value)) => {
-                    visitor.visit_isize(value)
-                }
-                None => {
-                    Err(Error::EndOfStream)
-                }
-            }
-        }
-    }
-
-    impl de::MapVisitor for IsizeDeserializer {
-        type Error = Error;
-
-        fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
-            where K: de::Deserialize,
-        {
-            match self.iter.next() {
-                Some((key, value)) => {
-                    self.stack.push(State::ValueState(value));
-                    self.stack.push(State::KeyState(key));
-                    Ok(Some(try!(de::Deserialize::deserialize(self))))
-                }
-                None => {
-                    Ok(None)
-                }
-            }
-        }
-
-        fn visit_value<V>(&mut self) -> Result<V, Error>
-            where V: de::Deserialize,
-        {
-            de::Deserialize::deserialize(self)
-        }
-
-        fn end(&mut self) -> Result<(), Error> {
-            match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
-                None => Ok(()),
-            }
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            self.iter.size_hint()
-        }
-    }
-
-/*
-    impl Iterator for IsizeDeserializer {
-        type Item = Result<de::Token, Error>;
-
-        #[inline]
-        fn next(&mut self) -> Option<Result<de::Token, Error>> {
-            match self.stack.pop() {
-                Some(StartState) => {
-                    self.stack.push(KeyOrEndState);
-                    Some(Ok(de::Token::MapStart(self.len)))
-                }
-                Some(KeyOrEndState) => {
-                    match self.iter.next() {
-                        Some((key, value)) => {
-                            self.stack.push(ValueState(value));
-                            Some(Ok(de::Token::String(key)))
-                        }
-                        None => {
-                            self.stack.push(EndState);
-                            Some(Ok(de::Token::End))
-                        }
-                    }
-                }
-                Some(ValueState(x)) => {
-                    self.stack.push(KeyOrEndState);
-                    Some(Ok(de::Token::Isize(x)))
-                }
-                Some(EndState) => {
-                    None
-                }
-                None => {
-                    None
-                }
-            }
-        }
-    }
-
-    impl de::Deserializer<Error> for IsizeDeserializer {
-        #[inline]
-        fn end_of_stream_error(&mut self) -> Error {
-            EndOfStream
-        }
-
-        #[inline]
-        fn syntax_error(&mut self, _token: de::Token, _expected: &[de::TokenKind]) -> Error {
-            SyntaxError
-        }
-
-        #[inline]
-        fn unexpected_name_error(&mut self, _token: de::Token) -> Error {
-            SyntaxError
-        }
-
-        #[inline]
-        fn conversion_error(&mut self, _token: de::Token) -> Error {
-            SyntaxError
-        }
-
-        #[inline]
-        fn missing_field<
-            T: de::Deserialize<IsizeDeserializer, Error>
-        >(&mut self, _field: &'static str) -> Result<T, Error> {
-            Err(Error::SyntaxError)
-        }
-    }
-*/
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-fn run_decoder<
-    D: Decoder<Error=Error>,
-    T: Clone + PartialEq + Debug + Decodable
->(mut d: D, value: T) {
-    let v = Decodable::decode(&mut d);
-
-    assert_eq!(Ok(value), v);
-}
-
-#[bench]
-fn bench_decoder_000(b: &mut Bencher) {
-    b.iter(|| {
-        let m: HashMap<String, isize> = HashMap::new();
-        run_decoder(decoder::IsizeDecoder::new(m.clone()), m)
-    })
-}
-
-#[bench]
-fn bench_decoder_003(b: &mut Bencher) {
-    b.iter(|| {
-        let mut m: HashMap<String, isize> = HashMap::new();
-        for i in range(0, 3) {
-            m.insert(i.to_string(), i);
-        }
-        run_decoder(decoder::IsizeDecoder::new(m.clone()), m)
-    })
-}
-
-#[bench]
-fn bench_decoder_100(b: &mut Bencher) {
-    b.iter(|| {
-        let mut m: HashMap<String, isize> = HashMap::new();
-        for i in range(0, 100) {
-            m.insert(i.to_string(), i);
-        }
-        run_decoder(decoder::IsizeDecoder::new(m.clone()), m)
-    })
-}
-
-fn run_deserializer<
-    D: Deserializer<Error=E>,
-    E: Debug,
-    T: Clone + PartialEq + Debug + Deserialize
->(mut d: D, value: T) {
-    let v: T = Deserialize::deserialize(&mut d).unwrap();
-
-    assert_eq!(value, v);
-}
-
-#[bench]
-fn bench_deserializer_000(b: &mut Bencher) {
-    b.iter(|| {
-        let m: HashMap<String, isize> = HashMap::new();
-        run_deserializer(deserializer::IsizeDeserializer::new(m.clone()), m)
-    })
-}
-
-#[bench]
-fn bench_deserializer_003(b: &mut Bencher) {
-    b.iter(|| {
-        let mut m: HashMap<String, isize> = HashMap::new();
-        for i in range(0, 3) {
-            m.insert(i.to_string(), i);
-        }
-        run_deserializer(deserializer::IsizeDeserializer::new(m.clone()), m)
-    })
-}
-
-#[bench]
-fn bench_deserializer_100(b: &mut Bencher) {
-    b.iter(|| {
-        let mut m: HashMap<String, isize> = HashMap::new();
-        for i in range(0, 100) {
-            m.insert(i.to_string(), i);
-        }
-        run_deserializer(deserializer::IsizeDeserializer::new(m.clone()), m)
-    })
-}

benches/bench_struct.rs

@@ -1,726 +0,0 @@
-#![feature(custom_derive, plugin, test)]
-#![plugin(serde_macros)]
-
-extern crate serde;
-extern crate "rustc-serialize" as rustc_serialize;
-extern crate test;
-
-use std::collections::HashMap;
-use test::Bencher;
-
-use rustc_serialize::{Decoder, Decodable};
-
-use serde::de::{Deserializer, Deserialize};
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(Clone, PartialEq, Debug, RustcDecodable)]
-#[derive_deserialize]
-struct Inner {
-    a: (),
-    b: usize,
-    c: HashMap<String, Option<char>>,
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(Clone, PartialEq, Debug, RustcDecodable)]
-#[derive_deserialize]
-struct Outer {
-    inner: Vec<Inner>,
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(Debug)]
-pub enum Error {
-    EndOfStream,
-    SyntaxError,
-    UnexpectedName,
-    ConversionError,
-    MissingField,
-    OtherError,
-}
-
-impl serde::de::Error for Error {
-    fn syntax_error() -> Error { Error::SyntaxError }
-
-    fn end_of_stream_error() -> Error { Error::EndOfStream }
-
-    fn missing_field_error(_: &'static str) -> Error {
-        Error::MissingField
-    }
-}
-
-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),
-    }
-
-    pub struct OuterDecoder {
-        stack: Vec<State>,
-
-    }
-
-    impl OuterDecoder {
-        #[inline]
-        pub fn new(animal: Outer) -> OuterDecoder {
-            OuterDecoder {
-                stack: vec!(OuterState(animal)),
-            }
-        }
-    }
-
-    impl Decoder for OuterDecoder {
-        type Error = Error;
-
-        fn error(&mut self, _msg: &str) -> Error {
-            Error::OtherError
-        }
-
-        // Primitive types:
-        #[inline]
-        fn read_nil(&mut self) -> Result<(), Error> {
-            match self.stack.pop() {
-                Some(NullState) => Ok(()),
-                _ => Err(Error::SyntaxError),
-            }
-        }
-        #[inline]
-        fn read_usize(&mut self) -> Result<usize, Error> {
-            match self.stack.pop() {
-                Some(UsizeState(value)) => Ok(value),
-                _ => 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_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) }
-        #[inline]
-        fn read_char(&mut self) -> Result<char, Error> {
-            match self.stack.pop() {
-                Some(CharState(c)) => Ok(c),
-                _ => Err(Error::SyntaxError),
-            }
-        }
-        #[inline]
-        fn read_str(&mut self) -> Result<String, Error> {
-            match self.stack.pop() {
-                Some(StringState(value)) => Ok(value),
-                _ => Err(Error::SyntaxError),
-            }
-        }
-
-        // Compound types:
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        #[inline]
-        fn read_struct<T, F>(&mut self, s_name: &str, _len: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
-        {
-            match self.stack.pop() {
-                Some(OuterState(Outer { inner })) => {
-                    if s_name == "Outer" {
-                        self.stack.push(VecState(inner));
-                        self.stack.push(FieldState("inner"));
-                        f(self)
-                    } else {
-                        Err(Error::SyntaxError)
-                    }
-                }
-                Some(InnerState(Inner { a: (), b, c })) => {
-                    if s_name == "Inner" {
-                        self.stack.push(MapState(c));
-                        self.stack.push(FieldState("c"));
-
-                        self.stack.push(UsizeState(b));
-                        self.stack.push(FieldState("b"));
-
-                        self.stack.push(NullState);
-                        self.stack.push(FieldState("a"));
-                        f(self)
-                    } else {
-                        Err(Error::SyntaxError)
-                    }
-                }
-                _ => Err(Error::SyntaxError),
-            }
-        }
-        #[inline]
-        fn read_struct_field<T, F>(&mut self, f_name: &str, _f_idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
-        {
-            match self.stack.pop() {
-                Some(FieldState(name)) => {
-                    if f_name == name {
-                        f(self)
-                    } else {
-                        Err(Error::SyntaxError)
-                    }
-                }
-                _ => Err(Error::SyntaxError)
-            }
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        // Specialized types:
-        #[inline]
-        fn read_option<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder, bool) -> Result<T, Error>,
-        {
-            match self.stack.pop() {
-                Some(OptionState(b)) => f(self, b),
-                _ => Err(Error::SyntaxError),
-            }
-        }
-
-        #[inline]
-        fn read_seq<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder, usize) -> Result<T, Error>,
-        {
-            match self.stack.pop() {
-                Some(VecState(value)) => {
-                    let len = value.len();
-                    for inner in value.into_iter().rev() {
-                        self.stack.push(InnerState(inner));
-                    }
-                    f(self, len)
-                }
-                _ => Err(Error::SyntaxError)
-            }
-        }
-        #[inline]
-        fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-
-        #[inline]
-        fn read_map<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder, usize) -> Result<T, Error>,
-        {
-            match self.stack.pop() {
-                Some(MapState(map)) => {
-                    let len = map.len();
-                    for (key, value) in map {
-                        match value {
-                            Some(c) => {
-                                self.stack.push(CharState(c));
-                                self.stack.push(OptionState(true));
-                            }
-                            None => {
-                                self.stack.push(OptionState(false));
-                            }
-                        }
-                        self.stack.push(StringState(key));
-                    }
-                    f(self, len)
-                }
-                _ => Err(Error::SyntaxError),
-            }
-        }
-        #[inline]
-        fn read_map_elt_key<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-
-        #[inline]
-        fn read_map_elt_val<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut OuterDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod deserializer {
-    use std::collections::HashMap;
-    use std::collections::hash_map;
-    use std::vec;
-    use super::{Outer, Inner};
-    use super::Error;
-    use serde::de;
-
-    #[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>>),
-    }
-
-    pub struct OuterDeserializer {
-        stack: Vec<State>,
-    }
-
-    impl OuterDeserializer {
-        #[inline]
-        pub fn new(outer: Outer) -> OuterDeserializer {
-            OuterDeserializer {
-                stack: vec!(State::OuterState(outer)),
-            }
-        }
-    }
-
-    impl de::Deserializer for OuterDeserializer {
-        type Error = Error;
-
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-            where V: de::Visitor,
-        {
-            match self.stack.pop() {
-                Some(State::OuterState(Outer { inner })) => {
-                    self.stack.push(State::VecState(inner));
-                    self.stack.push(State::StrState("inner"));
-
-                    visitor.visit_named_map("Outer", OuterMapVisitor {
-                        de: self,
-                        state: 0,
-                    })
-                }
-                Some(State::InnerState(Inner { a: (), b, c })) => {
-                    self.stack.push(State::MapState(c));
-                    self.stack.push(State::StrState("c"));
-
-                    self.stack.push(State::UsizeState(b));
-                    self.stack.push(State::StrState("b"));
-
-                    self.stack.push(State::NullState);
-                    self.stack.push(State::StrState("a"));
-
-                    visitor.visit_named_map("Inner", InnerMapVisitor {
-                        de: self,
-                        state: 0,
-                    })
-                }
-                Some(State::VecState(value)) => {
-                    visitor.visit_seq(OuterSeqVisitor {
-                        de: self,
-                        iter: value.into_iter(),
-                    })
-                }
-                Some(State::MapState(value)) => {
-                    visitor.visit_map(MapVisitor {
-                        de: self,
-                        iter: value.into_iter(),
-                    })
-                }
-                Some(State::NullState) => {
-                    visitor.visit_unit()
-                }
-                Some(State::UsizeState(x)) => {
-                    visitor.visit_usize(x)
-                }
-                Some(State::CharState(x)) => {
-                    visitor.visit_char(x)
-                }
-                Some(State::StrState(x)) => {
-                    visitor.visit_str(x)
-                }
-                Some(State::StringState(x)) => {
-                    visitor.visit_string(x)
-                }
-                Some(State::OptionState(false)) => {
-                    visitor.visit_none()
-                }
-                Some(State::OptionState(true)) => {
-                    visitor.visit_some(self)
-                }
-                None => Err(Error::EndOfStream),
-            }
-        }
-    }
-
-    struct OuterMapVisitor<'a> {
-        de: &'a mut OuterDeserializer,
-        state: usize,
-    }
-
-    impl<'a> de::MapVisitor for OuterMapVisitor<'a> {
-        type Error = Error;
-
-        fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
-            where K: de::Deserialize,
-        {
-            match self.state {
-                0 => {
-                    self.state += 1;
-                    Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-                }
-                _ => {
-                    Ok(None)
-                }
-            }
-        }
-
-        fn visit_value<V>(&mut self) -> Result<V, Error>
-            where V: de::Deserialize,
-        {
-            de::Deserialize::deserialize(self.de)
-        }
-
-        fn end(&mut self) -> Result<(), Error> {
-            if self.state == 1 {
-                Ok(())
-            } else {
-                Err(Error::SyntaxError)
-            }
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            let len = 1 - self.state;
-            (len, Some(len))
-        }
-    }
-
-    struct OuterSeqVisitor<'a> {
-        de: &'a mut OuterDeserializer,
-        iter: vec::IntoIter<Inner>,
-    }
-
-    impl<'a> de::SeqVisitor for OuterSeqVisitor<'a> {
-        type Error = Error;
-
-        fn visit<T>(&mut self) -> Result<Option<T>, Error>
-            where T: de::Deserialize,
-        {
-            match self.iter.next() {
-                Some(value) => {
-                    self.de.stack.push(State::InnerState(value));
-                    Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-                }
-                None => {
-                    Ok(None)
-                }
-            }
-        }
-
-        fn end(&mut self) -> Result<(), Error> {
-            match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
-                None => Ok(()),
-            }
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            self.iter.size_hint()
-        }
-    }
-
-    struct InnerMapVisitor<'a> {
-        de: &'a mut OuterDeserializer,
-        state: usize,
-    }
-
-    impl<'a> de::MapVisitor for InnerMapVisitor<'a> {
-        type Error = Error;
-
-        fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
-            where K: de::Deserialize,
-        {
-            match self.state {
-                0 ... 2 => {
-                    self.state += 1;
-                    Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-                }
-                _ => {
-                    Ok(None)
-                }
-            }
-        }
-
-        fn visit_value<V>(&mut self) -> Result<V, Error>
-            where V: de::Deserialize,
-        {
-            de::Deserialize::deserialize(self.de)
-        }
-
-        fn end(&mut self) -> Result<(), Error> {
-            if self.state == 1 {
-                Ok(())
-            } else {
-                Err(Error::SyntaxError)
-            }
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            let len = 1 - self.state;
-            (len, Some(len))
-        }
-    }
-
-    struct MapVisitor<'a> {
-        de: &'a mut OuterDeserializer,
-        iter: hash_map::IntoIter<String, Option<char>>,
-    }
-
-    impl<'a> de::MapVisitor for MapVisitor<'a> {
-        type Error = Error;
-
-        fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
-            where K: de::Deserialize,
-        {
-            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));
-                    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));
-                    Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-                }
-                None => {
-                    Ok(None)
-                }
-            }
-        }
-
-        fn visit_value<V>(&mut self) -> Result<V, Error>
-            where V: de::Deserialize,
-        {
-            de::Deserialize::deserialize(self.de)
-        }
-
-        fn end(&mut self) -> Result<(), Error> {
-            match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
-                None => Ok(()),
-            }
-        }
-
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            self.iter.size_hint()
-        }
-    }
-}
-
-#[bench]
-fn bench_decoder_0_0(b: &mut Bencher) {
-    b.iter(|| {
-        let mut map = HashMap::new();
-        map.insert("abc".to_string(), Some('c'));
-
-        let outer = Outer {
-            inner: vec!(),
-        };
-
-        let mut d = decoder::OuterDecoder::new(outer.clone());
-        let value: Outer = Decodable::decode(&mut d).unwrap();
-
-        assert_eq!(value, outer);
-    })
-}
-
-#[bench]
-fn bench_decoder_1_0(b: &mut Bencher) {
-    b.iter(|| {
-        let map = HashMap::new();
-
-        let outer = Outer {
-            inner: vec!(
-                Inner {
-                    a: (),
-                    b: 5,
-                    c: map,
-                },
-            )
-        };
-
-        let mut d = decoder::OuterDecoder::new(outer.clone());
-        let value: Outer = Decodable::decode(&mut d).unwrap();
-
-        assert_eq!(value, outer);
-    })
-}
-
-#[bench]
-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'));
-
-        let outer = Outer {
-            inner: vec!(
-                Inner {
-                    a: (),
-                    b: 5,
-                    c: map,
-                },
-            )
-        };
-
-        let mut d = decoder::OuterDecoder::new(outer.clone());
-        let value: Outer = Decodable::decode(&mut d).unwrap();
-
-        assert_eq!(value, outer);
-    })
-}
-
-#[bench]
-fn bench_deserializer_0_0(b: &mut Bencher) {
-    b.iter(|| {
-        let outer = Outer {
-            inner: vec!(),
-        };
-
-        let mut d = deserializer::OuterDeserializer::new(outer.clone());
-        let value: Outer = Deserialize::deserialize(&mut d).unwrap();
-
-        assert_eq!(value, outer);
-    })
-}
-
-#[bench]
-fn bench_deserializer_1_0(b: &mut Bencher) {
-    b.iter(|| {
-        let map = HashMap::new();
-
-        let outer = Outer {
-            inner: vec!(
-                Inner {
-                    a: (),
-                    b: 5,
-                    c: map,
-                },
-            )
-        };
-
-        let mut d = deserializer::OuterDeserializer::new(outer.clone());
-        let value: Outer = Deserialize::deserialize(&mut d).unwrap();
-
-        assert_eq!(value, outer);
-    })
-}
-
-#[bench]
-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'));
-
-        let outer = Outer {
-            inner: vec!(
-                Inner {
-                    a: (),
-                    b: 5,
-                    c: map,
-                },
-            )
-        };
-
-        let mut d = deserializer::OuterDeserializer::new(outer.clone());
-        let value: Outer = Deserialize::deserialize(&mut d).unwrap();
-
-        assert_eq!(value, outer);
-    })
-}

benches/bench_vec.rs

@@ -1,615 +0,0 @@
-#![feature(core, plugin, test)]
-#![plugin(serde_macros)]
-
-extern crate serde;
-extern crate "rustc-serialize" as rustc_serialize;
-extern crate test;
-
-use std::fmt::Debug;
-use test::Bencher;
-
-use rustc_serialize::{Decoder, Decodable};
-
-use serde::de::{Deserializer, Deserialize};
-
-//////////////////////////////////////////////////////////////////////////////
-
-#[derive(PartialEq, Debug)]
-pub enum Error {
-    EndOfStreamError,
-    SyntaxError,
-}
-
-impl serde::de::Error for Error {
-    fn syntax_error() -> Error { Error::SyntaxError }
-
-    fn end_of_stream_error() -> Error { Error::EndOfStreamError }
-
-    fn missing_field_error(_: &'static str) -> Error { Error::SyntaxError }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod decoder {
-    use std::vec;
-    use rustc_serialize;
-
-    use super::Error;
-
-    pub struct UsizeDecoder {
-        len: usize,
-        iter: vec::IntoIter<usize>,
-    }
-
-    impl UsizeDecoder {
-        #[inline]
-        pub fn new(values: Vec<usize>) -> UsizeDecoder {
-            UsizeDecoder {
-                len: values.len(),
-                iter: values.into_iter(),
-            }
-        }
-    }
-
-    impl rustc_serialize::Decoder for UsizeDecoder {
-        type Error = Error;
-
-        fn error(&mut self, _: &str) -> Error { Error::SyntaxError }
-
-        // Primitive types:
-        fn read_nil(&mut self) -> Result<(), Error> { Err(Error::SyntaxError) }
-        #[inline]
-        fn read_usize(&mut self) -> Result<usize, Error> {
-            match self.iter.next() {
-                Some(value) => Ok(value),
-                None => Err(Error::EndOfStreamError),
-            }
-        }
-        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) }
-
-        // 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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        // 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)
-        }
-
-        #[inline]
-        fn read_seq<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut UsizeDecoder, usize) -> Result<T, Error>,
-        {
-            let len = self.len;
-            f(self, len)
-        }
-        #[inline]
-        fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut UsizeDecoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-
-        fn read_map<T, F>(&mut self, _f: F) -> Result<T, Error> where
-            F: FnOnce(&mut UsizeDecoder, usize) -> Result<T, Error>,
-        {
-            Err(Error::SyntaxError)
-        }
-
-        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)
-        }
-
-        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)
-        }
-    }
-
-
-    pub struct U8Decoder {
-        len: usize,
-        iter: vec::IntoIter<u8>,
-    }
-
-    impl U8Decoder {
-        #[inline]
-        pub fn new(values: Vec<u8>) -> U8Decoder {
-            U8Decoder {
-                len: values.len(),
-                iter: values.into_iter(),
-            }
-        }
-    }
-
-    impl rustc_serialize::Decoder for U8Decoder {
-        type Error = Error;
-
-        fn error(&mut self, _: &str) -> Error { Error::SyntaxError }
-
-        // 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) }
-        #[inline]
-        fn read_u8(&mut self) -> Result<u8, Error> {
-            match self.iter.next() {
-                Some(value) => Ok(value),
-                None => Err(Error::EndOfStreamError),
-            }
-        }
-        #[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) }
-
-        // 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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        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)
-        }
-
-        // 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)
-        }
-
-        #[inline]
-        fn read_seq<T, F>(&mut self, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut U8Decoder, usize) -> Result<T, Error>,
-        {
-            let len = self.len;
-            f(self, len)
-        }
-        #[inline]
-        fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Error> where
-            F: FnOnce(&mut U8Decoder) -> Result<T, Error>,
-        {
-            f(self)
-        }
-
-        fn read_map<T, F>(&mut self, _f: F) -> Result<T, Error> where
-            F: FnOnce(&mut U8Decoder, usize) -> Result<T, Error>,
-        {
-            Err(Error::SyntaxError)
-        }
-
-        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)
-        }
-
-        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)
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-mod deserializer {
-    //use std::num;
-    use std::vec;
-
-    use super::Error;
-
-    use serde::de;
-
-    #[derive(PartialEq, Debug)]
-    enum State {
-        StartState,
-        SepOrEndState,
-        EndState,
-    }
-
-    pub struct Deserializer<A> {
-        state: State,
-        iter: vec::IntoIter<A>,
-        len: usize,
-        value: Option<A>,
-    }
-
-    impl<A> Deserializer<A> {
-        #[inline]
-        pub fn new(values: Vec<A>) -> Deserializer<A> {
-            let len = values.len();
-            Deserializer {
-                state: State::StartState,
-                iter: values.into_iter(),
-                len: len,
-                value: None,
-            }
-        }
-    }
-
-    impl de::Deserializer for Deserializer<usize> {
-        type Error = Error;
-
-        #[inline]
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-            where V: de::Visitor,
-        {
-            match self.state {
-                State::StartState => {
-                    self.state = State::SepOrEndState;
-                    visitor.visit_seq(self)
-                }
-                State::SepOrEndState => {
-                    visitor.visit_usize(self.value.take().unwrap())
-                }
-                State::EndState => {
-                    Err(Error::EndOfStreamError)
-                }
-            }
-        }
-    }
-
-    impl de::SeqVisitor for Deserializer<usize> {
-        type Error = Error;
-
-        #[inline]
-        fn visit<T>(&mut self) -> Result<Option<T>, Error>
-            where T: de::Deserialize,
-        {
-            match self.iter.next() {
-                Some(value) => {
-                    self.len -= 1;
-                    self.value = Some(value);
-                    Ok(Some(try!(de::Deserialize::deserialize(self))))
-                }
-                None => {
-                    self.state = State::EndState;
-                    Ok(None)
-                }
-            }
-        }
-
-        #[inline]
-        fn end(&mut self) -> Result<(), Error> {
-            match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
-                None => {
-                    self.state = State::EndState;
-                    Ok(())
-                }
-            }
-        }
-
-        #[inline]
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            (self.len, Some(self.len))
-        }
-    }
-
-    impl de::Deserializer for Deserializer<u8> {
-        type Error = Error;
-
-        #[inline]
-        fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-            where V: de::Visitor,
-        {
-            match self.state {
-                State::StartState => {
-                    self.state = State::SepOrEndState;
-                    visitor.visit_seq(self)
-                }
-                State::SepOrEndState => {
-                    visitor.visit_u8(self.value.take().unwrap())
-                }
-                State::EndState => {
-                    Err(Error::EndOfStreamError)
-                }
-            }
-        }
-    }
-
-    impl de::SeqVisitor for Deserializer<u8> {
-        type Error = Error;
-
-        #[inline]
-        fn visit<T>(&mut self) -> Result<Option<T>, Error>
-            where T: de::Deserialize,
-        {
-            match self.iter.next() {
-                Some(value) => {
-                    self.len -= 1;
-                    self.value = Some(value);
-                    Ok(Some(try!(de::Deserialize::deserialize(self))))
-                }
-                None => {
-                    self.state = State::EndState;
-                    Ok(None)
-                }
-            }
-        }
-
-        #[inline]
-        fn end(&mut self) -> Result<(), Error> {
-            match self.iter.next() {
-                Some(_) => Err(Error::SyntaxError),
-                None => {
-                    self.state = State::EndState;
-                    Ok(())
-                }
-            }
-        }
-
-        #[inline]
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            (self.len, Some(self.len))
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-fn run_decoder<
-    D: Decoder<Error=Error>,
-    T: Clone + PartialEq + Debug + Decodable
->(mut d: D, value: T) {
-    let v = Decodable::decode(&mut d);
-
-    assert_eq!(Ok(value), v);
-}
-
-fn run_deserializer<
-    D: Deserializer<Error=E>,
-    E: Debug,
-    T: Clone + PartialEq + Debug + Deserialize
->(mut d: D, value: T) {
-    let v: T = Deserialize::deserialize(&mut d).unwrap();
-
-    assert_eq!(value, v);
-}
-
-#[bench]
-fn bench_decoder_usize_000(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<usize> = vec!();
-        run_decoder(decoder::UsizeDecoder::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_decoder_usize_003(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<usize> = vec!(1, 2, 3);
-        run_decoder(decoder::UsizeDecoder::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_decoder_usize_100(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<usize> = range(0, 100).collect();
-        run_decoder(decoder::UsizeDecoder::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_decoder_u8_000(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<u8> = vec!();
-        run_decoder(decoder::U8Decoder::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_decoder_u8_003(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<u8> = vec!(1, 2, 3);
-        run_decoder(decoder::U8Decoder::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_decoder_u8_100(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<u8> = range(0u8, 100).collect();
-        run_decoder(decoder::U8Decoder::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_deserializer_usize_000(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<usize> = vec!();
-        run_deserializer(deserializer::Deserializer::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_deserializer_usize_003(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<usize> = vec!(1, 2, 3);
-        run_deserializer(deserializer::Deserializer::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_deserializer_usize_100(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<usize> = range(0, 100).collect();
-        run_deserializer(deserializer::Deserializer::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_deserializer_u8_000(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<u8> = vec!();
-        run_deserializer(deserializer::Deserializer::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_deserializer_u8_003(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<u8> = vec!(1, 2, 3);
-        run_deserializer(deserializer::Deserializer::new(v.clone()), v)
-    })
-}
-
-#[bench]
-fn bench_deserializer_u8_100(b: &mut Bencher) {
-    b.iter(|| {
-        let v: Vec<u8> = range(0u8, 100).collect();
-        run_deserializer(deserializer::Deserializer::new(v.clone()), v)
-    })
-}

serde/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "serde"
+version = "0.9.13"
+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://docs.serde.rs/serde/"
+keywords = ["serde", "serialization", "no_std"]
+categories = ["encoding"]
+readme = "../README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }
+
+[features]
+default = ["std"]
+derive = ["serde_derive"]
+
+std = []
+unstable = []
+alloc = ["unstable"]
+collections = ["alloc"]
+unstable-testing = ["unstable", "std"]
+
+# to get serde_derive picked up by play.integer32.com
+playground = ["serde_derive"]
+
+[dependencies]
+serde_derive = { version = "0.9", optional = true, path = "../serde_derive" }
+
+[dev-dependencies]
+serde_derive = { version = "0.9", path = "../serde_derive" }

serde/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

serde/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

serde/README.md

@@ -0,0 +1 @@
+../README.md

serde/src/bytes.rs

@@ -0,0 +1,315 @@
+//! Wrapper types to enable optimized handling of `&[u8]` and `Vec<u8>`.
+//!
+//! Without specialization, Rust forces us to treat `&[u8]` just like any other
+//! slice and `Vec<u8>` just like any other vector. In reality this particular
+//! slice and vector can often be serialized and deserialized in a more
+//! efficient, compact representation in many formats.
+//!
+//! When working with such a format, you can opt into specialized handling of
+//! `&[u8]` by wrapping it in `bytes::Bytes` and `Vec<u8>` by wrapping it in
+//! `bytes::ByteBuf`.
+//!
+//! Rust support for specialization is being tracked in
+//! [rust-lang/rust#31844][specialization]. Once it lands in the stable compiler
+//! we will be deprecating these wrapper types in favor of optimizing `&[u8]`
+//! and `Vec<u8>` out of the box.
+//!
+//! [specialization]: https://github.com/rust-lang/rust/issues/31844
+
+use core::{ops, fmt, char, iter, slice};
+use core::fmt::Write;
+
+use ser;
+
+#[cfg(any(feature = "std", feature = "collections"))]
+pub use self::bytebuf::ByteBuf;
+
+#[cfg(any(feature = "std", feature = "collections"))]
+#[doc(hidden)] // does anybody need this?
+pub use self::bytebuf::ByteBufVisitor;
+
+#[cfg(feature = "collections")]
+use collections::Vec;
+
+///////////////////////////////////////////////////////////////////////////////
+
+/// Wraps a `&[u8]` in order to serialize in an efficient way. Does not support
+/// deserialization.
+///
+/// ```rust
+/// # #[macro_use] extern crate serde_derive;
+/// # extern crate serde;
+/// # use std::net::IpAddr;
+/// #
+/// use serde::bytes::Bytes;
+///
+/// # #[allow(dead_code)]
+/// #[derive(Serialize)]
+/// struct Packet<'a> {
+///     destination: IpAddr,
+///     payload: Bytes<'a>,
+/// }
+/// #
+/// # fn main() {}
+/// ```
+#[derive(Clone, Copy, Eq, Hash, PartialEq, PartialOrd, Ord)]
+pub struct Bytes<'a> {
+    bytes: &'a [u8],
+}
+
+impl<'a> Bytes<'a> {
+    /// Wrap an existing `&[u8]`.
+    pub fn new(bytes: &'a [u8]) -> Self {
+        Bytes { bytes: bytes }
+    }
+}
+
+impl<'a> fmt::Debug for Bytes<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        try!(f.write_str("b\""));
+        for c in escape_bytestring(self.bytes) {
+            try!(f.write_char(c));
+        }
+        f.write_char('"')
+    }
+}
+
+impl<'a> From<&'a [u8]> for Bytes<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
+        Bytes::new(bytes)
+    }
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<'a> From<&'a Vec<u8>> for Bytes<'a> {
+    fn from(bytes: &'a Vec<u8>) -> Self {
+        Bytes::new(bytes)
+    }
+}
+
+impl<'a> Into<&'a [u8]> for Bytes<'a> {
+    fn into(self) -> &'a [u8] {
+        self.bytes
+    }
+}
+
+impl<'a> ops::Deref for Bytes<'a> {
+    type Target = [u8];
+
+    fn deref(&self) -> &[u8] {
+        self.bytes
+    }
+}
+
+impl<'a> ser::Serialize for Bytes<'a> {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: ser::Serializer
+    {
+        serializer.serialize_bytes(self.bytes)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(any(feature = "std", feature = "collections"))]
+mod bytebuf {
+    use core::cmp;
+    use core::ops;
+    use core::fmt;
+    use core::fmt::Write;
+
+    use ser;
+    use de;
+
+    #[cfg(feature = "collections")]
+    use collections::{String, Vec};
+
+    /// Wraps a `Vec<u8>` in order to serialize and deserialize in an efficient
+    /// way.
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate serde_derive;
+    /// # extern crate serde;
+    /// # use std::net::IpAddr;
+    /// #
+    /// use serde::bytes::ByteBuf;
+    ///
+    /// # #[allow(dead_code)]
+    /// #[derive(Serialize, Deserialize)]
+    /// struct Packet {
+    ///     destination: IpAddr,
+    ///     payload: ByteBuf,
+    /// }
+    /// #
+    /// # fn main() {}
+    /// ```
+    #[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::from(Vec::new())
+        }
+
+        /// Construct a new, empty `ByteBuf` with the specified capacity.
+        pub fn with_capacity(cap: usize) -> Self {
+            ByteBuf::from(Vec::with_capacity(cap))
+        }
+
+        /// Wrap existing bytes in a `ByteBuf`.
+        pub fn from<T: Into<Vec<u8>>>(bytes: T) -> Self {
+            ByteBuf { bytes: bytes.into() }
+        }
+    }
+
+    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 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::from(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: S) -> Result<S::Ok, 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;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("byte array")
+        }
+
+        #[inline]
+        fn visit_unit<E>(self) -> Result<ByteBuf, E>
+            where E: de::Error
+        {
+            Ok(ByteBuf::new())
+        }
+
+        #[inline]
+        fn visit_seq<V>(self, mut visitor: V) -> Result<ByteBuf, V::Error>
+            where V: de::SeqVisitor
+        {
+            let len = cmp::min(visitor.size_hint().0, 4096);
+            let mut values = Vec::with_capacity(len);
+
+            while let Some(value) = try!(visitor.visit()) {
+                values.push(value);
+            }
+
+            Ok(ByteBuf::from(values))
+        }
+
+        #[inline]
+        fn visit_bytes<E>(self, v: &[u8]) -> Result<ByteBuf, E>
+            where E: de::Error
+        {
+            Ok(ByteBuf::from(v))
+        }
+
+        #[inline]
+        fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<ByteBuf, E>
+            where E: de::Error
+        {
+            Ok(ByteBuf::from(v))
+        }
+
+        fn visit_str<E>(self, v: &str) -> Result<ByteBuf, E>
+            where E: de::Error
+        {
+            Ok(ByteBuf::from(v))
+        }
+
+        fn visit_string<E>(self, v: String) -> Result<ByteBuf, E>
+            where E: de::Error
+        {
+            Ok(ByteBuf::from(v))
+        }
+    }
+
+    impl de::Deserialize for ByteBuf {
+        #[inline]
+        fn deserialize<D>(deserializer: D) -> Result<ByteBuf, D::Error>
+            where D: de::Deserializer
+        {
+            deserializer.deserialize_byte_buf(ByteBufVisitor)
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[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()
+    }
+    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/private.rs

@@ -0,0 +1,44 @@
+use core::marker::PhantomData;
+
+use de::{Deserialize, Deserializer, Error, Visitor};
+
+#[cfg(any(feature = "std", feature = "collections"))]
+pub use de::content::{Content, ContentRefDeserializer, ContentDeserializer, TaggedContentVisitor,
+                      TagOrContentField, TagOrContentFieldVisitor, InternallyTaggedUnitVisitor,
+                      UntaggedUnitVisitor};
+
+/// If the missing field is of type `Option<T>` then treat is as `None`,
+/// otherwise it is an error.
+pub fn missing_field<V, E>(field: &'static str) -> Result<V, E>
+    where V: Deserialize,
+          E: Error
+{
+    struct MissingFieldDeserializer<E>(&'static str, PhantomData<E>);
+
+    impl<E> Deserializer for MissingFieldDeserializer<E>
+        where E: Error
+    {
+        type Error = E;
+
+        fn deserialize<V>(self, _visitor: V) -> Result<V::Value, E>
+            where V: Visitor
+        {
+            Err(Error::missing_field(self.0))
+        }
+
+        fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, E>
+            where V: Visitor
+        {
+            visitor.visit_none()
+        }
+
+        forward_to_deserialize! {
+            bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit seq
+            seq_fixed_size bytes byte_buf map unit_struct newtype_struct
+            tuple_struct struct struct_field tuple enum ignored_any
+        }
+    }
+
+    let deserializer = MissingFieldDeserializer(field, PhantomData);
+    Deserialize::deserialize(deserializer)
+}

serde/src/error.rs

@@ -0,0 +1,17 @@
+//! A stand-in for `std::error`
+use core::fmt::{Debug, Display};
+
+/// A stand-in for `std::error::Error`, which requires no allocation.
+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
+    }
+}

serde/src/export.rs

@@ -0,0 +1,36 @@
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::String;
+
+#[cfg(feature = "std")]
+use std::borrow::Cow;
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::borrow::Cow;
+
+pub use core::clone::Clone;
+pub use core::convert::{From, Into};
+pub use core::default::Default;
+pub use core::fmt;
+pub use core::marker::PhantomData;
+pub use core::option::Option::{self, None, Some};
+pub use core::result::Result::{self, Ok, Err};
+
+#[cfg(any(feature = "collections", feature = "std"))]
+pub fn from_utf8_lossy(bytes: &[u8]) -> Cow<str> {
+    String::from_utf8_lossy(bytes)
+}
+
+// The generated code calls this like:
+//
+//     let value = &_serde::export::from_utf8_lossy(bytes);
+//     Err(_serde::de::Error::unknown_variant(value, VARIANTS))
+//
+// so it is okay for the return type to be different from the std case as long
+// as the above works.
+#[cfg(not(any(feature = "collections", feature = "std")))]
+pub fn from_utf8_lossy(bytes: &[u8]) -> &str {
+    use core::str;
+    // Three unicode replacement characters if it fails. They look like a
+    // white-on-black question mark. The user will recognize it as invalid
+    // UTF-8.
+    str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}")
+}

serde/src/iter.rs

@@ -0,0 +1,73 @@
+//! Module that contains helper iterators.
+
+use std::io;
+use std::iter::Peekable;
+
+/// Iterator over a byte stream that tracks the current position's line and column.
+pub struct LineColIterator<Iter: Iterator<Item = io::Result<u8>>> {
+    iter: Iter,
+    line: usize,
+    col: usize,
+}
+
+impl<Iter: Iterator<Item = io::Result<u8>>> LineColIterator<Iter> {
+    /// Construct a new `LineColIterator<Iter>`.
+    pub fn new(iter: Iter) -> LineColIterator<Iter> {
+        LineColIterator {
+            iter: iter,
+            line: 1,
+            col: 0,
+        }
+    }
+
+    /// Report the current line inside the iterator.
+    pub fn line(&self) -> usize {
+        self.line
+    }
+
+    /// Report the current column inside the iterator.
+    pub fn col(&self) -> usize {
+        self.col
+    }
+
+    /// Gets a reference to the underlying iterator.
+    pub fn get_ref(&self) -> &Iter {
+        &self.iter
+    }
+
+    /// Gets a mutable reference to the underlying iterator.
+    pub fn get_mut(&mut self) -> &mut Iter {
+        &mut self.iter
+    }
+
+    /// Unwraps this `LineColIterator`, returning the underlying iterator.
+    pub fn into_inner(self) -> Iter {
+        self.iter
+    }
+}
+
+impl<Iter: Iterator<Item = io::Result<u8>>> LineColIterator<Peekable<Iter>> {
+    /// peeks at the next value
+    pub fn peek(&mut self) -> Option<&io::Result<u8>> {
+        self.iter.peek()
+    }
+}
+
+impl<Iter: Iterator<Item = io::Result<u8>>> Iterator for LineColIterator<Iter> {
+    type Item = io::Result<u8>;
+    fn next(&mut self) -> Option<io::Result<u8>> {
+        match self.iter.next() {
+            None => None,
+            Some(Ok(b'\n')) => {
+                self.line += 1;
+                self.col = 0;
+                Some(Ok(b'\n'))
+            }
+            Some(Ok(c)) => {
+                self.col += 1;
+                Some(Ok(c))
+            }
+            Some(Err(e)) => Some(Err(e)),
+        }
+    }
+}

serde/src/lib.rs

@@ -0,0 +1,155 @@
+//! # Serde
+//!
+//! Serde is a framework for ***ser***ializing and ***de***serializing Rust data
+//! structures efficiently and generically.
+//!
+//! The Serde ecosystem consists of data structures that know how to serialize
+//! and deserialize themselves along with data formats that know how to
+//! serialize and deserialize other things. Serde provides the layer by which
+//! these two groups interact with each other, allowing any supported data
+//! structure to be serialized and deserialized using any supported data format.
+//!
+//! See the Serde website https://serde.rs/ for additional documentation and
+//! usage examples.
+//!
+//! ### Design
+//!
+//! Where many other languages rely on runtime reflection for serializing data,
+//! Serde is instead built on Rust's powerful trait system. A data structure
+//! that knows how to serialize and deserialize itself is one that implements
+//! Serde's `Serialize` and `Deserialize` traits (or uses Serde's code
+//! generation to automatically derive implementations at compile time). This
+//! avoids any overhead of reflection or runtime type information. In fact in
+//! many situations the interaction between data structure and data format can
+//! be completely optimized away by the Rust compiler, leaving Serde
+//! serialization to perform roughly the same speed as a handwritten serializer
+//! for the specific selection of data structure and data format.
+//!
+//! ### Data formats
+//!
+//! The following is a partial list of data formats that have been implemented
+//! for Serde by the community.
+//!
+//! - [JSON](https://github.com/serde-rs/json), the ubiquitous JavaScript Object
+//!   Notation used by many HTTP APIs.
+//! - [Bincode](https://github.com/TyOverby/bincode), a compact binary format
+//!   used for IPC within the Servo rendering engine.
+//! - [CBOR](https://github.com/pyfisch/cbor), a Concise Binary Object
+//!   Representation designed for small message size without the need for
+//!   version negotiation.
+//! - [YAML](https://github.com/dtolnay/serde-yaml), a popular human-friendly
+//!   configuration language that ain't markup language.
+//! - [MessagePack](https://github.com/3Hren/msgpack-rust), an efficient binary
+//!   format that resembles a compact JSON.
+//! - [TOML](https://github.com/alexcrichton/toml-rs), a minimal configuration
+//!   format used by [Cargo](http://doc.crates.io/manifest.html).
+//! - [Pickle](https://github.com/birkenfeld/serde-pickle), a format common in
+//!   the Python world.
+//! - [Hjson](https://github.com/laktak/hjson-rust), a variant of JSON designed
+//!   to be readable and writable by humans.
+//! - [BSON](https://github.com/zonyitoo/bson-rs), the data storage and network
+//!   transfer format used by MongoDB.
+//! - [URL](https://github.com/nox/serde_urlencoded), the x-www-form-urlencoded
+//!   format.
+//! - [XML](https://github.com/serde-rs/xml), the flexible machine-friendly W3C
+//!   standard. *(deserialization only)*
+//! - [Envy](https://github.com/softprops/envy), a way to deserialize
+//!   environment variables into Rust structs. *(deserialization only)*
+//! - [Redis](https://github.com/OneSignal/serde-redis), deserialize values from
+//!   Redis when using [redis-rs](https://crates.io/crates/redis).
+//!   *(deserialization only)*
+
+#![doc(html_root_url="https://docs.serde.rs")]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(feature = "unstable", feature(nonzero, specialization, zero_one, into_boxed_c_str))]
+#![cfg_attr(feature = "alloc", feature(alloc))]
+#![cfg_attr(feature = "collections", feature(collections))]
+#![cfg_attr(feature = "cargo-clippy", allow(linkedlist, type_complexity, doc_markdown))]
+#![deny(missing_docs)]
+
+#[cfg(feature = "collections")]
+extern crate collections;
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[cfg(feature = "unstable")]
+extern crate core as actual_core;
+
+#[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, cell, default, result, option,
+                  clone, convert};
+    #[cfg(feature = "unstable")]
+    pub use actual_core::nonzero;
+}
+
+#[doc(inline)]
+pub use ser::{Serialize, Serializer};
+#[doc(inline)]
+pub use de::{Deserialize, Deserializer};
+
+#[macro_use]
+mod macros;
+
+pub mod bytes;
+pub mod de;
+#[cfg(feature = "std")]
+#[doc(hidden)]
+pub mod iter;
+pub mod ser;
+#[cfg_attr(feature = "std", doc(hidden))]
+pub mod error;
+mod utils;
+
+// Generated code uses these to support no_std. Not public API.
+#[doc(hidden)]
+pub mod export;
+
+// Re-export #[derive(Serialize, Deserialize)].
+//
+// This is a workaround for https://github.com/rust-lang/cargo/issues/1286.
+// Without this re-export, crates that put Serde derives behind a cfg_attr would
+// need to use some silly feature name that depends on both serde and
+// serde_derive.
+//
+//     [features]
+//     serde-impls = ["serde", "serde_derive"]
+//
+//     [dependencies]
+//     serde = { version = "1.0", optional = true }
+//     serde_derive = { version = "1.0", optional = true }
+//
+//     # Used like this:
+//     # #[cfg(feature = "serde-impls")]
+//     # #[macro_use]
+//     # extern crate serde_derive;
+//     #
+//     # #[cfg_attr(feature = "serde-impls", derive(Serialize, Deserialize))]
+//     # struct S { /* ... */ }
+//
+// The re-exported derives allow crates to use "serde" as the name of their
+// Serde feature which is more intuitive.
+//
+//     [dependencies]
+//     serde = { version = "1.0", optional = true, features = ["derive"] }
+//
+//     # Used like this:
+//     # #[cfg(feature = "serde")]
+//     # #[macro_use]
+//     # extern crate serde;
+//     #
+//     # #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+//     # struct S { /* ... */ }
+//
+// The reason re-exporting is not enabled by default is that disabling it would
+// be annoying for crates that provide handwritten impls or data formats. They
+// would need to disable default features and then explicitly re-enable std.
+#[cfg(feature = "serde_derive")]
+#[allow(unused_imports)]
+#[macro_use]
+extern crate serde_derive;
+#[cfg(feature = "serde_derive")]
+#[doc(hidden)]
+pub use serde_derive::*;

serde/src/macros.rs

@@ -0,0 +1,207 @@
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_method {
+    ($func:ident($($arg:ty),*)) => {
+        #[inline]
+        fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> $crate::export::Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor
+        {
+            self.deserialize(visitor)
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_helper {
+    (bool) => {
+        forward_to_deserialize_method!{deserialize_bool()}
+    };
+    (u8) => {
+        forward_to_deserialize_method!{deserialize_u8()}
+    };
+    (u16) => {
+        forward_to_deserialize_method!{deserialize_u16()}
+    };
+    (u32) => {
+        forward_to_deserialize_method!{deserialize_u32()}
+    };
+    (u64) => {
+        forward_to_deserialize_method!{deserialize_u64()}
+    };
+    (i8) => {
+        forward_to_deserialize_method!{deserialize_i8()}
+    };
+    (i16) => {
+        forward_to_deserialize_method!{deserialize_i16()}
+    };
+    (i32) => {
+        forward_to_deserialize_method!{deserialize_i32()}
+    };
+    (i64) => {
+        forward_to_deserialize_method!{deserialize_i64()}
+    };
+    (f32) => {
+        forward_to_deserialize_method!{deserialize_f32()}
+    };
+    (f64) => {
+        forward_to_deserialize_method!{deserialize_f64()}
+    };
+    (char) => {
+        forward_to_deserialize_method!{deserialize_char()}
+    };
+    (str) => {
+        forward_to_deserialize_method!{deserialize_str()}
+    };
+    (string) => {
+        forward_to_deserialize_method!{deserialize_string()}
+    };
+    (unit) => {
+        forward_to_deserialize_method!{deserialize_unit()}
+    };
+    (option) => {
+        forward_to_deserialize_method!{deserialize_option()}
+    };
+    (seq) => {
+        forward_to_deserialize_method!{deserialize_seq()}
+    };
+    (seq_fixed_size) => {
+        forward_to_deserialize_method!{deserialize_seq_fixed_size(usize)}
+    };
+    (bytes) => {
+        forward_to_deserialize_method!{deserialize_bytes()}
+    };
+    (byte_buf) => {
+        forward_to_deserialize_method!{deserialize_byte_buf()}
+    };
+    (map) => {
+        forward_to_deserialize_method!{deserialize_map()}
+    };
+    (unit_struct) => {
+        forward_to_deserialize_method!{deserialize_unit_struct(&'static str)}
+    };
+    (newtype_struct) => {
+        forward_to_deserialize_method!{deserialize_newtype_struct(&'static str)}
+    };
+    (tuple_struct) => {
+        forward_to_deserialize_method!{deserialize_tuple_struct(&'static str, usize)}
+    };
+    (struct) => {
+        forward_to_deserialize_method!{deserialize_struct(&'static str, &'static [&'static str])}
+    };
+    (struct_field) => {
+        forward_to_deserialize_method!{deserialize_struct_field()}
+    };
+    (tuple) => {
+        forward_to_deserialize_method!{deserialize_tuple(usize)}
+    };
+    (enum) => {
+        forward_to_deserialize_method!{deserialize_enum(&'static str, &'static [&'static str])}
+    };
+    (ignored_any) => {
+        forward_to_deserialize_method!{deserialize_ignored_any()}
+    };
+}
+
+// Super explicit first paragraph because this shows up at the top level and
+// trips up people who are just looking for basic Serialize / Deserialize
+// documentation.
+//
+/// Helper macro when implementing the `Deserializer` part of a new data format
+/// for Serde.
+///
+/// Some `Deserializer` implementations for self-describing formats do not care
+/// what hint the `Visitor` gives them, they just want to blindly call the
+/// `Visitor` method corresponding to the data they can tell is in the input.
+/// This requires repetitive implementations of all the `Deserializer` trait
+/// methods.
+///
+/// ```rust
+/// # #[macro_use] extern crate serde;
+/// # use serde::de::{value, Deserializer, Visitor};
+/// # pub struct MyDeserializer;
+/// # impl Deserializer for MyDeserializer {
+/// #     type Error = value::Error;
+/// #     fn deserialize<V>(self, _: V) -> Result<V::Value, Self::Error>
+/// #         where V: Visitor
+/// #     { unimplemented!() }
+/// #
+/// #[inline]
+/// fn deserialize_bool<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+///     where V: Visitor
+/// {
+///     self.deserialize(visitor)
+/// }
+/// #     forward_to_deserialize! {
+/// #         u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit option
+/// #         seq seq_fixed_size bytes byte_buf map unit_struct newtype_struct
+/// #         tuple_struct struct struct_field tuple enum ignored_any
+/// #     }
+/// # }
+/// # fn main() {}
+/// ```
+///
+/// The `forward_to_deserialize!` macro implements these simple forwarding
+/// methods so that they forward directly to `Deserializer::deserialize`. You
+/// can choose which methods to forward.
+///
+/// ```rust
+/// # #[macro_use] extern crate serde;
+/// # use serde::de::{value, Deserializer, Visitor};
+/// # pub struct MyDeserializer;
+/// impl Deserializer for MyDeserializer {
+/// #   type Error = value::Error;
+///     fn deserialize<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+///         where V: Visitor
+///     {
+///         /* ... */
+/// #       let _ = visitor;
+/// #       unimplemented!()
+///     }
+///
+///     forward_to_deserialize! {
+///         bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit option
+///         seq seq_fixed_size bytes byte_buf map unit_struct newtype_struct
+///         tuple_struct struct struct_field tuple enum ignored_any
+///     }
+/// }
+/// # fn main() {}
+/// ```
+#[macro_export]
+macro_rules! forward_to_deserialize {
+    ($($func:ident)*) => {
+        $(forward_to_deserialize_helper!{$func})*
+    };
+}
+
+/// Seralize the `$value` that implements Display as a string,
+/// when that string is statically known to never have more than
+/// a constant `$MAX_LEN` bytes.
+///
+/// Panics if the Display impl tries to write more than `$MAX_LEN` bytes.
+#[cfg(feature = "std")]
+// Not exported
+macro_rules! serialize_display_bounded_length {
+    ($value: expr, $MAX_LEN: expr, $serializer: expr) => {
+        {
+            use std::io::Write;
+            let mut buffer: [u8; $MAX_LEN] = unsafe { ::std::mem::uninitialized() };
+            let remaining_len;
+            {
+                let mut remaining = &mut buffer[..];
+                write!(remaining, "{}", $value).unwrap();
+                remaining_len = remaining.len()
+            }
+            let written_len = buffer.len() - remaining_len;
+            let written = &buffer[..written_len];
+
+            // write! only provides std::fmt::Formatter to Display implementations,
+            // which has methods write_str and write_char but no method to write arbitrary bytes.
+            // Therefore, `written` is well-formed in UTF-8.
+            let written_str = unsafe {
+                ::std::str::from_utf8_unchecked(written)
+            };
+            $serializer.serialize_str(written_str)
+        }
+    }
+}

serde/src/ser/content.rs

@@ -0,0 +1,607 @@
+use core::marker::PhantomData;
+
+#[cfg(all(not(feature = "std"), feature = "collections"))]
+use collections::{String, Vec};
+
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+use alloc::boxed::Box;
+
+#[cfg(feature = "collections")]
+use collections::borrow::ToOwned;
+
+use ser::{self, Serialize, Serializer};
+
+pub struct SerializeTupleVariantAsMapValue<M> {
+    map: M,
+    name: &'static str,
+    fields: Vec<Content>,
+}
+
+impl<M> SerializeTupleVariantAsMapValue<M> {
+    pub fn new(map: M, name: &'static str, len: usize) -> Self {
+        SerializeTupleVariantAsMapValue {
+            map: map,
+            name: name,
+            fields: Vec::with_capacity(len),
+        }
+    }
+}
+
+impl<M> ser::SerializeTupleVariant for SerializeTupleVariantAsMapValue<M>
+    where M: ser::SerializeMap
+{
+    type Ok = M::Ok;
+    type Error = M::Error;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), M::Error> {
+        let value = try!(value.serialize(ContentSerializer::<M::Error>::new()));
+        self.fields.push(value);
+        Ok(())
+    }
+
+    fn end(mut self) -> Result<M::Ok, M::Error> {
+        try!(self.map.serialize_value(&Content::TupleStruct(self.name, self.fields)));
+        self.map.end()
+    }
+}
+
+pub struct SerializeStructVariantAsMapValue<M> {
+    map: M,
+    name: &'static str,
+    fields: Vec<(&'static str, Content)>,
+}
+
+impl<M> SerializeStructVariantAsMapValue<M> {
+    pub fn new(map: M, name: &'static str, len: usize) -> Self {
+        SerializeStructVariantAsMapValue {
+            map: map,
+            name: name,
+            fields: Vec::with_capacity(len),
+        }
+    }
+}
+
+impl<M> ser::SerializeStructVariant for SerializeStructVariantAsMapValue<M>
+    where M: ser::SerializeMap
+{
+    type Ok = M::Ok;
+    type Error = M::Error;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              key: &'static str,
+                                              value: &T)
+                                              -> Result<(), M::Error> {
+        let value = try!(value.serialize(ContentSerializer::<M::Error>::new()));
+        self.fields.push((key, value));
+        Ok(())
+    }
+
+    fn end(mut self) -> Result<M::Ok, M::Error> {
+        try!(self.map.serialize_value(&Content::Struct(self.name, self.fields)));
+        self.map.end()
+    }
+}
+
+#[derive(Debug)]
+enum Content {
+    Bool(bool),
+
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+
+    I8(i8),
+    I16(i16),
+    I32(i32),
+    I64(i64),
+
+    F32(f32),
+    F64(f64),
+
+    Char(char),
+    String(String),
+    Bytes(Vec<u8>),
+
+    None,
+    Some(Box<Content>),
+
+    Unit,
+    UnitStruct(&'static str),
+    UnitVariant(&'static str, usize, &'static str),
+    NewtypeStruct(&'static str, Box<Content>),
+    NewtypeVariant(&'static str, usize, &'static str, Box<Content>),
+
+    Seq(Vec<Content>),
+    SeqFixedSize(Vec<Content>),
+    Tuple(Vec<Content>),
+    TupleStruct(&'static str, Vec<Content>),
+    TupleVariant(&'static str, usize, &'static str, Vec<Content>),
+    Map(Vec<(Content, Content)>),
+    Struct(&'static str, Vec<(&'static str, Content)>),
+    StructVariant(&'static str, usize, &'static str, Vec<(&'static str, Content)>),
+}
+
+impl Serialize for Content {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        match *self {
+            Content::Bool(b) => serializer.serialize_bool(b),
+            Content::U8(u) => serializer.serialize_u8(u),
+            Content::U16(u) => serializer.serialize_u16(u),
+            Content::U32(u) => serializer.serialize_u32(u),
+            Content::U64(u) => serializer.serialize_u64(u),
+            Content::I8(i) => serializer.serialize_i8(i),
+            Content::I16(i) => serializer.serialize_i16(i),
+            Content::I32(i) => serializer.serialize_i32(i),
+            Content::I64(i) => serializer.serialize_i64(i),
+            Content::F32(f) => serializer.serialize_f32(f),
+            Content::F64(f) => serializer.serialize_f64(f),
+            Content::Char(c) => serializer.serialize_char(c),
+            Content::String(ref s) => serializer.serialize_str(s),
+            Content::Bytes(ref b) => serializer.serialize_bytes(b),
+            Content::None => serializer.serialize_none(),
+            Content::Some(ref c) => serializer.serialize_some(&**c),
+            Content::Unit => serializer.serialize_unit(),
+            Content::UnitStruct(n) => serializer.serialize_unit_struct(n),
+            Content::UnitVariant(n, i, v) => serializer.serialize_unit_variant(n, i, v),
+            Content::NewtypeStruct(n, ref c) => serializer.serialize_newtype_struct(n, &**c),
+            Content::NewtypeVariant(n, i, v, ref c) => {
+                serializer.serialize_newtype_variant(n, i, v, &**c)
+            }
+            Content::Seq(ref elements) => elements.serialize(serializer),
+            Content::SeqFixedSize(ref elements) => {
+                use ser::SerializeSeq;
+                let mut seq = try!(serializer.serialize_seq_fixed_size(elements.len()));
+                for e in elements {
+                    try!(seq.serialize_element(e));
+                }
+                seq.end()
+            }
+            Content::Tuple(ref elements) => {
+                use ser::SerializeTuple;
+                let mut tuple = try!(serializer.serialize_tuple(elements.len()));
+                for e in elements {
+                    try!(tuple.serialize_element(e));
+                }
+                tuple.end()
+            }
+            Content::TupleStruct(n, ref fields) => {
+                use ser::SerializeTupleStruct;
+                let mut ts = try!(serializer.serialize_tuple_struct(n, fields.len()));
+                for f in fields {
+                    try!(ts.serialize_field(f));
+                }
+                ts.end()
+            }
+            Content::TupleVariant(n, i, v, ref fields) => {
+                use ser::SerializeTupleVariant;
+                let mut tv = try!(serializer.serialize_tuple_variant(n, i, v, fields.len()));
+                for f in fields {
+                    try!(tv.serialize_field(f));
+                }
+                tv.end()
+            }
+            Content::Map(ref entries) => {
+                use ser::SerializeMap;
+                let mut map = try!(serializer.serialize_map(Some(entries.len())));
+                for &(ref k, ref v) in entries {
+                    try!(map.serialize_entry(k, v));
+                }
+                map.end()
+            }
+            Content::Struct(n, ref fields) => {
+                use ser::SerializeStruct;
+                let mut s = try!(serializer.serialize_struct(n, fields.len()));
+                for &(k, ref v) in fields {
+                    try!(s.serialize_field(k, v));
+                }
+                s.end()
+            }
+            Content::StructVariant(n, i, v, ref fields) => {
+                use ser::SerializeStructVariant;
+                let mut sv = try!(serializer.serialize_struct_variant(n, i, v, fields.len()));
+                for &(k, ref v) in fields {
+                    try!(sv.serialize_field(k, v));
+                }
+                sv.end()
+            }
+        }
+    }
+}
+
+struct ContentSerializer<E> {
+    error: PhantomData<E>,
+}
+
+impl<E> ContentSerializer<E> {
+    fn new() -> Self {
+        ContentSerializer { error: PhantomData }
+    }
+}
+
+impl<E> Serializer for ContentSerializer<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    type SerializeSeq = SerializeSeq<E>;
+    type SerializeTuple = SerializeTuple<E>;
+    type SerializeTupleStruct = SerializeTupleStruct<E>;
+    type SerializeTupleVariant = SerializeTupleVariant<E>;
+    type SerializeMap = SerializeMap<E>;
+    type SerializeStruct = SerializeStruct<E>;
+    type SerializeStructVariant = SerializeStructVariant<E>;
+
+    fn serialize_bool(self, v: bool) -> Result<Content, E> {
+        Ok(Content::Bool(v))
+    }
+
+    fn serialize_i8(self, v: i8) -> Result<Content, E> {
+        Ok(Content::I8(v))
+    }
+
+    fn serialize_i16(self, v: i16) -> Result<Content, E> {
+        Ok(Content::I16(v))
+    }
+
+    fn serialize_i32(self, v: i32) -> Result<Content, E> {
+        Ok(Content::I32(v))
+    }
+
+    fn serialize_i64(self, v: i64) -> Result<Content, E> {
+        Ok(Content::I64(v))
+    }
+
+    fn serialize_u8(self, v: u8) -> Result<Content, E> {
+        Ok(Content::U8(v))
+    }
+
+    fn serialize_u16(self, v: u16) -> Result<Content, E> {
+        Ok(Content::U16(v))
+    }
+
+    fn serialize_u32(self, v: u32) -> Result<Content, E> {
+        Ok(Content::U32(v))
+    }
+
+    fn serialize_u64(self, v: u64) -> Result<Content, E> {
+        Ok(Content::U64(v))
+    }
+
+    fn serialize_f32(self, v: f32) -> Result<Content, E> {
+        Ok(Content::F32(v))
+    }
+
+    fn serialize_f64(self, v: f64) -> Result<Content, E> {
+        Ok(Content::F64(v))
+    }
+
+    fn serialize_char(self, v: char) -> Result<Content, E> {
+        Ok(Content::Char(v))
+    }
+
+    fn serialize_str(self, value: &str) -> Result<Content, E> {
+        Ok(Content::String(value.to_owned()))
+    }
+
+    fn serialize_bytes(self, value: &[u8]) -> Result<Content, E> {
+        Ok(Content::Bytes(value.to_owned()))
+    }
+
+    fn serialize_none(self) -> Result<Content, E> {
+        Ok(Content::None)
+    }
+
+    fn serialize_some<T: ?Sized + Serialize>(self, value: &T) -> Result<Content, E> {
+        Ok(Content::Some(Box::new(try!(value.serialize(self)))))
+    }
+
+    fn serialize_unit(self) -> Result<Content, E> {
+        Ok(Content::Unit)
+    }
+
+    fn serialize_unit_struct(self, name: &'static str) -> Result<Content, E> {
+        Ok(Content::UnitStruct(name))
+    }
+
+    fn serialize_unit_variant(self,
+                              name: &'static str,
+                              variant_index: usize,
+                              variant: &'static str)
+                              -> Result<Content, E> {
+        Ok(Content::UnitVariant(name, variant_index, variant))
+    }
+
+    fn serialize_newtype_struct<T: ?Sized + Serialize>(self,
+                                                       name: &'static str,
+                                                       value: &T)
+                                                       -> Result<Content, E> {
+        Ok(Content::NewtypeStruct(name, Box::new(try!(value.serialize(self)))))
+    }
+
+    fn serialize_newtype_variant<T: ?Sized + Serialize>(self,
+                                                        name: &'static str,
+                                                        variant_index: usize,
+                                                        variant: &'static str,
+                                                        value: &T)
+                                                        -> Result<Content, E> {
+        Ok(Content::NewtypeVariant(name,
+                                   variant_index,
+                                   variant,
+                                   Box::new(try!(value.serialize(self)))))
+    }
+
+    fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, E> {
+        Ok(SerializeSeq {
+               fixed_size: false,
+               elements: Vec::with_capacity(len.unwrap_or(0)),
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_seq_fixed_size(self, size: usize) -> Result<Self::SerializeSeq, E> {
+        Ok(SerializeSeq {
+               fixed_size: true,
+               elements: Vec::with_capacity(size),
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, E> {
+        Ok(SerializeTuple {
+               elements: Vec::with_capacity(len),
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_tuple_struct(self,
+                              name: &'static str,
+                              len: usize)
+                              -> Result<Self::SerializeTupleStruct, E> {
+        Ok(SerializeTupleStruct {
+               name: name,
+               fields: Vec::with_capacity(len),
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_tuple_variant(self,
+                               name: &'static str,
+                               variant_index: usize,
+                               variant: &'static str,
+                               len: usize)
+                               -> Result<Self::SerializeTupleVariant, E> {
+        Ok(SerializeTupleVariant {
+               name: name,
+               variant_index: variant_index,
+               variant: variant,
+               fields: Vec::with_capacity(len),
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, E> {
+        Ok(SerializeMap {
+               entries: Vec::with_capacity(len.unwrap_or(0)),
+               key: None,
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_struct(self, name: &'static str, len: usize) -> Result<Self::SerializeStruct, E> {
+        Ok(SerializeStruct {
+               name: name,
+               fields: Vec::with_capacity(len),
+               error: PhantomData,
+           })
+    }
+
+    fn serialize_struct_variant(self,
+                                name: &'static str,
+                                variant_index: usize,
+                                variant: &'static str,
+                                len: usize)
+                                -> Result<Self::SerializeStructVariant, E> {
+        Ok(SerializeStructVariant {
+               name: name,
+               variant_index: variant_index,
+               variant: variant,
+               fields: Vec::with_capacity(len),
+               error: PhantomData,
+           })
+    }
+}
+
+struct SerializeSeq<E> {
+    fixed_size: bool,
+    elements: Vec<Content>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeSeq for SerializeSeq<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_element<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), E> {
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.elements.push(value);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(if self.fixed_size {
+               Content::SeqFixedSize(self.elements)
+           } else {
+               Content::Seq(self.elements)
+           })
+    }
+}
+
+struct SerializeTuple<E> {
+    elements: Vec<Content>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeTuple for SerializeTuple<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_element<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), E> {
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.elements.push(value);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(Content::Tuple(self.elements))
+    }
+}
+
+struct SerializeTupleStruct<E> {
+    name: &'static str,
+    fields: Vec<Content>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeTupleStruct for SerializeTupleStruct<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), E> {
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.fields.push(value);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(Content::TupleStruct(self.name, self.fields))
+    }
+}
+
+struct SerializeTupleVariant<E> {
+    name: &'static str,
+    variant_index: usize,
+    variant: &'static str,
+    fields: Vec<Content>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeTupleVariant for SerializeTupleVariant<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), E> {
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.fields.push(value);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(Content::TupleVariant(self.name, self.variant_index, self.variant, self.fields))
+    }
+}
+
+struct SerializeMap<E> {
+    entries: Vec<(Content, Content)>,
+    key: Option<Content>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeMap for SerializeMap<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_key<T: ?Sized + Serialize>(&mut self, key: &T) -> Result<(), E> {
+        let key = try!(key.serialize(ContentSerializer::<E>::new()));
+        self.key = Some(key);
+        Ok(())
+    }
+
+    fn serialize_value<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), E> {
+        let key = self.key.take().expect("serialize_value called before serialize_key");
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.entries.push((key, value));
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(Content::Map(self.entries))
+    }
+
+    fn serialize_entry<K: ?Sized + Serialize, V: ?Sized + Serialize>(&mut self,
+                                                                     key: &K,
+                                                                     value: &V)
+                                                                     -> Result<(), E> {
+        let key = try!(key.serialize(ContentSerializer::<E>::new()));
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.entries.push((key, value));
+        Ok(())
+    }
+}
+
+struct SerializeStruct<E> {
+    name: &'static str,
+    fields: Vec<(&'static str, Content)>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeStruct for SerializeStruct<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              key: &'static str,
+                                              value: &T)
+                                              -> Result<(), E> {
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.fields.push((key, value));
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(Content::Struct(self.name, self.fields))
+    }
+}
+
+struct SerializeStructVariant<E> {
+    name: &'static str,
+    variant_index: usize,
+    variant: &'static str,
+    fields: Vec<(&'static str, Content)>,
+    error: PhantomData<E>,
+}
+
+impl<E> ser::SerializeStructVariant for SerializeStructVariant<E>
+    where E: ser::Error
+{
+    type Ok = Content;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              key: &'static str,
+                                              value: &T)
+                                              -> Result<(), E> {
+        let value = try!(value.serialize(ContentSerializer::<E>::new()));
+        self.fields.push((key, value));
+        Ok(())
+    }
+
+    fn end(self) -> Result<Content, E> {
+        Ok(Content::StructVariant(self.name, self.variant_index, self.variant, self.fields))
+    }
+}

serde/src/ser/impls.rs

@@ -0,0 +1,761 @@
+#[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, BTreeSet, LinkedList, HashMap, HashSet, VecDeque};
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque, String, Vec};
+
+#[cfg(feature = "collections")]
+use collections::borrow::ToOwned;
+
+#[cfg(feature = "std")]
+use core::hash::{Hash, BuildHasher};
+#[cfg(feature = "std")]
+use std::net;
+#[cfg(any(feature = "std", feature = "unstable"))]
+use core::ops;
+#[cfg(feature = "std")]
+use std::path;
+#[cfg(feature = "std")]
+use std::ffi::{CString, CStr, OsString, OsStr};
+#[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::{Serialize, SerializeSeq, SerializeTuple, Serializer};
+#[cfg(feature = "std")]
+use super::Error;
+
+///////////////////////////////////////////////////////////////////////////////
+
+macro_rules! impl_visit {
+    ($ty:ty, $method:ident $($cast:tt)*) => {
+        impl Serialize for $ty {
+            #[inline]
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+                where S: Serializer,
+            {
+                serializer.$method(*self $($cast)*)
+            }
+        }
+    }
+}
+
+impl_visit!(bool, serialize_bool);
+impl_visit!(isize, serialize_i64 as i64);
+impl_visit!(i8, serialize_i8);
+impl_visit!(i16, serialize_i16);
+impl_visit!(i32, serialize_i32);
+impl_visit!(i64, serialize_i64);
+impl_visit!(usize, serialize_u64 as u64);
+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);
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl Serialize for str {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.serialize_str(self)
+    }
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl Serialize for String {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (&self[..]).serialize(serializer)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
+impl Serialize for CStr {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.serialize_bytes(self.to_bytes())
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for CString {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.serialize_bytes(self.to_bytes())
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl<T> Serialize for Option<T>
+    where T: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        match *self {
+            Some(ref value) => serializer.serialize_some(value),
+            None => serializer.serialize_none(),
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl<T> Serialize for PhantomData<T> {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.serialize_unit_struct("PhantomData")
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+macro_rules! array_impls {
+    ($len:expr) => {
+        impl<T> Serialize for [T; $len] where T: Serialize {
+            #[inline]
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+                where S: Serializer,
+            {
+                let mut seq = try!(serializer.serialize_seq_fixed_size($len));
+                for e in self {
+                    try!(seq.serialize_element(e));
+                }
+                seq.end()
+            }
+        }
+    }
+}
+
+array_impls!(0);
+array_impls!(1);
+array_impls!(2);
+array_impls!(3);
+array_impls!(4);
+array_impls!(5);
+array_impls!(6);
+array_impls!(7);
+array_impls!(8);
+array_impls!(9);
+array_impls!(10);
+array_impls!(11);
+array_impls!(12);
+array_impls!(13);
+array_impls!(14);
+array_impls!(15);
+array_impls!(16);
+array_impls!(17);
+array_impls!(18);
+array_impls!(19);
+array_impls!(20);
+array_impls!(21);
+array_impls!(22);
+array_impls!(23);
+array_impls!(24);
+array_impls!(25);
+array_impls!(26);
+array_impls!(27);
+array_impls!(28);
+array_impls!(29);
+array_impls!(30);
+array_impls!(31);
+array_impls!(32);
+
+///////////////////////////////////////////////////////////////////////////////
+
+macro_rules! serialize_seq {
+    () => {
+        #[inline]
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: Serializer,
+        {
+            serializer.collect_seq(self)
+        }
+    }
+}
+
+impl<T> Serialize for [T]
+    where T: Serialize
+{
+    serialize_seq!();
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T> Serialize for BinaryHeap<T>
+    where T: Serialize + Ord
+{
+    serialize_seq!();
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T> Serialize for BTreeSet<T>
+    where T: Serialize + Ord
+{
+    serialize_seq!();
+}
+
+#[cfg(feature = "std")]
+impl<T, H> Serialize for HashSet<T, H>
+    where T: Serialize + Eq + Hash,
+          H: BuildHasher
+{
+    serialize_seq!();
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<T> Serialize for LinkedList<T>
+    where T: Serialize
+{
+    serialize_seq!();
+}
+
+#[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 = "std")]
+impl<Idx: Serialize> Serialize for ops::Range<Idx> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        use super::SerializeStruct;
+        let mut state = try!(serializer.serialize_struct("Range", 2));
+        try!(state.serialize_field("start", &self.start));
+        try!(state.serialize_field("end", &self.end));
+        state.end()
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl Serialize for () {
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        serializer.serialize_unit()
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+macro_rules! tuple_impls {
+    ($(
+        $TupleVisitor:ident ($len:expr, $($T:ident),+) {
+            $($state:pat => $idx:tt,)+
+        }
+    )+) => {
+        $(
+            impl<$($T),+> Serialize for ($($T,)+)
+                where $($T: Serialize),+
+            {
+                #[inline]
+                fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+                    where S: Serializer,
+                {
+                    let mut tuple = try!(serializer.serialize_tuple($len));
+                    $(
+                        try!(tuple.serialize_element(&self.$idx));
+                    )+
+                    tuple.end()
+                }
+            }
+        )+
+    }
+}
+
+tuple_impls! {
+    TupleVisitor1 (1, T0) {
+        0 => 0,
+    }
+    TupleVisitor2 (2, T0, T1) {
+        0 => 0,
+        1 => 1,
+    }
+    TupleVisitor3 (3, T0, T1, T2) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+    }
+    TupleVisitor4 (4, T0, T1, T2, T3) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+    }
+    TupleVisitor5 (5, T0, T1, T2, T3, T4) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+    }
+    TupleVisitor6 (6, T0, T1, T2, T3, T4, T5) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+    }
+    TupleVisitor7 (7, T0, T1, T2, T3, T4, T5, T6) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+    }
+    TupleVisitor8 (8, T0, T1, T2, T3, T4, T5, T6, T7) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+    }
+    TupleVisitor9 (9, T0, T1, T2, T3, T4, T5, T6, T7, T8) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+    }
+    TupleVisitor10 (10, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+    }
+    TupleVisitor11 (11, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+    }
+    TupleVisitor12 (12, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        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,
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+macro_rules! serialize_map {
+    () => {
+        #[inline]
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: Serializer,
+        {
+            serializer.collect_map(self)
+        }
+    }
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<K, V> Serialize for BTreeMap<K, V>
+    where K: Serialize + Ord,
+          V: Serialize
+{
+    serialize_map!();
+}
+
+#[cfg(feature = "std")]
+impl<K, V, H> Serialize for HashMap<K, V, H>
+    where K: Serialize + Eq + Hash,
+          V: Serialize,
+          H: BuildHasher
+{
+    serialize_map!();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl<'a, T: ?Sized> Serialize for &'a T
+    where T: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}
+
+impl<'a, T: ?Sized> Serialize for &'a mut T
+    where T: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<T: ?Sized> Serialize for Box<T>
+    where T: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<T> Serialize for Rc<T>
+    where T: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}
+
+#[cfg(any(feature = "std", feature = "alloc"))]
+impl<T> Serialize for Arc<T>
+    where T: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}
+
+#[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: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+impl<T, E> Serialize for Result<T, E>
+    where T: Serialize,
+          E: Serialize
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        match *self {
+            Result::Ok(ref value) => serializer.serialize_newtype_variant("Result", 0, "Ok", value),
+            Result::Err(ref value) => {
+                serializer.serialize_newtype_variant("Result", 1, "Err", value)
+            }
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
+impl Serialize for Duration {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        use super::SerializeStruct;
+        let mut state = try!(serializer.serialize_struct("Duration", 2));
+        try!(state.serialize_field("secs", &self.as_secs()));
+        try!(state.serialize_field("nanos", &self.subsec_nanos()));
+        state.end()
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
+impl Serialize for net::IpAddr {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        match *self {
+            net::IpAddr::V4(ref a) => a.serialize(serializer),
+            net::IpAddr::V6(ref a) => a.serialize(serializer),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::Ipv4Addr {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        /// "101.102.103.104".len()
+        const MAX_LEN: usize = 15;
+        serialize_display_bounded_length!(self, MAX_LEN, serializer)
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::Ipv6Addr {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        /// "1000:1002:1003:1004:1005:1006:1007:1008".len()
+        const MAX_LEN: usize = 39;
+        serialize_display_bounded_length!(self, MAX_LEN, serializer)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
+impl Serialize for net::SocketAddr {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, 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: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        /// "101.102.103.104:65000".len()
+        const MAX_LEN: usize = 21;
+        serialize_display_bounded_length!(self, MAX_LEN, serializer)
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for net::SocketAddrV6 {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        /// "[1000:1002:1003:1004:1005:1006:1007:1008]:65000".len()
+        const MAX_LEN: usize = 47;
+        serialize_display_bounded_length!(self, MAX_LEN, serializer)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "std")]
+impl Serialize for path::Path {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        match self.to_str() {
+            Some(s) => s.serialize(serializer),
+            None => Err(Error::custom("path contains invalid UTF-8 characters")),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl Serialize for path::PathBuf {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        self.as_path().serialize(serializer)
+    }
+}
+
+#[cfg(all(feature = "std", any(unix, windows)))]
+impl Serialize for OsStr {
+    #[cfg(unix)]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        use std::os::unix::ffi::OsStrExt;
+        serializer.serialize_newtype_variant("OsString",
+                                             0,
+                                             "Unix",
+                                             self.as_bytes())
+    }
+    #[cfg(windows)]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        use std::os::windows::ffi::OsStrExt;
+        let val = self.encode_wide().collect::<Vec<_>>();
+        serializer.serialize_newtype_variant("OsString",
+                                             1,
+                                             "Windows",
+                                             &val)
+    }
+}
+
+#[cfg(all(feature = "std", any(unix, windows)))]
+#[cfg(feature = "std")]
+impl Serialize for OsString {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        self.as_os_str().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "unstable")]
+impl<T> Serialize for NonZero<T>
+    where T: Serialize + Zeroable
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        (**self).serialize(serializer)
+    }
+}

serde/src/ser/impossible.rs

@@ -0,0 +1,156 @@
+//! This module contains `Impossible` serializer and its implementations.
+
+use core::marker::PhantomData;
+
+use ser::{self, Serialize, SerializeSeq, SerializeTuple, SerializeTupleStruct,
+          SerializeTupleVariant, SerializeMap, SerializeStruct, SerializeStructVariant};
+
+/// Helper type for implementing a `Serializer` that does not support
+/// serializing one of the compound types.
+///
+/// This type cannot be instantiated, but implements every one of the traits
+/// corresponding to the `Serializer` compound types: `SerializeSeq`,
+/// `SerializeTuple`, `SerializeTupleStruct`, `SerializeTupleVariant`,
+/// `SerializeMap`, `SerializeStruct`, and `SerializeStructVariant`.
+///
+/// ```rust,ignore
+/// impl Serializer for MySerializer {
+///     type Ok = ();
+///     type Error = Error;
+///
+///     type SerializeSeq = Impossible<(), Error>;
+///     /* other associated types */
+///
+///     /// This data format does not support serializing sequences.
+///     fn serialize_seq(self,
+///                      len: Option<usize>)
+///                      -> Result<Self::SerializeSeq, Error> {
+///         // Given Impossible cannot be instantiated, the only
+///         // thing we can do here is to return an error.
+///         Err(...)
+///     }
+///
+///     /* other Serializer methods */
+/// }
+/// ```
+pub struct Impossible<Ok, E> {
+    void: Void,
+    _marker: PhantomData<(Ok, E)>,
+}
+
+enum Void {}
+
+impl<Ok, E> SerializeSeq for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_element<T: ?Sized + Serialize>(&mut self, _value: &T) -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}
+
+impl<Ok, E> SerializeTuple for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_element<T: ?Sized + Serialize>(&mut self, _value: &T) -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}
+
+impl<Ok, E> SerializeTupleStruct for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, _value: &T) -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}
+
+impl<Ok, E> SerializeTupleVariant for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, _value: &T) -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}
+
+impl<Ok, E> SerializeMap for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_key<T: ?Sized + Serialize>(&mut self, _key: &T) -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn serialize_value<T: ?Sized + Serialize>(&mut self, _value: &T) -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}
+
+impl<Ok, E> SerializeStruct for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              _key: &'static str,
+                                              _value: &T)
+                                              -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}
+
+impl<Ok, E> SerializeStructVariant for Impossible<Ok, E>
+    where E: ser::Error
+{
+    type Ok = Ok;
+    type Error = E;
+
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              _key: &'static str,
+                                              _value: &T)
+                                              -> Result<(), E> {
+        match self.void {}
+    }
+
+    fn end(self) -> Result<Ok, E> {
+        match self.void {}
+    }
+}

serde/src/ser/mod.rs

@@ -0,0 +1,915 @@
+//! Generic data structure serialization framework.
+//!
+//! The two most important traits in this module are `Serialize` and
+//! `Serializer`.
+//!
+//!  - **A type that implements `Serialize` is a data structure** that can be
+//!    serialized to any data format supported by Serde, and conversely
+//!  - **A type that implements `Serializer` is a data format** that can
+//!    serialize any data structure supported by Serde.
+//!
+//! # The Serialize trait
+//!
+//! Serde provides `Serialize` implementations for many Rust primitive and
+//! standard library types. The complete list is below. All of these can be
+//! serialized using Serde out of the box.
+//!
+//! Additionally, Serde provides a procedural macro called `serde_derive` to
+//! automatically generate `Serialize` implementations for structs and enums in
+//! your program. See the [codegen section of the manual][codegen] for how to
+//! use this.
+//!
+//! In rare cases it may be necessary to implement `Serialize` manually for some
+//! type in your program. See the [Implementing `Serialize`][impl-serialize]
+//! section of the manual for more about this.
+//!
+//! Third-party crates may provide `Serialize` implementations for types that
+//! they expose. For example the `linked-hash-map` crate provides a
+//! `LinkedHashMap<K, V>` type that is serializable by Serde because the crate
+//! provides an implementation of `Serialize` for it.
+//!
+//! # The Serializer trait
+//!
+//! `Serializer` implementations are provided by third-party crates, for example
+//! [`serde_json`][serde_json], [`serde_yaml`][serde_yaml] and
+//! [`bincode`][bincode].
+//!
+//! A partial list of well-maintained formats is given on the [Serde
+//! website][data-formats].
+//!
+//! # Implementations of Serialize provided by Serde
+//!
+//!  - **Primitive types**:
+//!    - bool
+//!    - isize, i8, i16, i32, i64
+//!    - usize, u8, u16, u32, u64
+//!    - f32, f64
+//!    - char
+//!    - str
+//!    - &T and &mut T
+//!  - **Compound types**:
+//!    - [T]
+//!    - [T; 0] through [T; 32]
+//!    - tuples up to size 16
+//!  - **Common standard library types**:
+//!    - String
+//!    - Option\<T\>
+//!    - Result\<T, E\>
+//!    - PhantomData\<T\>
+//!  - **Wrapper types**:
+//!    - Box\<T\>
+//!    - Rc\<T\>
+//!    - Arc\<T\>
+//!    - Cow\<'a, T\>
+//!  - **Collection types**:
+//!    - BTreeMap\<K, V\>
+//!    - BTreeSet\<T\>
+//!    - BinaryHeap\<T\>
+//!    - HashMap\<K, V, H\>
+//!    - HashSet\<T, H\>
+//!    - LinkedList\<T\>
+//!    - VecDeque\<T\>
+//!    - Vec\<T\>
+//!    - EnumSet\<T\> (unstable)
+//!  - **Miscellaneous standard library types**:
+//!    - Duration
+//!    - Path
+//!    - PathBuf
+//!    - Range\<T\>
+//!    - NonZero\<T\> (unstable)
+//!  - **Net types**:
+//!    - IpAddr
+//!    - Ipv4Addr
+//!    - Ipv6Addr
+//!    - SocketAddr
+//!    - SocketAddrV4
+//!    - SocketAddrV6
+//!
+//! [codegen]: https://serde.rs/codegen.html
+//! [impl-serialize]: https://serde.rs/impl-serialize.html
+//! [serde_json]: https://github.com/serde-rs/json
+//! [serde_yaml]: https://github.com/dtolnay/serde-yaml
+//! [bincode]: https://github.com/TyOverby/bincode
+//! [data-formats]: https://serde.rs/#data-formats
+
+#[cfg(feature = "std")]
+use std::error;
+#[cfg(not(feature = "std"))]
+use error;
+
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::string::String;
+use core::fmt::Display;
+#[cfg(any(feature = "std", feature = "collections"))]
+use core::fmt::Write;
+use core::iter::IntoIterator;
+
+mod impls;
+mod impossible;
+
+// Helpers used by generated code. Not public API.
+#[doc(hidden)]
+pub mod private;
+#[cfg(any(feature = "std", feature = "collections"))]
+mod content;
+
+pub use self::impossible::Impossible;
+
+///////////////////////////////////////////////////////////////////////////////
+
+/// Trait used by `Serialize` implementations to generically construct errors
+/// belonging to the `Serializer` against which they are currently running.
+pub trait Error: Sized + error::Error {
+    /// Raised when a `Serialize` implementation encounters a general error
+    /// while serializing a type.
+    ///
+    /// The message should not be capitalized and should not end with a period.
+    ///
+    /// For example, a filesystem `Path` may refuse to serialize itself if it
+    /// contains invalid UTF-8 data.
+    ///
+    /// ```rust
+    /// # use serde::ser::{Serialize, Serializer, Error};
+    /// # struct Path;
+    /// # impl Path { fn to_str(&self) -> Option<&str> { unimplemented!() } }
+    /// impl Serialize for Path {
+    ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    ///         where S: Serializer
+    ///     {
+    ///         match self.to_str() {
+    ///             Some(s) => s.serialize(serializer),
+    ///             None => Err(Error::custom("path contains invalid UTF-8 characters")),
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    fn custom<T: Display>(msg: T) -> Self;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+/// A **data structure** that can be serialized into any data format supported
+/// by Serde.
+///
+/// Serde provides `Serialize` implementations for many Rust primitive and
+/// standard library types. The complete list is [here][ser]. All of these can
+/// be serialized using Serde out of the box.
+///
+/// Additionally, Serde provides a procedural macro called `serde_derive` to
+/// automatically generate `Serialize` implementations for structs and enums in
+/// your program. See the [codegen section of the manual][codegen] for how to
+/// use this.
+///
+/// In rare cases it may be necessary to implement `Serialize` manually for some
+/// type in your program. See the [Implementing `Serialize`][impl-serialize]
+/// section of the manual for more about this.
+///
+/// Third-party crates may provide `Serialize` implementations for types that
+/// they expose. For example the `linked-hash-map` crate provides a
+/// `LinkedHashMap<K, V>` type that is serializable by Serde because the crate
+/// provides an implementation of `Serialize` for it.
+///
+/// [ser]: https://docs.serde.rs/serde/ser/index.html
+/// [codegen]: https://serde.rs/codegen.html
+/// [impl-serialize]: https://serde.rs/impl-serialize.html
+pub trait Serialize {
+    /// Serialize this value into the given Serde serializer.
+    ///
+    /// See the [Implementing `Serialize`][impl-serialize] section of the manual
+    /// for more information about how to implement this method.
+    ///
+    /// [impl-serialize]: https://serde.rs/impl-serialize.html
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+/// A **data format** that can serialize any data structure supported by Serde.
+///
+/// The role of this trait is to define the serialization half of the Serde data
+/// model, which is a way to categorize every Rust data structure into one of 28
+/// possible types. Each method of the `Serializer` trait corresponds to one of
+/// the types of the data model.
+///
+/// Implementations of `Serialize` map themselves into this data model by
+/// invoking exactly one of the `Serializer` methods.
+///
+/// The types that make up the Serde data model are:
+///
+///  - 12 primitive types:
+///    - bool
+///    - i8, i16, i32, i64
+///    - u8, u16, u32, u64
+///    - f32, f64
+///    - char
+///  - string
+///  - byte array - [u8]
+///  - option
+///    - either none or some value
+///  - unit
+///    - unit is the type of () in Rust
+///  - unit_struct
+///    - for example `struct Unit` or `PhantomData<T>`
+///  - unit_variant
+///    - the `E::A` and `E::B` in `enum E { A, B }`
+///  - newtype_struct
+///    - for example `struct Millimeters(u8)`
+///  - newtype_variant
+///    - the `E::N` in `enum E { N(u8) }`
+///  - seq
+///    - a dynamically sized sequence of values, for example `Vec<T>` or
+///      `HashSet<T>`
+///  - seq_fixed_size
+///    - a statically sized sequence of values for which the size will be known
+///      at deserialization time without looking at the serialized data, for
+///      example `[u64; 10]`
+///  - tuple
+///    - for example `(u8,)` or `(String, u64, Vec<T>)`
+///  - tuple_struct
+///    - for example `struct Rgb(u8, u8, u8)`
+///  - tuple_variant
+///    - the `E::T` in `enum E { T(u8, u8) }`
+///  - map
+///    - for example `BTreeMap<K, V>`
+///  - struct
+///    - a key-value pairing in which the keys will be known at deserialization
+///      time without looking at the serialized data, for example `struct S { r:
+///      u8, g: u8, b: u8 }`
+///  - struct_variant
+///    - the `E::S` in `enum E { S { r: u8, g: u8, b: u8 } }`
+///
+/// Many Serde serializers produce text or binary data as output, for example
+/// JSON or Bincode. This is not a requirement of the `Serializer` trait, and
+/// there are serializers that do not produce text or binary output. One example
+/// is the `serde_json::value::Serializer` (distinct from the main `serde_json`
+/// serializer) that produces a `serde_json::Value` data structure in memory as
+/// output.
+pub trait Serializer: Sized {
+    /// The output type produced by this `Serializer` during successful
+    /// serialization. Most serializers that produce text or binary output
+    /// should set `Ok = ()` and serialize into an `io::Write` or buffer
+    /// contained within the `Serializer` instance. Serializers that build
+    /// in-memory data structures may be simplified by using `Ok` to propagate
+    /// the data structure around.
+    type Ok;
+
+    /// The error type when some error occurs during serialization.
+    type Error: Error;
+
+    /// Type returned from `serialize_seq` and `serialize_seq_fixed_size` for
+    /// serializing the content of the sequence.
+    type SerializeSeq: SerializeSeq<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Type returned from `serialize_tuple` for serializing the content of the
+    /// tuple.
+    type SerializeTuple: SerializeTuple<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Type returned from `serialize_tuple_struct` for serializing the content
+    /// of the tuple struct.
+    type SerializeTupleStruct: SerializeTupleStruct<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Type returned from `serialize_tuple_variant` for serializing the content
+    /// of the tuple variant.
+    type SerializeTupleVariant: SerializeTupleVariant<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Type returned from `serialize_map` for serializing the content of the
+    /// map.
+    type SerializeMap: SerializeMap<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Type returned from `serialize_struct` for serializing the content of the
+    /// struct.
+    type SerializeStruct: SerializeStruct<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Type returned from `serialize_struct_variant` for serializing the
+    /// content of the struct variant.
+    type SerializeStructVariant: SerializeStructVariant<Ok = Self::Ok, Error = Self::Error>;
+
+    /// Serialize a `bool` value.
+    fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: i8) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: i16) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: i32) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize an `i64` value.
+    fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: u8) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: u16) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: u32) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a `u64` value.
+    fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: f32) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize an `f64` value.
+    fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize 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(self, v: char) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a `&str`.
+    fn serialize_str(self, value: &str) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a chunk of raw byte data.
+    ///
+    /// 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,ignore
+    /// let mut seq = self.serialize_seq(Some(value.len()))?;
+    /// for b in value {
+    ///     seq.serialize_element(b)?;
+    /// }
+    /// seq.end()
+    /// ```
+    fn serialize_bytes(self, value: &[u8]) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a `None` value.
+    fn serialize_none(self) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a `Some(T)` value.
+    fn serialize_some<T: ?Sized + Serialize>(self, value: &T) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a `()` value.
+    fn serialize_unit(self) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a unit struct like `struct Unit` or `PhantomData<T>`.
+    ///
+    /// A reasonable implementation would be to forward to `serialize_unit`.
+    fn serialize_unit_struct(self, name: &'static str) -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a unit variant like `E::A` in `enum E { A, B }`.
+    ///
+    /// The `name` is the name of the enum, the `variant_index` is the index of
+    /// this variant within the enum, and the `variant` is the name of the
+    /// variant.
+    ///
+    /// A reasonable implementation would be to forward to `serialize_unit`.
+    ///
+    /// ```rust,ignore
+    /// match *self {
+    ///     E::A => serializer.serialize_unit_variant("E", 0, "A"),
+    ///     E::B => serializer.serialize_unit_variant("E", 1, "B"),
+    /// }
+    /// ```
+    fn serialize_unit_variant(self,
+                              name: &'static str,
+                              variant_index: usize,
+                              variant: &'static str)
+                              -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a newtype struct like `struct Millimeters(u8)`.
+    ///
+    /// Serializers are encouraged to treat newtype structs as insignificant
+    /// wrappers around the data they contain. A reasonable implementation would
+    /// be to forward to `value.serialize(self)`.
+    ///
+    /// ```rust,ignore
+    /// serializer.serialize_newtype_struct("Millimeters", &self.0)
+    /// ```
+    fn serialize_newtype_struct<T: ?Sized + Serialize>(self,
+                                                       name: &'static str,
+                                                       value: &T)
+                                                       -> Result<Self::Ok, Self::Error>;
+
+    /// Serialize a newtype variant like `E::N` in `enum E { N(u8) }`.
+    ///
+    /// The `name` is the name of the enum, the `variant_index` is the index of
+    /// this variant within the enum, and the `variant` is the name of the
+    /// variant. The `value` is the data contained within this newtype variant.
+    ///
+    /// ```rust,ignore
+    /// match *self {
+    ///     E::N(ref n) => serializer.serialize_newtype_variant("E", 0, "N", n),
+    /// }
+    /// ```
+    fn serialize_newtype_variant<T: ?Sized + Serialize>(self,
+                                                        name: &'static str,
+                                                        variant_index: usize,
+                                                        variant: &'static str,
+                                                        value: &T)
+                                                        -> Result<Self::Ok, Self::Error>;
+
+    /// Begin to serialize a dynamically sized sequence. This call must be
+    /// followed by zero or more calls to `serialize_element`, then a call to
+    /// `end`.
+    ///
+    /// The argument is the number of elements in the sequence, which may or may
+    /// not be computable before the sequence is iterated. Some serializers only
+    /// support sequences whose length is known up front.
+    ///
+    /// ```rust,ignore
+    /// let mut seq = serializer.serialize_seq(Some(self.len()))?;
+    /// for element in self {
+    ///     seq.serialize_element(element)?;
+    /// }
+    /// seq.end()
+    /// ```
+    fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error>;
+
+    /// Begin to serialize a statically sized sequence whose length will be
+    /// known at deserialization time without looking at the serialized data.
+    /// This call must be followed by zero or more calls to `serialize_element`,
+    /// then a call to `end`.
+    ///
+    /// ```rust,ignore
+    /// let mut seq = serializer.serialize_seq_fixed_size(self.len())?;
+    /// for element in self {
+    ///     seq.serialize_element(element)?;
+    /// }
+    /// seq.end()
+    /// ```
+    fn serialize_seq_fixed_size(self, size: usize) -> Result<Self::SerializeSeq, Self::Error>;
+
+    /// Begin to serialize a tuple. This call must be followed by zero or more
+    /// calls to `serialize_element`, then a call to `end`.
+    ///
+    /// ```rust,ignore
+    /// let mut tup = serializer.serialize_tuple(3)?;
+    /// tup.serialize_element(&self.0)?;
+    /// tup.serialize_element(&self.1)?;
+    /// tup.serialize_element(&self.2)?;
+    /// tup.end()
+    /// ```
+    fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error>;
+
+    /// Begin to serialize a tuple struct like `struct Rgb(u8, u8, u8)`. This
+    /// call must be followed by zero or more calls to `serialize_field`, then a
+    /// call to `end`.
+    ///
+    /// The `name` is the name of the tuple struct and the `len` is the number
+    /// of data fields that will be serialized.
+    ///
+    /// ```rust,ignore
+    /// let mut ts = serializer.serialize_tuple_struct("Rgb", 3)?;
+    /// ts.serialize_field(&self.0)?;
+    /// ts.serialize_field(&self.1)?;
+    /// ts.serialize_field(&self.2)?;
+    /// ts.end()
+    /// ```
+    fn serialize_tuple_struct(self,
+                              name: &'static str,
+                              len: usize)
+                              -> Result<Self::SerializeTupleStruct, Self::Error>;
+
+    /// Begin to serialize a tuple variant like `E::T` in `enum E { T(u8, u8)
+    /// }`. This call must be followed by zero or more calls to
+    /// `serialize_field`, then a call to `end`.
+    ///
+    /// The `name` is the name of the enum, the `variant_index` is the index of
+    /// this variant within the enum, the `variant` is the name of the variant,
+    /// and the `len` is the number of data fields that will be serialized.
+    ///
+    /// ```rust,ignore
+    /// match *self {
+    ///     E::T(ref a, ref b) => {
+    ///         let mut tv = serializer.serialize_tuple_variant("E", 0, "T", 2)?;
+    ///         tv.serialize_field(a)?;
+    ///         tv.serialize_field(b)?;
+    ///         tv.end()
+    ///     }
+    /// }
+    /// ```
+    fn serialize_tuple_variant(self,
+                               name: &'static str,
+                               variant_index: usize,
+                               variant: &'static str,
+                               len: usize)
+                               -> Result<Self::SerializeTupleVariant, Self::Error>;
+
+    /// Begin to serialize a map. This call must be followed by zero or more
+    /// calls to `serialize_key` and `serialize_value`, then a call to `end`.
+    ///
+    /// The argument is the number of elements in the map, which may or may not
+    /// be computable before the map is iterated. Some serializers only support
+    /// maps whose length is known up front.
+    ///
+    /// ```rust,ignore
+    /// let mut map = serializer.serialize_map(Some(self.len()))?;
+    /// for (k, v) in self {
+    ///     map.serialize_entry(k, v)?;
+    /// }
+    /// map.end()
+    /// ```
+    fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error>;
+
+    /// Begin to serialize a struct like `struct Rgb { r: u8, g: u8, b: u8 }`.
+    /// This call must be followed by zero or more calls to `serialize_field`,
+    /// then a call to `end`.
+    ///
+    /// The `name` is the name of the struct and the `len` is the number of
+    /// data fields that will be serialized.
+    ///
+    /// ```rust,ignore
+    /// let mut struc = serializer.serialize_struct("Rgb", 3)?;
+    /// struc.serialize_field("r", &self.r)?;
+    /// struc.serialize_field("g", &self.g)?;
+    /// struc.serialize_field("b", &self.b)?;
+    /// struc.end()
+    /// ```
+    fn serialize_struct(self,
+                        name: &'static str,
+                        len: usize)
+                        -> Result<Self::SerializeStruct, Self::Error>;
+
+    /// Begin to serialize a struct variant like `E::S` in `enum E { S { r: u8,
+    /// g: u8, b: u8 } }`. This call must be followed by zero or more calls to
+    /// `serialize_field`, then a call to `end`.
+    ///
+    /// The `name` is the name of the enum, the `variant_index` is the index of
+    /// this variant within the enum, the `variant` is the name of the variant,
+    /// and the `len` is the number of data fields that will be serialized.
+    ///
+    /// ```rust,ignore
+    /// match *self {
+    ///     E::S { ref r, ref g, ref b } => {
+    ///         let mut sv = serializer.serialize_struct_variant("E", 0, "S", 3)?;
+    ///         sv.serialize_field("r", r)?;
+    ///         sv.serialize_field("g", g)?;
+    ///         sv.serialize_field("b", b)?;
+    ///         sv.end()
+    ///     }
+    /// }
+    /// ```
+    fn serialize_struct_variant(self,
+                                name: &'static str,
+                                variant_index: usize,
+                                variant: &'static str,
+                                len: usize)
+                                -> Result<Self::SerializeStructVariant, Self::Error>;
+
+    /// Collect an iterator as a sequence.
+    ///
+    /// The default implementation serializes each item yielded by the iterator
+    /// using `Self::SerializeSeq`. Implementors should not need to override
+    /// this method.
+    fn collect_seq<I>(self, iter: I) -> Result<Self::Ok, Self::Error>
+        where I: IntoIterator,
+              <I as IntoIterator>::Item: Serialize
+    {
+        let iter = iter.into_iter();
+        let mut serializer = try!(self.serialize_seq(iter.len_hint()));
+        for item in iter {
+            try!(serializer.serialize_element(&item));
+        }
+        serializer.end()
+    }
+
+    /// Collect an iterator as a map.
+    ///
+    /// The default implementation serializes each pair yielded by the iterator
+    /// using `Self::SerializeMap`. Implementors should not need to override
+    /// this method.
+    fn collect_map<K, V, I>(self, iter: I) -> Result<Self::Ok, Self::Error>
+        where K: Serialize,
+              V: Serialize,
+              I: IntoIterator<Item = (K, V)>
+    {
+        let iter = iter.into_iter();
+        let mut serializer = try!(self.serialize_map(iter.len_hint()));
+        for (key, value) in iter {
+            try!(serializer.serialize_entry(&key, &value));
+        }
+        serializer.end()
+    }
+
+    /// Serialize a string produced by an implementation of `Display`.
+    ///
+    /// The default implementation builds a heap-allocated `String` and
+    /// delegates to `serialize_str`. Serializers are encouraged to provide a
+    /// more efficient implementation if possible.
+    ///
+    /// ```rust
+    /// # use serde::{Serialize, Serializer};
+    /// # struct DateTime;
+    /// # impl DateTime {
+    /// #     fn naive_local(&self) -> () { () }
+    /// #     fn offset(&self) -> () { () }
+    /// # }
+    /// impl Serialize for DateTime {
+    ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    ///         where S: Serializer
+    ///     {
+    ///         serializer.collect_str(&format_args!("{:?}{:?}",
+    ///                                              self.naive_local(),
+    ///                                              self.offset()))
+    ///     }
+    /// }
+    /// ```
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn collect_str<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+        where T: Display
+    {
+        let mut string = String::new();
+        write!(string, "{}", value).unwrap();
+        self.serialize_str(&string)
+    }
+
+    /// Serialize a string produced by an implementation of `Display`.
+    ///
+    /// The default implementation returns an error unconditionally when
+    /// compiled with `no_std`.
+    ///
+    /// ```rust
+    /// # use serde::{Serialize, Serializer};
+    /// # struct DateTime;
+    /// # impl DateTime {
+    /// #     fn naive_local(&self) -> () { () }
+    /// #     fn offset(&self) -> () { () }
+    /// # }
+    /// impl Serialize for DateTime {
+    ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    ///         where S: Serializer
+    ///     {
+    ///         serializer.collect_str(&format_args!("{:?}{:?}",
+    ///                                              self.naive_local(),
+    ///                                              self.offset()))
+    ///     }
+    /// }
+    /// ```
+    #[cfg(not(any(feature = "std", feature = "collections")))]
+    fn collect_str<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+        where T: Display
+    {
+        // TODO https://github.com/serde-rs/serde/issues/805
+        // Remove this impl and force no_std formats to implement collect_str.
+        let _ = value;
+        Err(Error::custom("this no_std format does not support serializing strings with collect_str"))
+    }
+}
+
+/// Returned from `Serializer::serialize_seq` and
+/// `Serializer::serialize_seq_fixed_size`.
+///
+/// ```rust,ignore
+/// let mut seq = serializer.serialize_seq(Some(self.len()))?;
+/// for element in self {
+///     seq.serialize_element(element)?;
+/// }
+/// seq.end()
+/// ```
+pub trait SerializeSeq {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a sequence element.
+    fn serialize_element<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>;
+
+    /// Finish serializing a sequence.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+/// Returned from `Serializer::serialize_tuple`.
+///
+/// ```rust,ignore
+/// let mut tup = serializer.serialize_tuple(3)?;
+/// tup.serialize_element(&self.0)?;
+/// tup.serialize_element(&self.1)?;
+/// tup.serialize_element(&self.2)?;
+/// tup.end()
+/// ```
+pub trait SerializeTuple {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a tuple element.
+    fn serialize_element<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>;
+
+    /// Finish serializing a tuple.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+/// Returned from `Serializer::serialize_tuple_struct`.
+///
+/// ```rust,ignore
+/// let mut ts = serializer.serialize_tuple_struct("Rgb", 3)?;
+/// ts.serialize_field(&self.0)?;
+/// ts.serialize_field(&self.1)?;
+/// ts.serialize_field(&self.2)?;
+/// ts.end()
+/// ```
+pub trait SerializeTupleStruct {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a tuple struct field.
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>;
+
+    /// Finish serializing a tuple struct.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+/// Returned from `Serializer::serialize_tuple_variant`.
+///
+/// ```rust,ignore
+/// match *self {
+///     E::T(ref a, ref b) => {
+///         let mut tv = serializer.serialize_tuple_variant("E", 0, "T", 2)?;
+///         tv.serialize_field(a)?;
+///         tv.serialize_field(b)?;
+///         tv.end()
+///     }
+/// }
+/// ```
+pub trait SerializeTupleVariant {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a tuple variant field.
+    fn serialize_field<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>;
+
+    /// Finish serializing a tuple variant.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+/// Returned from `Serializer::serialize_map`.
+///
+/// ```rust,ignore
+/// let mut map = serializer.serialize_map(Some(self.len()))?;
+/// for (k, v) in self {
+///     map.serialize_entry(k, v)?;
+/// }
+/// map.end()
+/// ```
+pub trait SerializeMap {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a map key.
+    fn serialize_key<T: ?Sized + Serialize>(&mut self, key: &T) -> Result<(), Self::Error>;
+
+    /// Serialize a map value.
+    fn serialize_value<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>;
+
+    /// Serialize a map entry consisting of a key and a value.
+    ///
+    /// Some `Serialize` types are not able to hold a key and value in memory at
+    /// the same time so `SerializeMap` implementations are required to support
+    /// `serialize_key` and `serialize_value` individually. The
+    /// `serialize_entry` method allows serializers to optimize for the case
+    /// where key and value are both available. `Serialize` implementations are
+    /// encouraged to use `serialize_entry` if possible.
+    ///
+    /// The default implementation delegates to `serialize_key` and
+    /// `serialize_value`. This is appropriate for serializers that do not care
+    /// about performance or are not able to optimize `serialize_entry` any
+    /// better than this.
+    fn serialize_entry<K: ?Sized + Serialize, V: ?Sized + Serialize>(&mut self,
+                                                                     key: &K,
+                                                                     value: &V)
+                                                                     -> Result<(), Self::Error> {
+        try!(self.serialize_key(key));
+        self.serialize_value(value)
+    }
+
+    /// Finish serializing a map.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+/// Returned from `Serializer::serialize_struct`.
+///
+/// ```rust,ignore
+/// let mut struc = serializer.serialize_struct("Rgb", 3)?;
+/// struc.serialize_field("r", &self.r)?;
+/// struc.serialize_field("g", &self.g)?;
+/// struc.serialize_field("b", &self.b)?;
+/// struc.end()
+/// ```
+pub trait SerializeStruct {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a struct field.
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              key: &'static str,
+                                              value: &T)
+                                              -> Result<(), Self::Error>;
+
+    /// Finish serializing a struct.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+/// Returned from `Serializer::serialize_struct_variant`.
+///
+/// ```rust,ignore
+/// match *self {
+///     E::S { ref r, ref g, ref b } => {
+///         let mut sv = serializer.serialize_struct_variant("E", 0, "S", 3)?;
+///         sv.serialize_field("r", r)?;
+///         sv.serialize_field("g", g)?;
+///         sv.serialize_field("b", b)?;
+///         sv.end()
+///     }
+/// }
+/// ```
+pub trait SerializeStructVariant {
+    /// Must match the `Ok` type of our `Serializer`.
+    type Ok;
+
+    /// Must match the `Error` type of our `Serializer`.
+    type Error: Error;
+
+    /// Serialize a struct variant field.
+    fn serialize_field<T: ?Sized + Serialize>(&mut self,
+                                              key: &'static str,
+                                              value: &T)
+                                              -> Result<(), Self::Error>;
+
+    /// Finish serializing a struct variant.
+    fn end(self) -> Result<Self::Ok, Self::Error>;
+}
+
+trait LenHint: Iterator {
+    fn len_hint(&self) -> Option<usize>;
+}
+
+impl<I: Iterator> LenHint for I {
+    #[cfg(not(feature = "unstable"))]
+    fn len_hint(&self) -> Option<usize> {
+        iterator_len_hint(self)
+    }
+
+    #[cfg(feature = "unstable")]
+    default fn len_hint(&self) -> Option<usize> {
+        iterator_len_hint(self)
+    }
+}
+
+#[cfg(feature = "unstable")]
+impl<I: ExactSizeIterator> LenHint for I {
+    fn len_hint(&self) -> Option<usize> {
+        Some(self.len())
+    }
+}
+
+fn iterator_len_hint<I: Iterator>(iter: &I) -> Option<usize> {
+    match iter.size_hint() {
+        (lo, Some(hi)) if lo == hi => Some(lo),
+        _ => None,
+    }
+}

serde/src/ser/private.rs

@@ -0,0 +1,315 @@
+use core::fmt::{self, Display};
+
+use ser::{self, Serialize, Serializer, SerializeMap, SerializeStruct, Impossible};
+
+#[cfg(any(feature = "std", feature = "collections"))]
+use ser::content::{SerializeTupleVariantAsMapValue, SerializeStructVariantAsMapValue};
+
+/// Not public API.
+pub fn serialize_tagged_newtype<S, T>(serializer: S,
+                                      type_ident: &'static str,
+                                      variant_ident: &'static str,
+                                      tag: &'static str,
+                                      variant_name: &'static str,
+                                      value: &T)
+                                      -> Result<S::Ok, S::Error>
+    where S: Serializer,
+          T: Serialize
+{
+    value.serialize(TaggedSerializer {
+                        type_ident: type_ident,
+                        variant_ident: variant_ident,
+                        tag: tag,
+                        variant_name: variant_name,
+                        delegate: serializer,
+                    })
+}
+
+struct TaggedSerializer<S> {
+    type_ident: &'static str,
+    variant_ident: &'static str,
+    tag: &'static str,
+    variant_name: &'static str,
+    delegate: S,
+}
+
+enum Unsupported {
+    Boolean,
+    Integer,
+    Float,
+    Char,
+    String,
+    ByteArray,
+    Optional,
+    Unit,
+    UnitStruct,
+    Sequence,
+    Tuple,
+    TupleStruct,
+    #[cfg(not(any(feature = "std", feature = "collections")))]
+    Enum,
+}
+
+impl Display for Unsupported {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Unsupported::Boolean => formatter.write_str("a boolean"),
+            Unsupported::Integer => formatter.write_str("an integer"),
+            Unsupported::Float => formatter.write_str("a float"),
+            Unsupported::Char => formatter.write_str("a char"),
+            Unsupported::String => formatter.write_str("a string"),
+            Unsupported::ByteArray => formatter.write_str("a byte array"),
+            Unsupported::Optional => formatter.write_str("an optional"),
+            Unsupported::Unit => formatter.write_str("unit"),
+            Unsupported::UnitStruct => formatter.write_str("a unit struct"),
+            Unsupported::Sequence => formatter.write_str("a sequence"),
+            Unsupported::Tuple => formatter.write_str("a tuple"),
+            Unsupported::TupleStruct => formatter.write_str("a tuple struct"),
+            #[cfg(not(any(feature = "std", feature = "collections")))]
+            Unsupported::Enum => formatter.write_str("an enum"),
+        }
+    }
+}
+
+struct Error {
+    type_ident: &'static str,
+    variant_ident: &'static str,
+    ty: Unsupported,
+}
+
+impl Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter,
+               "cannot serialize tagged newtype variant {}::{} containing {}",
+               self.type_ident,
+               self.variant_ident,
+               self.ty)
+    }
+}
+
+impl<S> TaggedSerializer<S>
+    where S: Serializer
+{
+    fn bad_type(self, what: Unsupported) -> S::Error {
+        ser::Error::custom(Error {
+                               type_ident: self.type_ident,
+                               variant_ident: self.variant_ident,
+                               ty: what,
+                           })
+    }
+}
+
+impl<S> Serializer for TaggedSerializer<S>
+    where S: Serializer
+{
+    type Ok = S::Ok;
+    type Error = S::Error;
+
+    type SerializeSeq = Impossible<S::Ok, S::Error>;
+    type SerializeTuple = Impossible<S::Ok, S::Error>;
+    type SerializeTupleStruct = Impossible<S::Ok, S::Error>;
+    type SerializeMap = S::SerializeMap;
+    type SerializeStruct = S::SerializeStruct;
+
+    #[cfg(not(any(feature = "std", feature = "collections")))]
+    type SerializeTupleVariant = Impossible<S::Ok, S::Error>;
+    #[cfg(any(feature = "std", feature = "collections"))]
+    type SerializeTupleVariant = SerializeTupleVariantAsMapValue<S::SerializeMap>;
+
+    #[cfg(not(any(feature = "std", feature = "collections")))]
+    type SerializeStructVariant = Impossible<S::Ok, S::Error>;
+    #[cfg(any(feature = "std", feature = "collections"))]
+    type SerializeStructVariant = SerializeStructVariantAsMapValue<S::SerializeMap>;
+
+    fn serialize_bool(self, _: bool) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Boolean))
+    }
+
+    fn serialize_i8(self, _: i8) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_i16(self, _: i16) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_i32(self, _: i32) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_i64(self, _: i64) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_u8(self, _: u8) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_u16(self, _: u16) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_u32(self, _: u32) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_u64(self, _: u64) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Integer))
+    }
+
+    fn serialize_f32(self, _: f32) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Float))
+    }
+
+    fn serialize_f64(self, _: f64) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Float))
+    }
+
+    fn serialize_char(self, _: char) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Char))
+    }
+
+    fn serialize_str(self, _: &str) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::String))
+    }
+
+    fn serialize_bytes(self, _: &[u8]) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::ByteArray))
+    }
+
+    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Optional))
+    }
+
+    fn serialize_some<T: ?Sized>(self, _: &T) -> Result<Self::Ok, Self::Error>
+        where T: Serialize
+    {
+        Err(self.bad_type(Unsupported::Optional))
+    }
+
+    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::Unit))
+    }
+
+    fn serialize_unit_struct(self, _: &'static str) -> Result<Self::Ok, Self::Error> {
+        Err(self.bad_type(Unsupported::UnitStruct))
+    }
+
+    fn serialize_unit_variant(self,
+                              _: &'static str,
+                              _: usize,
+                              inner_variant: &'static str)
+                              -> Result<Self::Ok, Self::Error> {
+        let mut map = try!(self.delegate.serialize_map(Some(2)));
+        try!(map.serialize_entry(self.tag, self.variant_name));
+        try!(map.serialize_entry(inner_variant, &()));
+        map.end()
+    }
+
+    fn serialize_newtype_struct<T: ?Sized>(self,
+                                           _: &'static str,
+                                           value: &T)
+                                           -> Result<Self::Ok, Self::Error>
+        where T: Serialize
+    {
+        value.serialize(self)
+    }
+
+    fn serialize_newtype_variant<T: ?Sized>(self,
+                                            _: &'static str,
+                                            _: usize,
+                                            inner_variant: &'static str,
+                                            inner_value: &T)
+                                            -> Result<Self::Ok, Self::Error>
+        where T: Serialize
+    {
+        let mut map = try!(self.delegate.serialize_map(Some(2)));
+        try!(map.serialize_entry(self.tag, self.variant_name));
+        try!(map.serialize_entry(inner_variant, inner_value));
+        map.end()
+    }
+
+    fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+        Err(self.bad_type(Unsupported::Sequence))
+    }
+
+    fn serialize_seq_fixed_size(self, _: usize) -> Result<Self::SerializeSeq, Self::Error> {
+        Err(self.bad_type(Unsupported::Sequence))
+    }
+
+    fn serialize_tuple(self, _: usize) -> Result<Self::SerializeTuple, Self::Error> {
+        Err(self.bad_type(Unsupported::Tuple))
+    }
+
+    fn serialize_tuple_struct(self,
+                              _: &'static str,
+                              _: usize)
+                              -> Result<Self::SerializeTupleStruct, Self::Error> {
+        Err(self.bad_type(Unsupported::TupleStruct))
+    }
+
+    #[cfg(not(any(feature = "std", feature = "collections")))]
+    fn serialize_tuple_variant(self,
+                               _: &'static str,
+                               _: usize,
+                               _: &'static str,
+                               _: usize)
+                               -> Result<Self::SerializeTupleVariant, Self::Error> {
+        // Lack of push-based serialization means we need to buffer the content
+        // of the tuple variant, so it requires std.
+        Err(self.bad_type(Unsupported::Enum))
+    }
+
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn serialize_tuple_variant(self,
+                               _: &'static str,
+                               _: usize,
+                               inner_variant: &'static str,
+                               len: usize)
+                               -> Result<Self::SerializeTupleVariant, Self::Error> {
+        let mut map = try!(self.delegate.serialize_map(Some(2)));
+        try!(map.serialize_entry(self.tag, self.variant_name));
+        try!(map.serialize_key(inner_variant));
+        Ok(SerializeTupleVariantAsMapValue::new(map, inner_variant, len))
+    }
+
+    fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
+        let mut map = try!(self.delegate.serialize_map(len.map(|len| len + 1)));
+        try!(map.serialize_entry(self.tag, self.variant_name));
+        Ok(map)
+    }
+
+    fn serialize_struct(self,
+                        name: &'static str,
+                        len: usize)
+                        -> Result<Self::SerializeStruct, Self::Error> {
+        let mut state = try!(self.delegate.serialize_struct(name, len + 1));
+        try!(state.serialize_field(self.tag, self.variant_name));
+        Ok(state)
+    }
+
+    #[cfg(not(any(feature = "std", feature = "collections")))]
+    fn serialize_struct_variant(self,
+                                _: &'static str,
+                                _: usize,
+                                _: &'static str,
+                                _: usize)
+                                -> Result<Self::SerializeStructVariant, Self::Error> {
+        // Lack of push-based serialization means we need to buffer the content
+        // of the struct variant, so it requires std.
+        Err(self.bad_type(Unsupported::Enum))
+    }
+
+    #[cfg(any(feature = "std", feature = "collections"))]
+    fn serialize_struct_variant(self,
+                                _: &'static str,
+                                _: usize,
+                                inner_variant: &'static str,
+                                len: usize)
+                                -> Result<Self::SerializeStructVariant, Self::Error> {
+        let mut map = try!(self.delegate.serialize_map(Some(2)));
+        try!(map.serialize_entry(self.tag, self.variant_name));
+        try!(map.serialize_key(inner_variant));
+        Ok(SerializeStructVariantAsMapValue::new(map, inner_variant, len))
+    }
+}

serde/src/utils.rs

@@ -0,0 +1,74 @@
+//! 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_internals/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "serde_codegen_internals"
+version = "0.14.2"
+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"]
+readme = "../README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[dependencies]
+syn = { version = "0.11", default-features = false, features = ["parsing"] }
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }

serde_codegen_internals/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

serde_codegen_internals/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

serde_codegen_internals/README.md

@@ -0,0 +1 @@
+../README.md

serde_codegen_internals/src/ast.rs

@@ -0,0 +1,122 @@
+use syn;
+use attr;
+use Ctxt;
+
+pub struct Item<'a> {
+    pub ident: syn::Ident,
+    pub attrs: attr::Item,
+    pub body: Body<'a>,
+    pub generics: &'a syn::Generics,
+}
+
+pub enum Body<'a> {
+    Enum(Vec<Variant<'a>>),
+    Struct(Style, Vec<Field<'a>>),
+}
+
+pub struct Variant<'a> {
+    pub ident: syn::Ident,
+    pub attrs: attr::Variant,
+    pub style: Style,
+    pub fields: Vec<Field<'a>>,
+}
+
+pub struct Field<'a> {
+    pub ident: Option<syn::Ident>,
+    pub attrs: attr::Field,
+    pub ty: &'a syn::Ty,
+}
+
+pub enum Style {
+    Struct,
+    Tuple,
+    Newtype,
+    Unit,
+}
+
+impl<'a> Item<'a> {
+    pub fn from_ast(cx: &Ctxt, item: &'a syn::MacroInput) -> Item<'a> {
+        let attrs = attr::Item::from_ast(cx, item);
+
+        let mut body = match item.body {
+            syn::Body::Enum(ref variants) => Body::Enum(enum_from_ast(cx, variants)),
+            syn::Body::Struct(ref variant_data) => {
+                let (style, fields) = struct_from_ast(cx, variant_data);
+                Body::Struct(style, fields)
+            }
+        };
+
+        match body {
+            Body::Enum(ref mut variants) => {
+                for ref mut variant in variants {
+                    variant.attrs.rename_by_rule(attrs.rename_all());
+                    for ref mut field in &mut variant.fields {
+                        field.attrs.rename_by_rule(variant.attrs.rename_all());
+                    }
+                }
+            }
+            Body::Struct(_, ref mut fields) => {
+                for field in fields {
+                    field.attrs.rename_by_rule(attrs.rename_all());
+                }
+            }
+        }
+
+        Item {
+            ident: item.ident.clone(),
+            attrs: attrs,
+            body: body,
+            generics: &item.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: &Ctxt, variants: &'a [syn::Variant]) -> Vec<Variant<'a>> {
+    variants.iter()
+        .map(|variant| {
+            let (style, fields) = struct_from_ast(cx, &variant.data);
+            Variant {
+                ident: variant.ident.clone(),
+                attrs: attr::Variant::from_ast(cx, variant),
+                style: style,
+                fields: fields,
+            }
+        })
+        .collect()
+}
+
+fn struct_from_ast<'a>(cx: &Ctxt, data: &'a syn::VariantData) -> (Style, Vec<Field<'a>>) {
+    match *data {
+        syn::VariantData::Struct(ref fields) => (Style::Struct, fields_from_ast(cx, fields)),
+        syn::VariantData::Tuple(ref fields) if fields.len() == 1 => {
+            (Style::Newtype, fields_from_ast(cx, fields))
+        }
+        syn::VariantData::Tuple(ref fields) => (Style::Tuple, fields_from_ast(cx, fields)),
+        syn::VariantData::Unit => (Style::Unit, Vec::new()),
+    }
+}
+
+fn fields_from_ast<'a>(cx: &Ctxt, fields: &'a [syn::Field]) -> Vec<Field<'a>> {
+    fields.iter()
+        .enumerate()
+        .map(|(i, field)| {
+            Field {
+                ident: field.ident.clone(),
+                attrs: attr::Field::from_ast(cx, i, field),
+                ty: &field.ty,
+            }
+        })
+        .collect()
+}

serde_codegen_internals/src/attr.rs

@@ -0,0 +1,838 @@
+use Ctxt;
+use syn;
+use syn::MetaItem::{List, NameValue, Word};
+use syn::NestedMetaItem::{Literal, MetaItem};
+use std::str::FromStr;
+
+// 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.
+
+pub use case::RenameRule;
+
+struct Attr<'c, T> {
+    cx: &'c Ctxt,
+    name: &'static str,
+    value: Option<T>,
+}
+
+impl<'c, T> Attr<'c, T> {
+    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
+        Attr {
+            cx: cx,
+            name: name,
+            value: None,
+        }
+    }
+
+    fn set(&mut self, value: T) {
+        if self.value.is_some() {
+            self.cx.error(format!("duplicate serde attribute `{}`", self.name));
+        } else {
+            self.value = Some(value);
+        }
+    }
+
+    fn set_opt(&mut self, value: Option<T>) {
+        if let Some(value) = value {
+            self.set(value);
+        }
+    }
+
+    fn set_if_none(&mut self, value: T) {
+        if self.value.is_none() {
+            self.value = Some(value);
+        }
+    }
+
+    fn get(self) -> Option<T> {
+        self.value
+    }
+}
+
+struct BoolAttr<'c>(Attr<'c, ()>);
+
+impl<'c> BoolAttr<'c> {
+    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
+        BoolAttr(Attr::none(cx, name))
+    }
+
+    fn set_true(&mut self) {
+        self.0.set(());
+    }
+
+    fn get(&self) -> bool {
+        self.0.value.is_some()
+    }
+}
+
+#[derive(Debug)]
+pub struct Name {
+    serialize: String,
+    deserialize: String,
+}
+
+impl Name {
+    /// Return the container name for the container when serializing.
+    pub fn serialize_name(&self) -> String {
+        self.serialize.clone()
+    }
+
+    /// Return the container name for the container when deserializing.
+    pub fn deserialize_name(&self) -> String {
+        self.deserialize.clone()
+    }
+}
+
+/// Represents container (e.g. struct) attribute information
+#[derive(Debug)]
+pub struct Item {
+    name: Name,
+    deny_unknown_fields: bool,
+    default: Default,
+    rename_all: RenameRule,
+    ser_bound: Option<Vec<syn::WherePredicate>>,
+    de_bound: Option<Vec<syn::WherePredicate>>,
+    tag: EnumTag,
+    from_type: Option<syn::Ty>,
+    into_type: Option<syn::Ty>,
+}
+
+/// Styles of representing an enum.
+#[derive(Debug)]
+pub enum EnumTag {
+    /// The default.
+    ///
+    /// ```json
+    /// {"variant1": {"key1": "value1", "key2": "value2"}}
+    /// ```
+    External,
+
+    /// `#[serde(tag = "type")]`
+    ///
+    /// ```json
+    /// {"type": "variant1", "key1": "value1", "key2": "value2"}
+    /// ```
+    Internal { tag: String },
+
+    /// `#[serde(tag = "t", content = "c")]`
+    ///
+    /// ```json
+    /// {"t": "variant1", "c": {"key1": "value1", "key2": "value2"}}
+    /// ```
+    Adjacent { tag: String, content: String },
+
+    /// `#[serde(untagged)]`
+    ///
+    /// ```json
+    /// {"key1": "value1", "key2": "value2"}
+    /// ```
+    None,
+}
+
+impl Item {
+    /// Extract out the `#[serde(...)]` attributes from an item.
+    pub fn from_ast(cx: &Ctxt, item: &syn::MacroInput) -> 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 default = Attr::none(cx, "default");
+        let mut rename_all = Attr::none(cx, "rename_all");
+        let mut ser_bound = Attr::none(cx, "bound");
+        let mut de_bound = Attr::none(cx, "bound");
+        let mut untagged = BoolAttr::none(cx, "untagged");
+        let mut internal_tag = Attr::none(cx, "tag");
+        let mut content = Attr::none(cx, "content");
+        let mut from_type = Attr::none(cx, "from");
+        let mut into_type = Attr::none(cx, "into");
+
+        for meta_items in item.attrs.iter().filter_map(get_serde_meta_items) {
+            for meta_item in meta_items {
+                match meta_item {
+                    // Parse `#[serde(rename="foo")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "rename" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_name.set(s.clone());
+                            de_name.set(s);
+                        }
+                    }
+
+                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
+                    MetaItem(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(rename_all="foo")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "rename_all" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            match RenameRule::from_str(&s) {
+                                Ok(rename_rule) => rename_all.set(rename_rule),
+                                Err(()) => {
+                                    cx.error(format!("unknown rename rule for #[serde(rename_all \
+                                                      = {:?})]",
+                                                     s))
+                                }
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(deny_unknown_fields)]`
+                    MetaItem(Word(ref name)) if name == "deny_unknown_fields" => {
+                        deny_unknown_fields.set_true();
+                    }
+
+                    // Parse `#[serde(default)]`
+                    MetaItem(Word(ref name)) if name == "default" => {
+                        match item.body {
+                            syn::Body::Struct(syn::VariantData::Struct(_)) => {
+                                default.set(Default::Default);
+                            }
+                            _ => {
+                                cx.error("#[serde(default)] can only be used on structs \
+                                          with named fields")
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(default="...")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "default" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            match item.body {
+                                syn::Body::Struct(syn::VariantData::Struct(_)) => {
+                                    default.set(Default::Path(path));
+                                }
+                                _ => {
+                                    cx.error("#[serde(default = \"...\")] can only be used \
+                                              on structs with named fields")
+                                }
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(bound="D: Serialize")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "bound" => {
+                        if let Ok(where_predicates) =
+                            parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_bound.set(where_predicates.clone());
+                            de_bound.set(where_predicates);
+                        }
+                    }
+
+                    // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
+                    MetaItem(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);
+                        }
+                    }
+
+                    // Parse `#[serde(untagged)]`
+                    MetaItem(Word(ref name)) if name == "untagged" => {
+                        match item.body {
+                            syn::Body::Enum(_) => {
+                                untagged.set_true();
+                            }
+                            syn::Body::Struct(_) => {
+                                cx.error("#[serde(untagged)] can only be used on enums")
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(tag = "type")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "tag" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            match item.body {
+                                syn::Body::Enum(_) => {
+                                    internal_tag.set(s);
+                                }
+                                syn::Body::Struct(_) => {
+                                    cx.error("#[serde(tag = \"...\")] can only be used on enums")
+                                }
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(content = "c")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "content" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            match item.body {
+                                syn::Body::Enum(_) => {
+                                    content.set(s);
+                                }
+                                syn::Body::Struct(_) => {
+                                    cx.error("#[serde(content = \"...\")] can only be used on \
+                                              enums")
+                                }
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(from = "Type")]
+                    MetaItem(NameValue(ref name, ref lit)) if name == "from" => {
+                        if let Ok(from_ty) = parse_lit_into_ty(cx, name.as_ref(), lit) {
+                            from_type.set_opt(Some(from_ty));
+                        }
+                    }
+
+                    // Parse `#[serde(into = "Type")]
+                    MetaItem(NameValue(ref name, ref lit)) if name == "into" => {
+                        if let Ok(into_ty) = parse_lit_into_ty(cx, name.as_ref(), lit) {
+                            into_type.set_opt(Some(into_ty));
+                        }
+                    }
+
+                    MetaItem(ref meta_item) => {
+                        cx.error(format!("unknown serde container attribute `{}`",
+                                         meta_item.name()));
+                    }
+
+                    Literal(_) => {
+                        cx.error("unexpected literal in serde container attribute");
+                    }
+                }
+            }
+        }
+
+        let tag = match (untagged.get(), internal_tag.get(), content.get()) {
+            (false, None, None) => EnumTag::External,
+            (true, None, None) => EnumTag::None,
+            (false, Some(tag), None) => {
+                // Check that there are no tuple variants.
+                if let syn::Body::Enum(ref variants) = item.body {
+                    for variant in variants {
+                        match variant.data {
+                            syn::VariantData::Struct(_) |
+                            syn::VariantData::Unit => {}
+                            syn::VariantData::Tuple(ref fields) => {
+                                if fields.len() != 1 {
+                                    cx.error("#[serde(tag = \"...\")] cannot be used with tuple \
+                                              variants");
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                EnumTag::Internal { tag: tag }
+            }
+            (true, Some(_), None) => {
+                cx.error("enum cannot be both untagged and internally tagged");
+                EnumTag::External // doesn't matter, will error
+            }
+            (false, None, Some(_)) => {
+                cx.error("#[serde(tag = \"...\", content = \"...\")] must be used together");
+                EnumTag::External
+            }
+            (true, None, Some(_)) => {
+                cx.error("untagged enum cannot have #[serde(content = \"...\")]");
+                EnumTag::External
+            }
+            (false, Some(tag), Some(content)) => {
+                EnumTag::Adjacent {
+                    tag: tag,
+                    content: content,
+                }
+            }
+            (true, Some(_), Some(_)) => {
+                cx.error("untagged enum cannot have #[serde(tag = \"...\", content = \"...\")]");
+                EnumTag::External
+            }
+        };
+
+        Item {
+            name: Name {
+                serialize: ser_name.get().unwrap_or_else(|| item.ident.to_string()),
+                deserialize: de_name.get().unwrap_or_else(|| item.ident.to_string()),
+            },
+            deny_unknown_fields: deny_unknown_fields.get(),
+            default: default.get().unwrap_or(Default::None),
+            rename_all: rename_all.get().unwrap_or(RenameRule::None),
+            ser_bound: ser_bound.get(),
+            de_bound: de_bound.get(),
+            tag: tag,
+            from_type: from_type.get(),
+            into_type: into_type.get(),
+        }
+    }
+
+    pub fn name(&self) -> &Name {
+        &self.name
+    }
+
+    pub fn rename_all(&self) -> &RenameRule {
+        &self.rename_all
+    }
+
+    pub fn deny_unknown_fields(&self) -> bool {
+        self.deny_unknown_fields
+    }
+
+    pub fn default(&self) -> &Default {
+        &self.default
+    }
+
+    pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
+        self.ser_bound.as_ref().map(|vec| &vec[..])
+    }
+
+    pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
+        self.de_bound.as_ref().map(|vec| &vec[..])
+    }
+
+    pub fn tag(&self) -> &EnumTag {
+        &self.tag
+    }
+
+    pub fn from_type(&self) -> Option<&syn::Ty> {
+        self.from_type.as_ref()
+    }
+
+    pub fn into_type(&self) -> Option<&syn::Ty> {
+        self.into_type.as_ref()
+    }
+}
+
+/// Represents variant attribute information
+#[derive(Debug)]
+pub struct Variant {
+    name: Name,
+    ser_renamed: bool,
+    de_renamed: bool,
+    rename_all: RenameRule,
+    skip_deserializing: bool,
+    skip_serializing: bool,
+}
+
+impl Variant {
+    pub fn from_ast(cx: &Ctxt, variant: &syn::Variant) -> Self {
+        let mut ser_name = Attr::none(cx, "rename");
+        let mut de_name = Attr::none(cx, "rename");
+        let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing");
+        let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
+        let mut rename_all = Attr::none(cx, "rename_all");
+
+        for meta_items in variant.attrs.iter().filter_map(get_serde_meta_items) {
+            for meta_item in meta_items {
+                match meta_item {
+                    // Parse `#[serde(rename="foo")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "rename" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_name.set(s.clone());
+                            de_name.set(s);
+                        }
+                    }
+
+                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
+                    MetaItem(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(rename_all="foo")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "rename_all" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            match RenameRule::from_str(&s) {
+                                Ok(rename_rule) => rename_all.set(rename_rule),
+                                Err(()) => {
+                                    cx.error(format!("unknown rename rule for #[serde(rename_all \
+                                                      = {:?})]",
+                                                     s))
+                                }
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(skip_deserializing)]`
+                    MetaItem(Word(ref name)) if name == "skip_deserializing" => {
+                        skip_deserializing.set_true();
+                    }
+                    // Parse `#[serde(skip_serializing)]`
+                    MetaItem(Word(ref name)) if name == "skip_serializing" => {
+                        skip_serializing.set_true();
+                    }
+
+                    MetaItem(ref meta_item) => {
+                        cx.error(format!("unknown serde variant attribute `{}`", meta_item.name()));
+                    }
+
+                    Literal(_) => {
+                        cx.error("unexpected literal in serde variant attribute");
+                    }
+                }
+            }
+        }
+
+        let ser_name = ser_name.get();
+        let ser_renamed = ser_name.is_some();
+        let de_name = de_name.get();
+        let de_renamed = de_name.is_some();
+        Variant {
+            name: Name {
+                serialize: ser_name.unwrap_or_else(|| variant.ident.to_string()),
+                deserialize: de_name.unwrap_or_else(|| variant.ident.to_string()),
+            },
+            ser_renamed: ser_renamed,
+            de_renamed: de_renamed,
+            rename_all: rename_all.get().unwrap_or(RenameRule::None),
+            skip_deserializing: skip_deserializing.get(),
+            skip_serializing: skip_serializing.get(),
+        }
+    }
+
+    pub fn name(&self) -> &Name {
+        &self.name
+    }
+
+    pub fn rename_by_rule(&mut self, rule: &RenameRule) {
+        if !self.ser_renamed {
+            self.name.serialize = rule.apply_to_variant(&self.name.serialize);
+        }
+        if !self.de_renamed {
+            self.name.deserialize = rule.apply_to_variant(&self.name.deserialize);
+        }
+    }
+
+    pub fn rename_all(&self) -> &RenameRule {
+        &self.rename_all
+    }
+
+    pub fn skip_deserializing(&self) -> bool {
+        self.skip_deserializing
+    }
+
+    pub fn skip_serializing(&self) -> bool {
+        self.skip_serializing
+    }
+}
+
+/// Represents field attribute information
+#[derive(Debug)]
+pub struct Field {
+    name: Name,
+    ser_renamed: bool,
+    de_renamed: bool,
+    skip_serializing: bool,
+    skip_deserializing: bool,
+    skip_serializing_if: Option<syn::Path>,
+    default: Default,
+    serialize_with: Option<syn::Path>,
+    deserialize_with: Option<syn::Path>,
+    ser_bound: Option<Vec<syn::WherePredicate>>,
+    de_bound: Option<Vec<syn::WherePredicate>>,
+}
+
+/// Represents the default to use for a field when deserializing.
+#[derive(Debug, PartialEq)]
+pub enum Default {
+    /// 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(syn::Path),
+}
+
+impl Field {
+    /// Extract out the `#[serde(...)]` attributes from a struct field.
+    pub fn from_ast(cx: &Ctxt, index: usize, field: &syn::Field) -> 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(ref ident) => ident.to_string(),
+            None => index.to_string(),
+        };
+
+        for meta_items in field.attrs.iter().filter_map(get_serde_meta_items) {
+            for meta_item in meta_items {
+                match meta_item {
+                    // Parse `#[serde(rename="foo")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "rename" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_name.set(s.clone());
+                            de_name.set(s);
+                        }
+                    }
+
+                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
+                    MetaItem(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)]`
+                    MetaItem(Word(ref name)) if name == "default" => {
+                        default.set(Default::Default);
+                    }
+
+                    // Parse `#[serde(default="...")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "default" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            default.set(Default::Path(path));
+                        }
+                    }
+
+                    // Parse `#[serde(skip_serializing)]`
+                    MetaItem(Word(ref name)) if name == "skip_serializing" => {
+                        skip_serializing.set_true();
+                    }
+
+                    // Parse `#[serde(skip_deserializing)]`
+                    MetaItem(Word(ref name)) if name == "skip_deserializing" => {
+                        skip_deserializing.set_true();
+                    }
+
+                    // Parse `#[serde(skip_serializing_if="...")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "skip_serializing_if" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            skip_serializing_if.set(path);
+                        }
+                    }
+
+                    // Parse `#[serde(serialize_with="...")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "serialize_with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            serialize_with.set(path);
+                        }
+                    }
+
+                    // Parse `#[serde(deserialize_with="...")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "deserialize_with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            deserialize_with.set(path);
+                        }
+                    }
+
+                    // Parse `#[serde(with="...")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            let mut ser_path = path.clone();
+                            ser_path.segments.push("serialize".into());
+                            serialize_with.set(ser_path);
+                            let mut de_path = path;
+                            de_path.segments.push("deserialize".into());
+                            deserialize_with.set(de_path);
+                        }
+                    }
+
+                    // Parse `#[serde(bound="D: Serialize")]`
+                    MetaItem(NameValue(ref name, ref lit)) if name == "bound" => {
+                        if let Ok(where_predicates) =
+                            parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_bound.set(where_predicates.clone());
+                            de_bound.set(where_predicates);
+                        }
+                    }
+
+                    // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
+                    MetaItem(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);
+                        }
+                    }
+
+                    MetaItem(ref meta_item) => {
+                        cx.error(format!("unknown serde field attribute `{}`", meta_item.name()));
+                    }
+
+                    Literal(_) => {
+                        cx.error("unexpected literal in serde field attribute");
+                    }
+                }
+            }
+        }
+
+        // Is skip_deserializing, initialize the field to Default::default()
+        // unless a different default is specified by `#[serde(default="...")]`
+        if skip_deserializing.0.value.is_some() {
+            default.set_if_none(Default::Default);
+        }
+
+        let ser_name = ser_name.get();
+        let ser_renamed = ser_name.is_some();
+        let de_name = de_name.get();
+        let de_renamed = de_name.is_some();
+        Field {
+            name: Name {
+                serialize: ser_name.unwrap_or_else(|| ident.clone()),
+                deserialize: de_name.unwrap_or(ident),
+            },
+            ser_renamed: ser_renamed,
+            de_renamed: de_renamed,
+            skip_serializing: skip_serializing.get(),
+            skip_deserializing: skip_deserializing.get(),
+            skip_serializing_if: skip_serializing_if.get(),
+            default: default.get().unwrap_or(Default::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 rename_by_rule(&mut self, rule: &RenameRule) {
+        if !self.ser_renamed {
+            self.name.serialize = rule.apply_to_field(&self.name.serialize);
+        }
+        if !self.de_renamed {
+            self.name.deserialize = rule.apply_to_field(&self.name.deserialize);
+        }
+    }
+
+    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<&syn::Path> {
+        self.skip_serializing_if.as_ref()
+    }
+
+    pub fn default(&self) -> &Default {
+        &self.default
+    }
+
+    pub fn serialize_with(&self) -> Option<&syn::Path> {
+        self.serialize_with.as_ref()
+    }
+
+    pub fn deserialize_with(&self) -> Option<&syn::Path> {
+        self.deserialize_with.as_ref()
+    }
+
+    pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
+        self.ser_bound.as_ref().map(|vec| &vec[..])
+    }
+
+    pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
+        self.de_bound.as_ref().map(|vec| &vec[..])
+    }
+}
+
+type SerAndDe<T> = (Option<T>, Option<T>);
+
+fn get_ser_and_de<T, F>(cx: &Ctxt,
+                        attr_name: &'static str,
+                        items: &[syn::NestedMetaItem],
+                        f: F)
+                        -> Result<SerAndDe<T>, ()>
+    where F: Fn(&Ctxt, &str, &str, &syn::Lit) -> Result<T, ()>
+{
+    let mut ser_item = Attr::none(cx, attr_name);
+    let mut de_item = Attr::none(cx, attr_name);
+
+    for item in items {
+        match *item {
+            MetaItem(NameValue(ref name, ref lit)) if name == "serialize" => {
+                if let Ok(v) = f(cx, attr_name, name.as_ref(), lit) {
+                    ser_item.set(v);
+                }
+            }
+
+            MetaItem(NameValue(ref name, ref lit)) if name == "deserialize" => {
+                if let Ok(v) = f(cx, attr_name, name.as_ref(), lit) {
+                    de_item.set(v);
+                }
+            }
+
+            _ => {
+                cx.error(format!("malformed {0} attribute, expected `{0}(serialize = ..., \
+                                  deserialize = ...)`",
+                                 attr_name));
+                return Err(());
+            }
+        }
+    }
+
+    Ok((ser_item.get(), de_item.get()))
+}
+
+fn get_renames(cx: &Ctxt, items: &[syn::NestedMetaItem]) -> Result<SerAndDe<String>, ()> {
+    get_ser_and_de(cx, "rename", items, get_string_from_lit)
+}
+
+fn get_where_predicates(cx: &Ctxt,
+                        items: &[syn::NestedMetaItem])
+                        -> Result<SerAndDe<Vec<syn::WherePredicate>>, ()> {
+    get_ser_and_de(cx, "bound", items, parse_lit_into_where)
+}
+
+pub fn get_serde_meta_items(attr: &syn::Attribute) -> Option<Vec<syn::NestedMetaItem>> {
+    match attr.value {
+        List(ref name, ref items) if name == "serde" => Some(items.iter().cloned().collect()),
+        _ => None,
+    }
+}
+
+fn get_string_from_lit(cx: &Ctxt,
+                       attr_name: &str,
+                       meta_item_name: &str,
+                       lit: &syn::Lit)
+                       -> Result<String, ()> {
+    if let syn::Lit::Str(ref s, _) = *lit {
+        Ok(s.clone())
+    } else {
+        cx.error(format!("expected serde {} attribute to be a string: `{} = \"...\"`",
+                         attr_name,
+                         meta_item_name));
+        Err(())
+    }
+}
+
+fn parse_lit_into_path(cx: &Ctxt, attr_name: &str, lit: &syn::Lit) -> Result<syn::Path, ()> {
+    let string = try!(get_string_from_lit(cx, attr_name, attr_name, lit));
+    syn::parse_path(&string).map_err(|err| cx.error(err))
+}
+
+fn parse_lit_into_where(cx: &Ctxt,
+                        attr_name: &str,
+                        meta_item_name: &str,
+                        lit: &syn::Lit)
+                        -> Result<Vec<syn::WherePredicate>, ()> {
+    let string = try!(get_string_from_lit(cx, attr_name, meta_item_name, lit));
+    if string.is_empty() {
+        return Ok(Vec::new());
+    }
+
+    let where_string = format!("where {}", string);
+
+    syn::parse_where_clause(&where_string).map(|wh| wh.predicates).map_err(|err| cx.error(err))
+}
+
+fn parse_lit_into_ty(cx: &Ctxt,
+                     attr_name: &str,
+                     lit: &syn::Lit)
+                     -> Result<syn::Ty, ()> {
+    let string = try!(get_string_from_lit(cx, attr_name, attr_name, lit));
+
+    syn::parse_type(&string).map_err(|_| {
+        cx.error(format!("failed to parse type: {} = {:?}", attr_name, string))
+    })
+}

serde_codegen_internals/src/case.rs

@@ -0,0 +1,115 @@
+use std::ascii::AsciiExt;
+use std::str::FromStr;
+
+use self::RenameRule::*;
+
+#[derive(Debug, PartialEq)]
+pub enum RenameRule {
+    /// Don't apply a default rename rule.
+    None,
+    /// Rename direct children to "PascalCase" style, as typically used for enum variants.
+    PascalCase,
+    /// Rename direct children to "camelCase" style.
+    CamelCase,
+    /// Rename direct children to "snake_case" style, as commonly used for fields.
+    SnakeCase,
+    /// Rename direct children to "SCREAMING_SNAKE_CASE" style, as commonly used for constants.
+    ScreamingSnakeCase,
+    /// Rename direct children to "kebab-case" style.
+    KebabCase,
+}
+
+impl RenameRule {
+    pub fn apply_to_variant(&self, variant: &str) -> String {
+        match *self {
+            None | PascalCase => variant.to_owned(),
+            CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..],
+            SnakeCase => {
+                let mut snake = String::new();
+                for (i, ch) in variant.char_indices() {
+                    if i > 0 && ch.is_uppercase() {
+                        snake.push('_');
+                    }
+                    snake.push(ch.to_ascii_lowercase());
+                }
+                snake
+            }
+            ScreamingSnakeCase => SnakeCase.apply_to_variant(variant).to_ascii_uppercase(),
+            KebabCase => SnakeCase.apply_to_variant(variant).replace('_', "-"),
+        }
+    }
+
+    pub fn apply_to_field(&self, field: &str) -> String {
+        match *self {
+            None | SnakeCase => field.to_owned(),
+            PascalCase => {
+                let mut pascal = String::new();
+                let mut capitalize = true;
+                for ch in field.chars() {
+                    if ch == '_' {
+                        capitalize = true;
+                    } else if capitalize {
+                        pascal.push(ch.to_ascii_uppercase());
+                        capitalize = false;
+                    } else {
+                        pascal.push(ch);
+                    }
+                }
+                pascal
+            }
+            CamelCase => {
+                let pascal = PascalCase.apply_to_field(field);
+                pascal[..1].to_ascii_lowercase() + &pascal[1..]
+            }
+            ScreamingSnakeCase => field.to_ascii_uppercase(),
+            KebabCase => field.replace('_', "-"),
+        }
+    }
+}
+
+impl FromStr for RenameRule {
+    type Err = ();
+
+    fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
+        match rename_all_str {
+            "PascalCase" => Ok(PascalCase),
+            "camelCase" => Ok(CamelCase),
+            "snake_case" => Ok(SnakeCase),
+            "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
+            "kebab-case" => Ok(KebabCase),
+            _ => Err(()),
+        }
+    }
+}
+
+#[test]
+fn rename_variants() {
+    for &(original, camel, snake, screaming, kebab) in
+        &[("Outcome", "outcome", "outcome", "OUTCOME", "outcome"),
+          ("VeryTasty", "veryTasty", "very_tasty", "VERY_TASTY", "very-tasty"),
+          ("A", "a", "a", "A", "a"),
+          ("Z42", "z42", "z42", "Z42", "z42")] {
+        assert_eq!(None.apply_to_variant(original), original);
+        assert_eq!(PascalCase.apply_to_variant(original), original);
+        assert_eq!(CamelCase.apply_to_variant(original), camel);
+        assert_eq!(SnakeCase.apply_to_variant(original), snake);
+        assert_eq!(ScreamingSnakeCase.apply_to_variant(original), screaming);
+        assert_eq!(KebabCase.apply_to_variant(original), kebab);
+    }
+}
+
+#[test]
+fn rename_fields() {
+    for &(original, pascal, camel, screaming, kebab) in
+        &[("outcome", "Outcome", "outcome", "OUTCOME", "outcome"),
+          ("very_tasty", "VeryTasty", "veryTasty", "VERY_TASTY", "very-tasty"),
+          ("a", "A", "a", "A", "a"),
+          ("z42", "Z42", "z42", "Z42", "z42")] {
+        assert_eq!(None.apply_to_field(original), original);
+        assert_eq!(PascalCase.apply_to_field(original), pascal);
+        assert_eq!(CamelCase.apply_to_field(original), camel);
+        assert_eq!(SnakeCase.apply_to_field(original), original);
+        assert_eq!(ScreamingSnakeCase.apply_to_field(original), screaming);
+        assert_eq!(KebabCase.apply_to_field(original), kebab);
+    }
+}

serde_codegen_internals/src/ctxt.rs

@@ -0,0 +1,41 @@
+use std::fmt::Display;
+use std::cell::RefCell;
+
+#[derive(Default)]
+pub struct Ctxt {
+    errors: RefCell<Option<Vec<String>>>,
+}
+
+impl Ctxt {
+    pub fn new() -> Self {
+        Ctxt { errors: RefCell::new(Some(Vec::new())) }
+    }
+
+    pub fn error<T: Display>(&self, msg: T) {
+        self.errors.borrow_mut().as_mut().unwrap().push(msg.to_string());
+    }
+
+    pub fn check(self) -> Result<(), String> {
+        let mut errors = self.errors.borrow_mut().take().unwrap();
+        match errors.len() {
+            0 => Ok(()),
+            1 => Err(errors.pop().unwrap()),
+            n => {
+                let mut msg = format!("{} errors:", n);
+                for err in errors {
+                    msg.push_str("\n\t# ");
+                    msg.push_str(&err);
+                }
+                Err(msg)
+            }
+        }
+    }
+}
+
+impl Drop for Ctxt {
+    fn drop(&mut self) {
+        if self.errors.borrow().is_some() {
+            panic!("forgot to check for errors");
+        }
+    }
+}

serde_codegen_internals/src/lib.rs

@@ -0,0 +1,9 @@
+extern crate syn;
+
+pub mod ast;
+pub mod attr;
+
+mod ctxt;
+pub use ctxt::Ctxt;
+
+mod case;

serde_derive/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "serde_derive"
+version = "0.9.13"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
+homepage = "https://serde.rs"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://serde.rs/codegen.html"
+keywords = ["serde", "serialization", "no_std"]
+readme = "../README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[features]
+unstable = []
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }
+
+[lib]
+name = "serde_derive"
+proc-macro = true
+
+[dependencies]
+quote = "0.3.8"
+serde_codegen_internals = { version = "=0.14.2", default-features = false, path = "../serde_codegen_internals" }
+syn = { version = "0.11", features = ["visit"] }

serde_derive/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

serde_derive/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

serde_derive/README.md

@@ -0,0 +1 @@
+../README.md

serde_derive/src/bound.rs

@@ -0,0 +1,228 @@
+use std::collections::HashSet;
+
+use syn::{self, visit};
+
+use internals::ast::Item;
+use internals::attr;
+
+macro_rules! path {
+    ($first:ident $(:: $rest:ident)*) => {
+        syn::Path {
+            global: false,
+            segments: vec![
+                stringify!($first).into(),
+                $(
+                    stringify!($rest).into(),
+                )*
+            ],
+        }
+    };
+
+    (::$first:ident $(:: $rest:ident)*) => {
+        syn::Path {
+            global: true,
+            segments: vec![
+                stringify!($first).into(),
+                $(
+                    stringify!($rest).into(),
+                )*
+            ],
+        }
+    };
+}
+
+// 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: &syn::Generics) -> syn::Generics {
+    syn::Generics {
+        ty_params: generics.ty_params
+            .iter()
+            .map(|ty_param| syn::TyParam { default: None, ..ty_param.clone() })
+            .collect(),
+        ..generics.clone()
+    }
+}
+
+pub fn with_where_predicates(generics: &syn::Generics,
+                             predicates: &[syn::WherePredicate])
+                             -> syn::Generics {
+    let mut generics = generics.clone();
+    generics.where_clause.predicates.extend_from_slice(predicates);
+    generics
+}
+
+pub fn with_where_predicates_from_fields<F>(item: &Item,
+                                            generics: &syn::Generics,
+                                            from_field: F)
+                                            -> syn::Generics
+    where F: Fn(&attr::Field) -> Option<&[syn::WherePredicate]>
+{
+    let predicates = item.body
+        .all_fields()
+        .flat_map(|field| from_field(&field.attrs))
+        .flat_map(|predicates| predicates.to_vec());
+
+    let mut generics = generics.clone();
+    generics.where_clause.predicates.extend(predicates);
+    generics
+}
+
+// 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>(item: &Item,
+                     generics: &syn::Generics,
+                     filter: F,
+                     bound: &syn::Path)
+                     -> syn::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<syn::Ident>,
+        // 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<syn::Ident>,
+    }
+    impl visit::Visitor for FindTyParams {
+        fn visit_path(&mut self, path: &syn::Path) {
+            if let Some(seg) = path.segments.last() {
+                if seg.ident == "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].ident.clone();
+                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.clone())
+        .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);
+    }
+
+    let new_predicates = generics.ty_params
+        .iter()
+        .map(|ty_param| ty_param.ident.clone())
+        .filter(|id| visitor.relevant_ty_params.contains(id))
+        .map(|id| {
+            syn::WherePredicate::BoundPredicate(syn::WhereBoundPredicate {
+                bound_lifetimes: Vec::new(),
+                // the type parameter that is being bounded e.g. T
+                bounded_ty: syn::Ty::Path(None, id.into()),
+                // the bound e.g. Serialize
+                bounds: vec![syn::TyParamBound::Trait(
+                    syn::PolyTraitRef {
+                        bound_lifetimes: Vec::new(),
+                        trait_ref: bound.clone(),
+                    },
+                    syn::TraitBoundModifier::None
+                )],
+            })
+        });
+
+    let mut generics = generics.clone();
+    generics.where_clause.predicates.extend(new_predicates);
+    generics
+}
+
+pub fn with_self_bound(item: &Item,
+                       generics: &syn::Generics,
+                       bound: &syn::Path)
+                       -> syn::Generics
+{
+    let mut generics = generics.clone();
+    generics.where_clause.predicates.push(
+        syn::WherePredicate::BoundPredicate(syn::WhereBoundPredicate {
+            bound_lifetimes: Vec::new(),
+            // the type that is being bounded e.g. MyStruct<'a, T>
+            bounded_ty: type_of_item(item),
+            // the bound e.g. Default
+            bounds: vec![syn::TyParamBound::Trait(
+                syn::PolyTraitRef {
+                    bound_lifetimes: Vec::new(),
+                    trait_ref: bound.clone(),
+                },
+                syn::TraitBoundModifier::None
+            )],
+        })
+    );
+    generics
+}
+
+pub fn with_lifetime_bound(generics: &syn::Generics,
+                           lifetime: &str)
+                           -> syn::Generics {
+    let mut generics = generics.clone();
+
+    for lifetime_def in &mut generics.lifetimes {
+        lifetime_def.bounds.push(syn::Lifetime::new(lifetime));
+    }
+
+    for ty_param in &mut generics.ty_params {
+        ty_param.bounds.push(syn::TyParamBound::Region(syn::Lifetime::new(lifetime)));
+    }
+
+    generics.lifetimes.push(syn::LifetimeDef {
+        attrs: Vec::new(),
+        lifetime: syn::Lifetime::new(lifetime),
+        bounds: Vec::new(),
+    });
+
+    generics
+}
+
+fn type_of_item(item: &Item) -> syn::Ty {
+    syn::Ty::Path(None, syn::Path {
+        global: false,
+        segments: vec![
+            syn::PathSegment {
+                ident: item.ident.clone(),
+                parameters: syn::PathParameters::AngleBracketed(syn::AngleBracketedParameterData {
+                    lifetimes: item.generics
+                                    .lifetimes
+                                    .iter()
+                                    .map(|def| def.lifetime.clone())
+                                    .collect(),
+                    types: item.generics
+                                .ty_params
+                                .iter()
+                                .map(|param| syn::Ty::Path(None, param.ident.clone().into()))
+                                .collect(),
+                    bindings: Vec::new(),
+                }),
+            }
+        ]
+    })
+}

serde_derive/src/fragment.rs

@@ -0,0 +1,67 @@
+use quote::{Tokens, ToTokens};
+
+pub enum Fragment {
+    /// Tokens that can be used as an expression.
+    Expr(Tokens),
+    /// Tokens that can be used inside a block. The surrounding curly braces are
+    /// not part of these tokens.
+    Block(Tokens),
+}
+
+macro_rules! quote_expr {
+    ($($tt:tt)*) => {
+        $crate::fragment::Fragment::Expr(quote!($($tt)*))
+    }
+}
+
+macro_rules! quote_block {
+    ($($tt:tt)*) => {
+        $crate::fragment::Fragment::Block(quote!($($tt)*))
+    }
+}
+
+/// Interpolate a fragment in place of an expression. This involves surrounding
+/// Block fragments in curly braces.
+pub struct Expr(pub Fragment);
+impl ToTokens for Expr {
+    fn to_tokens(&self, out: &mut Tokens) {
+        match self.0 {
+            Fragment::Expr(ref expr) => expr.to_tokens(out),
+            Fragment::Block(ref block) => {
+                out.append("{");
+                block.to_tokens(out);
+                out.append("}");
+            }
+        }
+    }
+}
+
+/// Interpolate a fragment as the statements of a block.
+pub struct Stmts(pub Fragment);
+impl ToTokens for Stmts {
+    fn to_tokens(&self, out: &mut Tokens) {
+        match self.0 {
+            Fragment::Expr(ref expr) => expr.to_tokens(out),
+            Fragment::Block(ref block) => block.to_tokens(out),
+        }
+    }
+}
+
+/// Interpolate a fragment as the value part of a `match` expression. This
+/// involves putting a comma after expressions and curly braces around blocks.
+pub struct Match(pub Fragment);
+impl ToTokens for Match {
+    fn to_tokens(&self, out: &mut Tokens) {
+        match self.0 {
+            Fragment::Expr(ref expr) => {
+                expr.to_tokens(out);
+                out.append(",");
+            }
+            Fragment::Block(ref block) => {
+                out.append("{");
+                block.to_tokens(out);
+                out.append("}");
+            }
+        }
+    }
+}

serde_derive/src/lib.rs

@@ -0,0 +1,40 @@
+#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "cargo-clippy", allow(used_underscore_binding))]
+
+// The `quote!` macro requires deep recursion.
+#![recursion_limit = "192"]
+
+extern crate syn;
+#[macro_use]
+extern crate quote;
+
+extern crate serde_codegen_internals as internals;
+
+extern crate proc_macro;
+use proc_macro::TokenStream;
+
+#[macro_use]
+mod bound;
+#[macro_use]
+mod fragment;
+
+mod ser;
+mod de;
+
+#[proc_macro_derive(Serialize, attributes(serde))]
+pub fn derive_serialize(input: TokenStream) -> TokenStream {
+    let input = syn::parse_derive_input(&input.to_string()).unwrap();
+    match ser::expand_derive_serialize(&input) {
+        Ok(expanded) => expanded.parse().unwrap(),
+        Err(msg) => panic!(msg),
+    }
+}
+
+#[proc_macro_derive(Deserialize, attributes(serde))]
+pub fn derive_deserialize(input: TokenStream) -> TokenStream {
+    let input = syn::parse_derive_input(&input.to_string()).unwrap();
+    match de::expand_derive_deserialize(&input) {
+        Ok(expanded) => expanded.parse().unwrap(),
+        Err(msg) => panic!(msg),
+    }
+}

serde_derive/src/ser.rs

@@ -0,0 +1,792 @@
+use syn::{self, Ident};
+use quote::Tokens;
+
+use bound;
+use fragment::{Fragment, Stmts, Match};
+use internals::ast::{Body, Field, Item, Style, Variant};
+use internals::{self, attr};
+
+pub fn expand_derive_serialize(item: &syn::DeriveInput) -> Result<Tokens, String> {
+    let ctxt = internals::Ctxt::new();
+    let item = Item::from_ast(&ctxt, item);
+    try!(ctxt.check());
+
+    let ident = &item.ident;
+    let generics = build_generics(&item);
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+    let dummy_const = Ident::new(format!("_IMPL_SERIALIZE_FOR_{}", ident));
+    let body = Stmts(serialize_body(&item, &generics));
+
+    Ok(quote! {
+        #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
+        const #dummy_const: () = {
+            extern crate serde as _serde;
+            #[automatically_derived]
+            impl #impl_generics _serde::Serialize for #ident #ty_generics #where_clause {
+                fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error>
+                    where __S: _serde::Serializer
+                {
+                    #body
+                }
+            }
+        };
+    })
+}
+
+// All the generics in the input, plus a bound `T: Serialize` for each generic
+// field type that will be serialized by us.
+fn build_generics(item: &Item) -> syn::Generics {
+    let generics = bound::without_defaults(item.generics);
+
+    let generics =
+        bound::with_where_predicates_from_fields(item, &generics, attr::Field::ser_bound);
+
+    match item.attrs.ser_bound() {
+        Some(predicates) => bound::with_where_predicates(&generics, predicates),
+        None => {
+            bound::with_bound(item,
+                              &generics,
+                              needs_serialize_bound,
+                              &path!(_serde::Serialize))
+        }
+    }
+}
+
+// Fields with a `skip_serializing` or `serialize_with` attribute are not
+// serialized by us so we do not generate a bound. Fields with a `bound`
+// attribute specify their own bound so we do not generate one. All other fields
+// may need a `T: Serialize` bound where T is the type of the field.
+fn needs_serialize_bound(attrs: &attr::Field) -> bool {
+    !attrs.skip_serializing() && attrs.serialize_with().is_none() && attrs.ser_bound().is_none()
+}
+
+fn serialize_body(item: &Item, generics: &syn::Generics) -> Fragment {
+    if let Some(into_type) = item.attrs.into_type() {
+        serialize_into(into_type)
+    } else {
+        match item.body {
+            Body::Enum(ref variants) => {
+                serialize_item_enum(&item.ident, generics, variants, &item.attrs)
+            }
+            Body::Struct(Style::Struct, ref fields) => {
+                if fields.iter().any(|field| field.ident.is_none()) {
+                    panic!("struct has unnamed fields");
+                }
+                serialize_struct(&item.ident, generics, fields, &item.attrs)
+            }
+            Body::Struct(Style::Tuple, ref fields) => {
+                if fields.iter().any(|field| field.ident.is_some()) {
+                    panic!("tuple struct has named fields");
+                }
+                serialize_tuple_struct(&item.ident, generics, fields, &item.attrs)
+            }
+            Body::Struct(Style::Newtype, ref fields) => {
+                serialize_newtype_struct(&item.ident, generics, &fields[0], &item.attrs)
+            }
+            Body::Struct(Style::Unit, _) => serialize_unit_struct(&item.attrs),
+        }
+    }
+}
+
+fn serialize_into(into_type: &syn::Ty) -> Fragment {
+    quote_block! {
+        _serde::Serialize::serialize(
+            &<Self as _serde::export::Into<#into_type>>::into(_serde::export::Clone::clone(self)),
+            __serializer)
+    }
+}
+
+fn serialize_unit_struct(item_attrs: &attr::Item) -> Fragment {
+    let type_name = item_attrs.name().serialize_name();
+
+    quote_expr! {
+        _serde::Serializer::serialize_unit_struct(__serializer, #type_name)
+    }
+}
+
+fn serialize_newtype_struct(ident: &syn::Ident,
+                            generics: &syn::Generics,
+                            field: &Field,
+                            item_attrs: &attr::Item)
+                            -> Fragment {
+    let type_name = item_attrs.name().serialize_name();
+
+    let mut field_expr = quote!(&self.0);
+    if let Some(path) = field.attrs.serialize_with() {
+        field_expr = wrap_serialize_with(ident, generics, field.ty, path, field_expr);
+    }
+
+    quote_expr! {
+        _serde::Serializer::serialize_newtype_struct(__serializer, #type_name, #field_expr)
+    }
+}
+
+fn serialize_tuple_struct(ident: &syn::Ident,
+                          generics: &syn::Generics,
+                          fields: &[Field],
+                          item_attrs: &attr::Item)
+                          -> Fragment {
+    let serialize_stmts =
+        serialize_tuple_struct_visitor(ident,
+                                       fields,
+                                       generics,
+                                       false,
+                                       quote!(_serde::ser::SerializeTupleStruct::serialize_field));
+
+    let type_name = item_attrs.name().serialize_name();
+    let len = serialize_stmts.len();
+    let let_mut = mut_if(len > 0);
+
+    quote_block! {
+        let #let_mut __serde_state = try!(_serde::Serializer::serialize_tuple_struct(__serializer, #type_name, #len));
+        #(#serialize_stmts)*
+        _serde::ser::SerializeTupleStruct::end(__serde_state)
+    }
+}
+
+fn serialize_struct(ident: &syn::Ident,
+                    generics: &syn::Generics,
+                    fields: &[Field],
+                    item_attrs: &attr::Item)
+                    -> Fragment {
+    let serialize_fields =
+        serialize_struct_visitor(ident,
+                                 fields,
+                                 generics,
+                                 false,
+                                 quote!(_serde::ser::SerializeStruct::serialize_field));
+
+    let type_name = item_attrs.name().serialize_name();
+
+    let mut serialized_fields = fields.iter()
+        .filter(|&field| !field.attrs.skip_serializing())
+        .peekable();
+
+    let let_mut = mut_if(serialized_fields.peek().is_some());
+
+    let len = serialized_fields.map(|field| {
+            let ident = field.ident.clone().expect("struct has unnamed fields");
+            let field_expr = quote!(&self.#ident);
+
+            match field.attrs.skip_serializing_if() {
+                Some(path) => quote!(if #path(#field_expr) { 0 } else { 1 }),
+                None => quote!(1),
+            }
+        })
+        .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
+
+    quote_block! {
+        let #let_mut __serde_state = try!(_serde::Serializer::serialize_struct(__serializer, #type_name, #len));
+        #(#serialize_fields)*
+        _serde::ser::SerializeStruct::end(__serde_state)
+    }
+}
+
+fn serialize_item_enum(ident: &syn::Ident,
+                       generics: &syn::Generics,
+                       variants: &[Variant],
+                       item_attrs: &attr::Item)
+                       -> Fragment {
+    let arms: Vec<_> = variants.iter()
+        .enumerate()
+        .map(|(variant_index, variant)| {
+            serialize_variant(ident,
+                              generics,
+                              variant,
+                              variant_index,
+                              item_attrs)
+        })
+        .collect();
+
+    quote_expr! {
+        match *self {
+            #(#arms)*
+        }
+    }
+}
+
+fn serialize_variant(ident: &syn::Ident,
+                     generics: &syn::Generics,
+                     variant: &Variant,
+                     variant_index: usize,
+                     item_attrs: &attr::Item)
+                     -> Tokens {
+    let variant_ident = variant.ident.clone();
+
+    if variant.attrs.skip_serializing() {
+        let skipped_msg = format!("the enum variant {}::{} cannot be serialized",
+                                  ident, variant_ident);
+        let skipped_err = quote! {
+            _serde::export::Err(_serde::ser::Error::custom(#skipped_msg))
+        };
+        let fields_pat = match variant.style {
+            Style::Unit => quote!(),
+            Style::Newtype | Style::Tuple => quote!( (..) ),
+            Style::Struct => quote!( {..} ),
+        };
+        quote! {
+            #ident::#variant_ident #fields_pat => #skipped_err,
+        }
+    } else {
+        // variant wasn't skipped
+        let case = match variant.style {
+            Style::Unit => {
+                quote! {
+                    #ident::#variant_ident
+                }
+            }
+            Style::Newtype => {
+                quote! {
+                    #ident::#variant_ident(ref __field0)
+                }
+            }
+            Style::Tuple => {
+                let field_names = (0..variant.fields.len())
+                    .map(|i| Ident::new(format!("__field{}", i)));
+                quote! {
+                    #ident::#variant_ident(#(ref #field_names),*)
+                }
+            }
+            Style::Struct => {
+                let fields = variant.fields
+                    .iter()
+                    .map(|f| f.ident.clone().expect("struct variant has unnamed fields"));
+                quote! {
+                    #ident::#variant_ident { #(ref #fields),* }
+                }
+            }
+        };
+
+        let body = Match(match *item_attrs.tag() {
+            attr::EnumTag::External => {
+                serialize_externally_tagged_variant(ident,
+                                                    generics,
+                                                    variant,
+                                                    variant_index,
+                                                    item_attrs)
+            }
+            attr::EnumTag::Internal { ref tag } => {
+                serialize_internally_tagged_variant(ident,
+                                                    generics,
+                                                    variant,
+                                                    item_attrs,
+                                                    tag)
+            }
+            attr::EnumTag::Adjacent { ref tag, ref content } => {
+                serialize_adjacently_tagged_variant(ident,
+                                                    generics,
+                                                    variant,
+                                                    item_attrs,
+                                                    tag,
+                                                    content)
+            }
+            attr::EnumTag::None => serialize_untagged_variant(ident, generics, variant, item_attrs),
+        });
+
+        quote! {
+            #case => #body
+        }
+    }
+}
+
+fn serialize_externally_tagged_variant(ident: &syn::Ident,
+                                       generics: &syn::Generics,
+                                       variant: &Variant,
+                                       variant_index: usize,
+                                       item_attrs: &attr::Item)
+                                       -> Fragment {
+    let type_name = item_attrs.name().serialize_name();
+    let variant_name = variant.attrs.name().serialize_name();
+
+    match variant.style {
+        Style::Unit => {
+            quote_expr! {
+                _serde::Serializer::serialize_unit_variant(
+                    __serializer,
+                    #type_name,
+                    #variant_index,
+                    #variant_name,
+                )
+            }
+        }
+        Style::Newtype => {
+            let field = &variant.fields[0];
+            let mut field_expr = quote!(__field0);
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr = wrap_serialize_with(ident, generics, field.ty, path, field_expr);
+            }
+
+            quote_expr! {
+                _serde::Serializer::serialize_newtype_variant(
+                    __serializer,
+                    #type_name,
+                    #variant_index,
+                    #variant_name,
+                    #field_expr,
+                )
+            }
+        }
+        Style::Tuple => {
+            serialize_tuple_variant(TupleVariant::ExternallyTagged {
+                                        type_name: type_name,
+                                        variant_index: variant_index,
+                                        variant_name: variant_name,
+                                    },
+                                    ident,
+                                    generics,
+                                    &variant.fields)
+        }
+        Style::Struct => {
+            serialize_struct_variant(StructVariant::ExternallyTagged {
+                                         variant_index: variant_index,
+                                         variant_name: variant_name,
+                                     },
+                                     ident,
+                                     generics,
+                                     &variant.fields,
+                                     &type_name)
+        }
+    }
+}
+
+fn serialize_internally_tagged_variant(ident: &syn::Ident,
+                                       generics: &syn::Generics,
+                                       variant: &Variant,
+                                       item_attrs: &attr::Item,
+                                       tag: &str)
+                                       -> Fragment {
+    let type_name = item_attrs.name().serialize_name();
+    let variant_name = variant.attrs.name().serialize_name();
+
+    let enum_ident_str = ident.as_ref();
+    let variant_ident_str = variant.ident.as_ref();
+
+    match variant.style {
+        Style::Unit => {
+            quote_block! {
+                let mut __struct = try!(_serde::Serializer::serialize_struct(
+                    __serializer, #type_name, 1));
+                try!(_serde::ser::SerializeStruct::serialize_field(
+                    &mut __struct, #tag, #variant_name));
+                _serde::ser::SerializeStruct::end(__struct)
+            }
+        }
+        Style::Newtype => {
+            let field = &variant.fields[0];
+            let mut field_expr = quote!(__field0);
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr = wrap_serialize_with(ident, generics, field.ty, path, field_expr);
+            }
+
+            quote_expr! {
+                _serde::ser::private::serialize_tagged_newtype(
+                    __serializer,
+                    #enum_ident_str,
+                    #variant_ident_str,
+                    #tag,
+                    #variant_name,
+                    #field_expr,
+                )
+            }
+        }
+        Style::Struct => {
+            serialize_struct_variant(StructVariant::InternallyTagged {
+                                         tag: tag,
+                                         variant_name: variant_name,
+                                     },
+                                     ident,
+                                     generics,
+                                     &variant.fields,
+                                     &type_name)
+        }
+        Style::Tuple => unreachable!("checked in serde_codegen_internals"),
+    }
+}
+
+fn serialize_adjacently_tagged_variant(ident: &syn::Ident,
+                                       generics: &syn::Generics,
+                                       variant: &Variant,
+                                       item_attrs: &attr::Item,
+                                       tag: &str,
+                                       content: &str)
+                                       -> Fragment {
+    let type_name = item_attrs.name().serialize_name();
+    let variant_name = variant.attrs.name().serialize_name();
+
+    let inner = Stmts(match variant.style {
+        Style::Unit => {
+            return quote_block! {
+                let mut __struct = try!(_serde::Serializer::serialize_struct(
+                    __serializer, #type_name, 1));
+                try!(_serde::ser::SerializeStruct::serialize_field(
+                    &mut __struct, #tag, #variant_name));
+                _serde::ser::SerializeStruct::end(__struct)
+            };
+        }
+        Style::Newtype => {
+            let field = &variant.fields[0];
+            let mut field_expr = quote!(__field0);
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr = wrap_serialize_with(ident, generics, field.ty, path, field_expr);
+            }
+
+            quote_expr! {
+                _serde::Serialize::serialize(#field_expr, __serializer)
+            }
+        }
+        Style::Tuple => {
+            serialize_tuple_variant(TupleVariant::Untagged,
+                                    ident,
+                                    generics,
+                                    &variant.fields)
+        }
+        Style::Struct => {
+            serialize_struct_variant(StructVariant::Untagged,
+                                     ident,
+                                     generics,
+                                     &variant.fields,
+                                     &variant_name)
+        }
+    });
+
+    let fields_ty = variant.fields.iter().map(|f| &f.ty);
+    let ref fields_ident: Vec<_> = match variant.style {
+        Style::Unit => unreachable!(),
+        Style::Newtype => vec![Ident::new("__field0")],
+        Style::Tuple => {
+            (0..variant.fields.len())
+                .map(|i| Ident::new(format!("__field{}", i)))
+                .collect()
+        }
+        Style::Struct => {
+            variant.fields
+                .iter()
+                .map(|f| f.ident.clone().expect("struct variant has unnamed fields"))
+                .collect()
+        }
+    };
+
+    let (_, ty_generics, where_clause) = generics.split_for_impl();
+
+    let wrapper_generics = bound::with_lifetime_bound(generics, "'__a");
+    let (wrapper_impl_generics, wrapper_ty_generics, _) = wrapper_generics.split_for_impl();
+
+    quote_block! {
+        struct __AdjacentlyTagged #wrapper_generics #where_clause {
+            data: (#(&'__a #fields_ty,)*),
+            phantom: _serde::export::PhantomData<#ident #ty_generics>,
+        }
+
+        impl #wrapper_impl_generics _serde::Serialize for __AdjacentlyTagged #wrapper_ty_generics #where_clause {
+            fn serialize<__S>(&self, __serializer: __S) -> _serde::export::Result<__S::Ok, __S::Error>
+                where __S: _serde::Serializer
+            {
+                let (#(#fields_ident,)*) = self.data;
+                #inner
+            }
+        }
+
+        let mut __struct = try!(_serde::Serializer::serialize_struct(
+            __serializer, #type_name, 2));
+        try!(_serde::ser::SerializeStruct::serialize_field(
+            &mut __struct, #tag, #variant_name));
+        try!(_serde::ser::SerializeStruct::serialize_field(
+            &mut __struct, #content, &__AdjacentlyTagged {
+                data: (#(#fields_ident,)*),
+                phantom: _serde::export::PhantomData::<#ident #ty_generics>,
+            }));
+        _serde::ser::SerializeStruct::end(__struct)
+    }
+}
+
+fn serialize_untagged_variant(ident: &syn::Ident,
+                              generics: &syn::Generics,
+                              variant: &Variant,
+                              item_attrs: &attr::Item)
+                              -> Fragment {
+    match variant.style {
+        Style::Unit => {
+            quote_expr! {
+                _serde::Serializer::serialize_unit(__serializer)
+            }
+        }
+        Style::Newtype => {
+            let field = &variant.fields[0];
+            let mut field_expr = quote!(__field0);
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr = wrap_serialize_with(ident, generics, field.ty, path, field_expr);
+            }
+
+            quote_expr! {
+                _serde::Serialize::serialize(#field_expr, __serializer)
+            }
+        }
+        Style::Tuple => {
+            serialize_tuple_variant(TupleVariant::Untagged, ident, generics, &variant.fields)
+        }
+        Style::Struct => {
+            let type_name = item_attrs.name().serialize_name();
+            serialize_struct_variant(StructVariant::Untagged,
+                                     ident,
+                                     generics,
+                                     &variant.fields,
+                                     &type_name)
+        }
+    }
+}
+
+enum TupleVariant {
+    ExternallyTagged {
+        type_name: String,
+        variant_index: usize,
+        variant_name: String,
+    },
+    Untagged,
+}
+
+fn serialize_tuple_variant(context: TupleVariant,
+                           ident: &syn::Ident,
+                           generics: &syn::Generics,
+                           fields: &[Field])
+                           -> Fragment {
+    let method = match context {
+        TupleVariant::ExternallyTagged { .. } => {
+            quote!(_serde::ser::SerializeTupleVariant::serialize_field)
+        }
+        TupleVariant::Untagged => quote!(_serde::ser::SerializeTuple::serialize_element),
+    };
+
+    let serialize_stmts =
+        serialize_tuple_struct_visitor(ident, fields, generics, true, method);
+
+    let len = serialize_stmts.len();
+    let let_mut = mut_if(len > 0);
+
+    match context {
+        TupleVariant::ExternallyTagged { type_name, variant_index, variant_name } => {
+            quote_block! {
+                let #let_mut __serde_state = try!(_serde::Serializer::serialize_tuple_variant(
+                    __serializer,
+                    #type_name,
+                    #variant_index,
+                    #variant_name,
+                    #len));
+                #(#serialize_stmts)*
+                _serde::ser::SerializeTupleVariant::end(__serde_state)
+            }
+        }
+        TupleVariant::Untagged => {
+            quote_block! {
+                let #let_mut __serde_state = try!(_serde::Serializer::serialize_tuple(
+                    __serializer,
+                    #len));
+                #(#serialize_stmts)*
+                _serde::ser::SerializeTuple::end(__serde_state)
+            }
+        }
+    }
+}
+
+enum StructVariant<'a> {
+    ExternallyTagged {
+        variant_index: usize,
+        variant_name: String,
+    },
+    InternallyTagged { tag: &'a str, variant_name: String },
+    Untagged,
+}
+
+fn serialize_struct_variant<'a>(context: StructVariant<'a>,
+                                ident: &syn::Ident,
+                                generics: &syn::Generics,
+                                fields: &[Field],
+                                name: &str)
+                                -> Fragment {
+    let method = match context {
+        StructVariant::ExternallyTagged { .. } => {
+            quote!(_serde::ser::SerializeStructVariant::serialize_field)
+        }
+        StructVariant::InternallyTagged { .. } |
+        StructVariant::Untagged => quote!(_serde::ser::SerializeStruct::serialize_field),
+    };
+
+    let serialize_fields = serialize_struct_visitor(ident, fields, generics, true, method);
+
+    let mut serialized_fields = fields.iter()
+        .filter(|&field| !field.attrs.skip_serializing())
+        .peekable();
+
+    let let_mut = mut_if(serialized_fields.peek().is_some());
+
+    let len = serialized_fields.map(|field| {
+            let ident = field.ident.clone().expect("struct has unnamed fields");
+
+            match field.attrs.skip_serializing_if() {
+                Some(path) => quote!(if #path(#ident) { 0 } else { 1 }),
+                None => quote!(1),
+            }
+        })
+        .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
+
+    match context {
+        StructVariant::ExternallyTagged { variant_index, variant_name } => {
+            quote_block! {
+                let #let_mut __serde_state = try!(_serde::Serializer::serialize_struct_variant(
+                    __serializer,
+                    #name,
+                    #variant_index,
+                    #variant_name,
+                    #len,
+                ));
+                #(#serialize_fields)*
+                _serde::ser::SerializeStructVariant::end(__serde_state)
+            }
+        }
+        StructVariant::InternallyTagged { tag, variant_name } => {
+            quote_block! {
+                let mut __serde_state = try!(_serde::Serializer::serialize_struct(
+                    __serializer,
+                    #name,
+                    #len + 1,
+                ));
+                try!(_serde::ser::SerializeStruct::serialize_field(
+                    &mut __serde_state,
+                    #tag,
+                    #variant_name,
+                ));
+                #(#serialize_fields)*
+                _serde::ser::SerializeStruct::end(__serde_state)
+            }
+        }
+        StructVariant::Untagged => {
+            quote_block! {
+                let #let_mut __serde_state = try!(_serde::Serializer::serialize_struct(
+                    __serializer,
+                    #name,
+                    #len,
+                ));
+                #(#serialize_fields)*
+                _serde::ser::SerializeStruct::end(__serde_state)
+            }
+        }
+    }
+}
+
+fn serialize_tuple_struct_visitor(ident: &syn::Ident,
+                                  fields: &[Field],
+                                  generics: &syn::Generics,
+                                  is_enum: bool,
+                                  func: Tokens)
+                                  -> Vec<Tokens> {
+    fields.iter()
+        .enumerate()
+        .map(|(i, field)| {
+            let mut field_expr = if is_enum {
+                let id = Ident::new(format!("__field{}", i));
+                quote!(#id)
+            } else {
+                let i = Ident::new(i);
+                quote!(&self.#i)
+            };
+
+            let skip = field.attrs
+                .skip_serializing_if()
+                .map(|path| quote!(#path(#field_expr)));
+
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr =
+                    wrap_serialize_with(ident, generics, field.ty, path, field_expr);
+            }
+
+            let ser = quote! {
+                try!(#func(&mut __serde_state, #field_expr));
+            };
+
+            match skip {
+                None => ser,
+                Some(skip) => quote!(if !#skip { #ser }),
+            }
+        })
+        .collect()
+}
+
+fn serialize_struct_visitor(ident: &syn::Ident,
+                            fields: &[Field],
+                            generics: &syn::Generics,
+                            is_enum: bool,
+                            func: Tokens)
+                            -> Vec<Tokens> {
+    fields.iter()
+        .filter(|&field| !field.attrs.skip_serializing())
+        .map(|field| {
+            let field_ident = field.ident.clone().expect("struct has unnamed field");
+            let mut field_expr = if is_enum {
+                quote!(#field_ident)
+            } else {
+                quote!(&self.#field_ident)
+            };
+
+            let key_expr = field.attrs.name().serialize_name();
+
+            let skip = field.attrs
+                .skip_serializing_if()
+                .map(|path| quote!(#path(#field_expr)));
+
+            if let Some(path) = field.attrs.serialize_with() {
+                field_expr =
+                    wrap_serialize_with(ident, generics, field.ty, path, field_expr)
+            }
+
+            let ser = quote! {
+                try!(#func(&mut __serde_state, #key_expr, #field_expr));
+            };
+
+            match skip {
+                None => ser,
+                Some(skip) => quote!(if !#skip { #ser }),
+            }
+        })
+        .collect()
+}
+
+fn wrap_serialize_with(ident: &syn::Ident,
+                       generics: &syn::Generics,
+                       field_ty: &syn::Ty,
+                       serialize_with: &syn::Path,
+                       value: Tokens)
+                       -> Tokens {
+    let (_, ty_generics, where_clause) = generics.split_for_impl();
+
+    let wrapper_generics = bound::with_lifetime_bound(generics, "'__a");
+    let (wrapper_impl_generics, wrapper_ty_generics, _) = wrapper_generics.split_for_impl();
+
+    quote!({
+        struct __SerializeWith #wrapper_impl_generics #where_clause {
+            value: &'__a #field_ty,
+            phantom: _serde::export::PhantomData<#ident #ty_generics>,
+        }
+
+        impl #wrapper_impl_generics _serde::Serialize for __SerializeWith #wrapper_ty_generics #where_clause {
+            fn serialize<__S>(&self, __s: __S) -> _serde::export::Result<__S::Ok, __S::Error>
+                where __S: _serde::Serializer
+            {
+                #serialize_with(self.value, __s)
+            }
+        }
+
+        &__SerializeWith {
+            value: #value,
+            phantom: _serde::export::PhantomData::<#ident #ty_generics>,
+        }
+    })
+}
+
+// Serialization of an empty struct results in code like:
+//
+//     let mut __serde_state = try!(serializer.serialize_struct("S", 0));
+//     _serde::ser::SerializeStruct::end(__serde_state)
+//
+// where we want to omit the `mut` to avoid a warning.
+fn mut_if(is_mut: bool) -> Option<Tokens> {
+    if is_mut { Some(quote!(mut)) } else { None }
+}

serde_macros/.gitignore

@@ -1,2 +0,0 @@
-/target
-/Cargo.lock

serde_macros/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "serde_macros"
-version = "0.2.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-license = "MIT/Apache-2.0"
-description = "A quasi-quoting macro system"
-repository = "https://github.com/erickt/rust-quasi"
-
-[lib]
-name = "serde_macros"
-plugin = true
-
-[dependencies]
-quasi = "0.1.3"
-quasi_macros = "0.1.3"
-aster = "0.1.3"

serde_test/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "serde_test"
+version = "0.9.13"
+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/"
+keywords = ["serde", "serialization"]
+readme = "../README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[dependencies]
+serde = { version = "0.9", path = "../serde" }
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }

serde_test/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

serde_test/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

serde_test/README.md

@@ -0,0 +1 @@
+../README.md

serde_test/src/assert.rs

@@ -0,0 +1,57 @@
+use serde::{Serialize, Deserialize};
+
+use de::Deserializer;
+use error::Error;
+use ser::Serializer;
+use token::Token;
+
+use std::fmt::Debug;
+
+/// Runs both `assert_ser_tokens` and `assert_de_tokens`.
+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);
+}
+
+/// Asserts that `value` serializes to the given `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);
+}
+
+/// Asserts that `value` serializes to the given `tokens`, and then yields `error`.
+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);
+}
+
+/// Asserts that the given `tokens` deserialize into `value`.
+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);
+}
+
+/// Asserts that the given `tokens` yield `error` when deserializing.
+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,623 @@
+use std::iter;
+
+use serde::de::{self, Deserialize, DeserializeSeed, EnumVisitor, MapVisitor, SeqVisitor,
+                VariantVisitor, Visitor};
+use serde::de::value::{ValueDeserializer, MapVisitorDeserializer, SeqVisitorDeserializer};
+
+use error::Error;
+use token::Token;
+
+/// A `Deserializer` that reads from a list of tokens.
+pub struct Deserializer<I>
+    where I: Iterator<Item = Token<'static>>
+{
+    tokens: iter::Peekable<I>,
+}
+
+impl<I> Deserializer<I>
+    where I: Iterator<Item = Token<'static>>
+{
+    /// Creates the deserializer.
+    pub fn new(tokens: I) -> Deserializer<I> {
+        Deserializer { tokens: tokens.peekable() }
+    }
+
+    /// Pulls the next token off of the deserializer, ignoring it.
+    pub fn next_token(&mut self) -> Option<Token<'static>> {
+        self.tokens.next()
+    }
+
+    /// Pulls the next token off of the deserializer and checks if it matches an expected token.
+    pub fn expect_token(&mut self, expected: Token) -> Result<(), Error> {
+        match self.tokens.next() {
+            Some(token) => {
+                if expected == token {
+                    Ok(())
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn visit_seq<V>(&mut self,
+                    len: Option<usize>,
+                    sep: Token<'static>,
+                    end: Token<'static>,
+                    visitor: V)
+                    -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        let value = try!(visitor.visit_seq(DeserializerSeqVisitor {
+            de: self,
+            len: len,
+            sep: sep,
+            end: end.clone(),
+        }));
+        try!(self.expect_token(end));
+        Ok(value)
+    }
+
+    fn visit_map<V>(&mut self,
+                    len: Option<usize>,
+                    sep: Token<'static>,
+                    end: Token<'static>,
+                    visitor: V)
+                    -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        let value = try!(visitor.visit_map(DeserializerMapVisitor {
+            de: self,
+            len: len,
+            sep: sep,
+            end: end.clone(),
+        }));
+        try!(self.expect_token(end));
+        Ok(value)
+    }
+}
+
+impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
+    where I: Iterator<Item = Token<'static>>
+{
+    type Error = Error;
+
+    forward_to_deserialize! {
+        bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit
+        seq bytes byte_buf map struct_field ignored_any
+    }
+
+    fn deserialize<V>(self, visitor: V) -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        match self.tokens.next() {
+            Some(Token::Bool(v)) => visitor.visit_bool(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::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::ByteBuf(v)) => visitor.visit_byte_buf(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(),
+            Some(Token::SeqStart(len)) => {
+                self.visit_seq(len, Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(Token::SeqArrayStart(len)) => {
+                self.visit_seq(Some(len), Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(Token::TupleStart(len)) => {
+                self.visit_seq(Some(len), Token::TupleSep, Token::TupleEnd, visitor)
+            }
+            Some(Token::TupleStructStart(_, len)) => {
+                self.visit_seq(Some(len),
+                               Token::TupleStructSep,
+                               Token::TupleStructEnd,
+                               visitor)
+            }
+            Some(Token::MapStart(len)) => {
+                self.visit_map(len, Token::MapSep, Token::MapEnd, visitor)
+            }
+            Some(Token::StructStart(_, len)) => {
+                self.visit_map(Some(len), Token::StructSep, Token::StructEnd, visitor)
+            }
+            Some(Token::EnumUnit(_, variant)) => visitor.visit_str(variant),
+            Some(Token::EnumStart(variant)) |
+            Some(Token::EnumNewType(_, variant)) |
+            Some(Token::EnumSeqStart(_, variant, _)) |
+            Some(Token::EnumMapStart(_, variant, _)) => {
+                visitor.visit_map(EnumMapVisitor::new(self, variant))
+            }
+            Some(token) => Err(Error::UnexpectedToken(token)),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    /// Hook into `Option` deserializing so we can treat `Unit` as a
+    /// `None`, or a regular value as `Some(value)`.
+    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        match self.tokens.peek() {
+            Some(&Token::Unit) |
+            Some(&Token::Option(false)) => {
+                self.tokens.next();
+                visitor.visit_none()
+            }
+            Some(&Token::Option(true)) => {
+                self.tokens.next();
+                visitor.visit_some(self)
+            }
+            Some(_) => visitor.visit_some(self),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn deserialize_enum<V>(self,
+                           name: &str,
+                           _variants: &'static [&'static str],
+                           visitor: V)
+                           -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        match self.tokens.peek() {
+            Some(&Token::EnumStart(n)) if name == n => {
+                self.tokens.next();
+
+                visitor.visit_enum(DeserializerEnumVisitor { de: self })
+            }
+            Some(&Token::EnumUnit(n, _)) |
+            Some(&Token::EnumNewType(n, _)) |
+            Some(&Token::EnumSeqStart(n, _, _)) |
+            Some(&Token::EnumMapStart(n, _, _)) if name == n => {
+                visitor.visit_enum(DeserializerEnumVisitor { de: self })
+            }
+            Some(_) => {
+                let token = self.tokens.next().unwrap();
+                Err(Error::UnexpectedToken(token))
+            }
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn deserialize_unit_struct<V>(self, name: &str, 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::EndOfTokens),
+        }
+    }
+
+    fn deserialize_newtype_struct<V>(self, name: &str, 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::EndOfTokens),
+        }
+    }
+
+    fn deserialize_seq_fixed_size<V>(self, len: usize, visitor: V) -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        match self.tokens.peek() {
+            Some(&Token::SeqArrayStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn deserialize_tuple<V>(self, len: usize, visitor: V) -> Result<V::Value, Error>
+        where V: Visitor
+    {
+        match self.tokens.peek() {
+            Some(&Token::Unit) |
+            Some(&Token::UnitStruct(_)) => {
+                self.tokens.next();
+                visitor.visit_unit()
+            }
+            Some(&Token::SeqStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(&Token::SeqArrayStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(&Token::TupleStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), Token::TupleSep, Token::TupleEnd, visitor)
+            }
+            Some(&Token::TupleStructStart(_, _)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len),
+                               Token::TupleStructSep,
+                               Token::TupleStructEnd,
+                               visitor)
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn deserialize_tuple_struct<V>(self,
+                                   name: &str,
+                                   len: usize,
+                                   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), Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(&Token::SeqArrayStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), Token::SeqSep, Token::SeqEnd, visitor)
+            }
+            Some(&Token::TupleStart(_)) => {
+                self.tokens.next();
+                self.visit_seq(Some(len), Token::TupleSep, Token::TupleEnd, visitor)
+            }
+            Some(&Token::TupleStructStart(n, _)) => {
+                self.tokens.next();
+                if name == n {
+                    self.visit_seq(Some(len),
+                                   Token::TupleStructSep,
+                                   Token::TupleStructEnd,
+                                   visitor)
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn deserialize_struct<V>(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_map(Some(fields.len()),
+                                   Token::StructSep,
+                                   Token::StructEnd,
+                                   visitor)
+                } else {
+                    Err(Error::InvalidName(n))
+                }
+            }
+            Some(&Token::MapStart(_)) => {
+                self.tokens.next();
+                self.visit_map(Some(fields.len()), Token::MapSep, Token::MapEnd, visitor)
+            }
+            Some(_) => self.deserialize(visitor),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerSeqVisitor<'a, I: 'a>
+    where I: Iterator<Item = Token<'static>>
+{
+    de: &'a mut Deserializer<I>,
+    len: Option<usize>,
+    sep: Token<'static>,
+    end: Token<'static>,
+}
+
+impl<'a, I> SeqVisitor for DeserializerSeqVisitor<'a, I>
+    where I: Iterator<Item = Token<'static>>
+{
+    type Error = Error;
+
+    fn visit_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Error>
+        where T: DeserializeSeed
+    {
+        if self.de.tokens.peek() == Some(&self.end) {
+            return Ok(None);
+        }
+        match self.de.tokens.next() {
+            Some(ref token) if *token == self.sep => {
+                self.len = self.len.map(|len| len.saturating_sub(1));
+                seed.deserialize(&mut *self.de).map(Some)
+            }
+            Some(other) => Err(Error::UnexpectedToken(other)),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    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>,
+    sep: Token<'static>,
+    end: Token<'static>,
+}
+
+impl<'a, I> MapVisitor for DeserializerMapVisitor<'a, I>
+    where I: Iterator<Item = Token<'static>>
+{
+    type Error = Error;
+
+    fn visit_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, Error>
+        where K: DeserializeSeed
+    {
+        if self.de.tokens.peek() == Some(&self.end) {
+            return Ok(None);
+        }
+        match self.de.tokens.next() {
+            Some(ref token) if *token == self.sep => {
+                self.len = self.len.map(|len| len.saturating_sub(1));
+                seed.deserialize(&mut *self.de).map(Some)
+            }
+            Some(other) => Err(Error::UnexpectedToken(other)),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn visit_value_seed<V>(&mut self, seed: V) -> Result<V::Value, Error>
+        where V: DeserializeSeed
+    {
+        seed.deserialize(&mut *self.de)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len.unwrap_or(0);
+        (len, self.len)
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct DeserializerEnumVisitor<'a, I: 'a>
+    where I: Iterator<Item = Token<'static>>
+{
+    de: &'a mut Deserializer<I>,
+}
+
+impl<'a, I> EnumVisitor for DeserializerEnumVisitor<'a, I>
+    where I: Iterator<Item = Token<'static>>
+{
+    type Error = Error;
+    type Variant = Self;
+
+    fn visit_variant_seed<V>(self, seed: V) -> Result<(V::Value, Self), Error>
+        where V: DeserializeSeed
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumUnit(_, v)) |
+            Some(&Token::EnumNewType(_, v)) |
+            Some(&Token::EnumSeqStart(_, v, _)) |
+            Some(&Token::EnumMapStart(_, v, _)) => {
+                let de = v.into_deserializer();
+                let value = try!(seed.deserialize(de));
+                Ok((value, self))
+            }
+            Some(_) => {
+                let value = try!(seed.deserialize(&mut *self.de));
+                Ok((value, self))
+            }
+            None => Err(Error::EndOfTokens),
+        }
+    }
+}
+
+impl<'a, I> VariantVisitor for DeserializerEnumVisitor<'a, I>
+    where I: Iterator<Item = Token<'static>>
+{
+    type Error = Error;
+
+    fn visit_unit(self) -> Result<(), Error> {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumUnit(_, _)) => {
+                self.de.tokens.next();
+                Ok(())
+            }
+            Some(_) => Deserialize::deserialize(self.de),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn visit_newtype_seed<T>(self, seed: T) -> Result<T::Value, Self::Error>
+        where T: DeserializeSeed
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumNewType(_, _)) => {
+                self.de.tokens.next();
+                seed.deserialize(self.de)
+            }
+            Some(_) => seed.deserialize(self.de),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn visit_tuple<V>(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_seq(Some(len), Token::EnumSeqSep, Token::EnumSeqEnd, 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), Token::SeqSep, Token::SeqEnd, visitor)
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            Some(_) => de::Deserializer::deserialize(self.de, visitor),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+
+    fn visit_struct<V>(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_map(Some(fields.len()),
+                                      Token::EnumMapSep,
+                                      Token::EnumMapEnd,
+                                      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()), Token::MapSep, Token::MapEnd, visitor)
+                } else {
+                    Err(Error::UnexpectedToken(token))
+                }
+            }
+            Some(_) => de::Deserializer::deserialize(self.de, visitor),
+            None => Err(Error::EndOfTokens),
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+struct EnumMapVisitor<'a, I: 'a>
+    where I: Iterator<Item = Token<'static>>
+{
+    de: &'a mut Deserializer<I>,
+    variant: Option<&'a str>,
+}
+
+impl<'a, I: 'a> EnumMapVisitor<'a, I>
+    where I: Iterator<Item = Token<'static>>
+{
+    fn new(de: &'a mut Deserializer<I>, variant: &'a str) -> Self {
+        EnumMapVisitor {
+            de: de,
+            variant: Some(variant),
+        }
+    }
+}
+
+impl<'a, I: 'a> MapVisitor for EnumMapVisitor<'a, I>
+    where I: Iterator<Item = Token<'static>>
+{
+    type Error = Error;
+
+    fn visit_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, Error>
+        where K: DeserializeSeed
+    {
+        match self.variant.take() {
+            Some(variant) => seed.deserialize(variant.into_deserializer()).map(Some),
+            None => Ok(None),
+        }
+    }
+
+    fn visit_value_seed<V>(&mut self, seed: V) -> Result<V::Value, Error>
+        where V: DeserializeSeed
+    {
+        match self.de.tokens.peek() {
+            Some(&Token::EnumSeqSep) => {
+                let value = {
+                    let visitor = DeserializerSeqVisitor {
+                        de: self.de,
+                        len: None,
+                        sep: Token::EnumSeqSep,
+                        end: Token::EnumSeqEnd,
+                    };
+                    try!(seed.deserialize(SeqVisitorDeserializer::new(visitor)))
+                };
+                try!(self.de.expect_token(Token::EnumSeqEnd));
+                Ok(value)
+            }
+            Some(&Token::EnumMapSep) => {
+                let value = {
+                    let visitor = DeserializerMapVisitor {
+                        de: self.de,
+                        len: None,
+                        sep: Token::EnumMapSep,
+                        end: Token::EnumMapEnd,
+                    };
+                    try!(seed.deserialize(MapVisitorDeserializer::new(visitor)))
+                };
+                try!(self.de.expect_token(Token::EnumMapEnd));
+                Ok(value)
+            }
+            _ => seed.deserialize(&mut *self.de),
+        }
+    }
+}

serde_test/src/error.rs

@@ -0,0 +1,56 @@
+use std::error;
+use std::fmt::{self, Display};
+
+use serde::{ser, de};
+
+use token::Token;
+
+/// Error returned by the test `Serializer` and `Deserializer`.
+#[derive(Clone, PartialEq, Debug)]
+pub enum Error {
+    /// A custom error.
+    Message(String),
+
+    /// `Deserialize` was expecting a struct of one name, and another was found.
+    InvalidName(&'static str),
+
+    /// `Serialize` generated a token that didn't match the test.
+    UnexpectedToken(Token<'static>),
+
+    /// The expected token list was too short.
+    EndOfTokens,
+}
+
+impl ser::Error for Error {
+    fn custom<T: Display>(msg: T) -> Error {
+        Error::Message(msg.to_string())
+    }
+}
+
+impl de::Error for Error {
+    fn custom<T: Display>(msg: T) -> Error {
+        Error::Message(msg.to_string())
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Error::Message(ref msg) => formatter.write_str(msg),
+            Error::InvalidName(name) => write!(formatter, "invalid name `{}`", name),
+            Error::UnexpectedToken(_) => formatter.write_str("unexpected token"),
+            Error::EndOfTokens => formatter.write_str("end of tokens"),
+        }
+    }
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        match *self {
+            Error::Message(ref msg) => msg,
+            Error::InvalidName(_) => "invalid name",
+            Error::UnexpectedToken(_) => "unexpected token",
+            Error::EndOfTokens => "end of tokens",
+        }
+    }
+}

serde_test/src/lib.rs

@@ -0,0 +1,18 @@
+#[macro_use]
+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,366 @@
+use std::marker::PhantomData;
+
+use serde::{ser, Serialize};
+
+use error::Error;
+use token::Token;
+
+/// A `Serializer` that ensures that a value serializes to a given list of tokens.
+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>>
+{
+    /// Creates the serializer.
+    pub fn new(tokens: I) -> Serializer<'a, I> {
+        Serializer {
+            tokens: tokens,
+            phantom: PhantomData,
+        }
+    }
+
+    /// Pulls the next token off of the serializer, ignoring it.
+    pub fn next_token(&mut self) -> Option<&'a Token<'a>> {
+        self.tokens.next()
+    }
+}
+
+impl<'s, 'a, I> ser::Serializer for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    type SerializeSeq = Self;
+    type SerializeTuple = Self;
+    type SerializeTupleStruct = Self;
+    type SerializeTupleVariant = Self;
+    type SerializeMap = Self;
+    type SerializeStruct = Self;
+    type SerializeStructVariant = Self;
+
+    fn serialize_bool(self, v: bool) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Bool(v)));
+        Ok(())
+    }
+
+    fn serialize_i8(self, v: i8) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I8(v)));
+        Ok(())
+    }
+
+    fn serialize_i16(self, v: i16) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I16(v)));
+        Ok(())
+    }
+
+    fn serialize_i32(self, v: i32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I32(v)));
+        Ok(())
+    }
+
+    fn serialize_i64(self, v: i64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I64(v)));
+        Ok(())
+    }
+
+    fn serialize_u8(self, v: u8) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U8(v)));
+        Ok(())
+    }
+
+    fn serialize_u16(self, v: u16) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U16(v)));
+        Ok(())
+    }
+
+    fn serialize_u32(self, v: u32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U32(v)));
+        Ok(())
+    }
+
+    fn serialize_u64(self, v: u64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U64(v)));
+        Ok(())
+    }
+
+    fn serialize_f32(self, v: f32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::F32(v)));
+        Ok(())
+    }
+
+    fn serialize_f64(self, v: f64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::F64(v)));
+        Ok(())
+    }
+
+    fn serialize_char(self, v: char) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Char(v)));
+        Ok(())
+    }
+
+    fn serialize_str(self, v: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Str(v)));
+        Ok(())
+    }
+
+    fn serialize_bytes(self, value: &[u8]) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Bytes(value)));
+        Ok(())
+    }
+
+    fn serialize_unit(self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Unit));
+        Ok(())
+    }
+
+    fn serialize_unit_struct(self, name: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::UnitStruct(name)));
+        Ok(())
+    }
+
+    fn serialize_unit_variant(self,
+                              name: &str,
+                              _variant_index: usize,
+                              variant: &str)
+                              -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumUnit(name, variant)));
+        Ok(())
+    }
+
+    fn serialize_newtype_struct<T: ?Sized>(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_newtype_variant<T: ?Sized>(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_none(self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Option(false)));
+        Ok(())
+    }
+
+    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::Option(true)));
+        value.serialize(self)
+    }
+
+    fn serialize_seq(self, len: Option<usize>) -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqStart(len)));
+        Ok(self)
+    }
+
+    fn serialize_seq_fixed_size(self, len: usize) -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqArrayStart(len)));
+        Ok(self)
+    }
+
+    fn serialize_tuple(self, len: usize) -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStart(len)));
+        Ok(self)
+    }
+
+    fn serialize_tuple_struct(self, name: &'static str, len: usize) -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(),
+                   Some(&Token::TupleStructStart(name, len)));
+        Ok(self)
+    }
+
+    fn serialize_tuple_variant(self,
+                               name: &str,
+                               _variant_index: usize,
+                               variant: &str,
+                               len: usize)
+                               -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(),
+                   Some(&Token::EnumSeqStart(name, variant, len)));
+        Ok(self)
+    }
+
+    fn serialize_map(self, len: Option<usize>) -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::MapStart(len)));
+        Ok(self)
+    }
+
+    fn serialize_struct(self, name: &str, len: usize) -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::StructStart(name, len)));
+        Ok(self)
+    }
+
+    fn serialize_struct_variant(self,
+                                name: &str,
+                                _variant_index: usize,
+                                variant: &str,
+                                len: usize)
+                                -> Result<Self, Error> {
+        assert_eq!(self.tokens.next(),
+                   Some(&Token::EnumMapStart(name, variant, len)));
+        Ok(self)
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeSeq for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqSep));
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqEnd));
+        Ok(())
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeTuple for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleSep));
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleEnd));
+        Ok(())
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeTupleStruct for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructSep));
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructEnd));
+        Ok(())
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeTupleVariant for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqSep));
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqEnd));
+        Ok(())
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeMap for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::MapSep));
+        key.serialize(&mut **self)
+    }
+
+    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+        where T: Serialize
+    {
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::MapEnd));
+        Ok(())
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeStruct for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(&mut self,
+                                  key: &'static str,
+                                  value: &T)
+                                  -> Result<(), Self::Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::StructSep));
+        try!(key.serialize(&mut **self));
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::StructEnd));
+        Ok(())
+    }
+}
+
+impl<'s, 'a, I> ser::SerializeStructVariant for &'s mut Serializer<'a, I>
+    where I: Iterator<Item = &'a Token<'a>>
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(&mut self,
+                                  key: &'static str,
+                                  value: &T)
+                                  -> Result<(), Self::Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapSep));
+        try!(key.serialize(&mut **self));
+        value.serialize(&mut **self)
+    }
+
+    fn end(self) -> Result<(), Self::Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapEnd));
+        Ok(())
+    }
+}

serde_test/src/token.rs

@@ -0,0 +1,170 @@
+#[derive(Clone, PartialEq, Debug)]
+pub enum Token<'a> {
+    /// A serialized `bool`.
+    Bool(bool),
+
+    /// A serialized `i8`.
+    I8(i8),
+
+    /// A serialized `i16`.
+    I16(i16),
+
+    /// A serialized `i32`.
+    I32(i32),
+
+    /// A serialized `i64`.
+    I64(i64),
+
+    /// A serialized `u8`.
+    U8(u8),
+
+    /// A serialized `u16`.
+    U16(u16),
+
+    /// A serialized `u32`.
+    U32(u32),
+
+    /// A serialized `u64`.
+    U64(u64),
+
+    /// A serialized `f32`.
+    F32(f32),
+
+    /// A serialized `f64`.
+    F64(f64),
+
+    /// A serialized `char`.
+    Char(char),
+
+    /// A serialized `str`.
+    Str(&'a str),
+
+    /// A serialized `String`.
+    String(String),
+
+    /// A serialized `[u8]`
+    Bytes(&'a [u8]),
+
+    /// A serialized `ByteBuf`
+    ByteBuf(Vec<u8>),
+
+    /// The header to a serialized `Option<T>`.
+    ///
+    /// `None` is serialized as `Option(false)`, while `Some` is serialized as `Option(true)`, then
+    /// the value contained in the option.
+    Option(bool),
+
+    /// A serialized `()`.
+    Unit,
+
+    /// A serialized unit struct of the given name.
+    UnitStruct(&'a str),
+
+    /// The header to a serialized newtype struct of the given name.
+    ///
+    /// Newtype structs are serialized with this header, followed by the value contained in the
+    /// newtype struct.
+    StructNewType(&'a str),
+
+    /// The header to an enum of the given name.
+    ///
+    /// This token is only used for deserializers, and ensures that the following tokens are read as
+    /// an enum. Because this is never emitted by serializers, calling `assert_ser_tokens` or
+    /// `assert_tokens` will fail if this token is used.
+    ///
+    /// TODO: Trash this.
+    EnumStart(&'a str),
+
+    /// A unit variant of an enum of the given name, of the given name.
+    ///
+    /// The first string represents the name of the enum, and the second represents the name of the
+    /// variant.
+    EnumUnit(&'a str, &'a str),
+
+    /// The header to a newtype variant of an enum of the given name, of the given name.
+    ///
+    /// The first string represents the name of the enum, and the second represents the name of the
+    /// variant. The value contained within this enum works the same as `StructNewType`.
+    EnumNewType(&'a str, &'a str),
+
+    /// The header to a sequence of the given length.
+    ///
+    /// These are serialized via `serialize_seq`, which takes an optional length. After this
+    /// header is a list of elements, followed by `SeqEnd`.
+    SeqStart(Option<usize>),
+
+    /// The header to an array of the given length.
+    ///
+    /// These are serialized via `serialize_seq_fized_size`, which requires a length. After this
+    /// header is a list of elements, followed by `SeqEnd`.
+    SeqArrayStart(usize),
+
+    /// A separator, which occurs *before* every element in a sequence.
+    ///
+    /// Elements in sequences are represented by a `SeqSep`, followed by the value of the element.
+    SeqSep,
+
+    /// An indicator of the end of a sequence.
+    SeqEnd,
+
+    /// The header to a tuple of the given length, similar to `SeqArrayStart`.
+    TupleStart(usize),
+
+    /// A separator, similar to `SeqSep`.
+    TupleSep,
+
+    /// An indicator of the end of a tuple, similar to `SeqEnd`.
+    TupleEnd,
+
+    /// The header to a tuple struct of the given name and length.
+    TupleStructStart(&'a str, usize),
+
+    /// A separator, similar to `TupleSep`.
+    TupleStructSep,
+
+    /// An indicator of the end of a tuple struct, similar to `TupleEnd`.
+    TupleStructEnd,
+
+    /// The header to a map of the given length.
+    ///
+    /// These are serialized via `serialize_map`, which takes an optional length. After this header
+    /// is a list of key-value pairs, followed by `MapEnd`.
+    MapStart(Option<usize>),
+
+    /// A separator, which occurs *before* every key-value pair in a map.
+    ///
+    /// Elements in maps are represented by a `MapSep`, followed by a serialized key, followed
+    /// by a serialized value.
+    MapSep,
+
+    /// An indicator of the end of a map.
+    MapEnd,
+
+    /// The header of a struct of the given name and length, similar to `MapStart`.
+    StructStart(&'a str, usize),
+
+    /// A separator, similar to `MapSep`.
+    StructSep,
+
+    /// An indicator of the end of a struct, similar to `MapEnd`.
+    StructEnd,
+
+    /// The header to a tuple variant of an enum of the given name, of the given name and length.
+    EnumSeqStart(&'a str, &'a str, usize),
+
+    /// A separator, similar to `TupleSep`.
+    EnumSeqSep,
+
+    /// An indicator of the end of a tuple variant, similar to `TupleEnd`.
+    EnumSeqEnd,
+
+    /// The header of a struct variant of an enum of the given name, of the given name and length,
+    /// similar to `StructStart`.
+    EnumMapStart(&'a str, &'a str, usize),
+
+    /// A separator, similar to `StructSep`.
+    EnumMapSep,
+
+    /// An indicator of the end of a struct, similar to `StructEnd`.
+    EnumMapEnd,
+}

src/de.rs

@@ -1,819 +0,0 @@
-use std::collections::{HashMap, BTreeMap};
-use std::hash::Hash;
-use std::marker::PhantomData;
-use std::num::FromPrimitive;
-use std::path;
-use std::str;
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait Error {
-    fn syntax_error() -> Self;
-
-    fn end_of_stream_error() -> Self;
-
-    fn missing_field_error(&'static str) -> Self;
-}
-
-pub trait Deserialize {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
-        where D: Deserializer;
-}
-
-pub trait Deserializer {
-    type Error: Error;
-
-    fn visit<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor;
-
-    /// The `visit_option` method allows a `Deserialize` type to inform the
-    /// `Deserializer` that it's expecting an optional value. This allows
-    /// deserializers that encode an optional value as a nullable value to
-    /// convert the null value into a `None`, and a regular value as
-    /// `Some(value)`.
-    #[inline]
-    fn visit_option<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-
-    /// The `visit_enum` method allows a `Deserialize` type to inform the
-    /// `Deserializer` that it's expecting an enum value. This allows
-    /// deserializers that provide a custom enumeration serialization to
-    /// properly deserialize the type.
-    #[inline]
-    fn visit_enum<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.visit(visitor)
-    }
-}
-
-pub trait Visitor {
-    type Value;
-
-    fn visit_bool<E>(&mut self, _v: bool) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_isize<E>(&mut self, v: isize) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_i64(v as i64)
-    }
-
-    fn visit_i8<E>(&mut self, v: i8) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_i64(v as i64)
-    }
-
-    fn visit_i16<E>(&mut self, v: i16) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_i64(v as i64)
-    }
-
-    fn visit_i32<E>(&mut self, v: i32) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_i64(v as i64)
-    }
-
-    fn visit_i64<E>(&mut self, _v: i64) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_usize<E>(&mut self, v: usize) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_u64(v as u64)
-    }
-
-    fn visit_u8<E>(&mut self, v: u8) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_u64(v as u64)
-    }
-
-    fn visit_u16<E>(&mut self, v: u16) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_u64(v as u64)
-    }
-
-    fn visit_u32<E>(&mut self, v: u32) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_u64(v as u64)
-    }
-
-    fn visit_u64<E>(&mut self, _v: u64) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_f32<E>(&mut self, v: f32) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_f64(v as f64)
-    }
-
-    fn visit_f64<E>(&mut self, _v: f64) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    #[inline]
-    fn visit_char<E>(&mut self, v: char) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        // The unwraps in here should be safe.
-        let mut s = &mut [0; 4];
-        let len = v.encode_utf8(s).unwrap();
-        self.visit_str(str::from_utf8(&s[..len]).unwrap())
-    }
-
-    fn visit_str<E>(&mut self, _v: &str) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    #[inline]
-    fn visit_string<E>(&mut self, v: String) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_str(&v)
-    }
-
-    fn visit_unit<E>(&mut self) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    #[inline]
-    fn visit_named_unit<E>(&mut self, _name: &str) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        self.visit_unit()
-    }
-
-    fn visit_none<E>(&mut self) -> Result<Self::Value, E>
-        where E: Error,
-    {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_some<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
-        where D: Deserializer,
-    {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_seq<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
-        where V: SeqVisitor,
-    {
-        Err(Error::syntax_error())
-    }
-
-    #[inline]
-    fn visit_named_seq<V>(&mut self, _name: &str, visitor: V) -> Result<Self::Value, V::Error>
-        where V: SeqVisitor,
-    {
-        self.visit_seq(visitor)
-    }
-
-    fn visit_map<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
-        where V: MapVisitor,
-    {
-        Err(Error::syntax_error())
-    }
-
-    #[inline]
-    fn visit_named_map<V>(&mut self, _name: &str, visitor: V) -> Result<Self::Value, V::Error>
-        where V: MapVisitor,
-    {
-        self.visit_map(visitor)
-    }
-
-    #[inline]
-    fn visit_enum<V>(&mut self,
-                     _name: &str,
-                     _variant: &str,
-                     _visitor: V) -> Result<Self::Value, V::Error>
-        where V: EnumVisitor,
-    {
-        Err(Error::syntax_error())
-    }
-
-    #[inline]
-    fn visit_variant<V>(&mut self, _name: &str, _visitor: V) -> Result<Self::Value, V::Error>
-        where V: EnumVisitor,
-    {
-        Err(Error::syntax_error())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait SeqVisitor {
-    type Error: Error;
-
-    fn visit<T>(&mut self) -> Result<Option<T>, Self::Error>
-        where T: Deserialize;
-
-    fn end(&mut self) -> Result<(), Self::Error>;
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, None)
-    }
-}
-
-impl<'a, V> SeqVisitor for &'a mut V where V: SeqVisitor {
-    type Error = V::Error;
-
-    #[inline]
-    fn visit<T>(&mut self) -> Result<Option<T>, V::Error>
-        where T: Deserialize
-    {
-        (**self).visit()
-    }
-
-    #[inline]
-    fn end(&mut self) -> Result<(), V::Error> {
-        (**self).end()
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (**self).size_hint()
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait MapVisitor {
-    type Error: Error;
-
-    #[inline]
-    fn visit<K, V>(&mut self) -> Result<Option<(K, V)>, Self::Error>
-        where K: Deserialize,
-              V: Deserialize,
-    {
-        match try!(self.visit_key()) {
-            Some(key) => {
-                let value = try!(self.visit_value());
-                Ok(Some((key, value)))
-            }
-            None => Ok(None)
-        }
-    }
-
-    fn visit_key<K>(&mut self) -> Result<Option<K>, Self::Error>
-        where K: Deserialize;
-
-    fn visit_value<V>(&mut self) -> Result<V, Self::Error>
-        where V: Deserialize;
-
-    fn end(&mut self) -> Result<(), Self::Error>;
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, None)
-    }
-}
-
-impl<'a, V_> MapVisitor for &'a mut V_ where V_: MapVisitor {
-    type Error = V_::Error;
-
-    #[inline]
-    fn visit<K, V>(&mut self) -> Result<Option<(K, V)>, V_::Error>
-        where K: Deserialize,
-              V: Deserialize,
-    {
-        (**self).visit()
-    }
-
-    #[inline]
-    fn visit_key<K>(&mut self) -> Result<Option<K>, V_::Error>
-        where K: Deserialize
-    {
-        (**self).visit_key()
-    }
-
-    #[inline]
-    fn visit_value<V>(&mut self) -> Result<V, V_::Error>
-        where V: Deserialize
-    {
-        (**self).visit_value()
-    }
-
-    #[inline]
-    fn end(&mut self) -> Result<(), V_::Error> {
-        (**self).end()
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (**self).size_hint()
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait EnumVisitor {
-    type Error: Error;
-
-    fn visit_unit(&mut self) -> Result<(), Self::Error> {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_seq<V>(&mut self, _visitor: V) -> Result<V::Value, Self::Error>
-        where V: EnumSeqVisitor,
-    {
-        Err(Error::syntax_error())
-    }
-
-    fn visit_map<V>(&mut self, _visitor: V) -> Result<V::Value, Self::Error>
-        where V: EnumMapVisitor,
-    {
-        Err(Error::syntax_error())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait EnumSeqVisitor {
-    type Value;
-
-    fn visit<V>(&mut self, visitor: V) -> Result<Self::Value, V::Error>
-        where V: SeqVisitor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait EnumMapVisitor {
-    type Value;
-
-    fn visit<V>(&mut self, visitor: V) -> Result<Self::Value, V::Error>
-        where V: MapVisitor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct UnitVisitor;
-
-impl Visitor for UnitVisitor {
-    type Value = ();
-
-    fn visit_unit<E>(&mut self) -> Result<(), E>
-        where E: Error,
-    {
-        Ok(())
-    }
-
-    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<(), V::Error>
-        where V: SeqVisitor,
-    {
-        visitor.end()
-    }
-}
-
-impl Deserialize for () {
-    fn deserialize<D>(deserializer: &mut D) -> Result<(), D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(UnitVisitor)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct BoolVisitor;
-
-impl Visitor for BoolVisitor {
-    type Value = bool;
-
-    fn visit_bool<E>(&mut self, v: bool) -> Result<bool, E>
-        where E: Error,
-    {
-        Ok(v)
-    }
-}
-
-impl Deserialize for bool {
-    fn deserialize<D>(deserializer: &mut D) -> Result<bool, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(BoolVisitor)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-macro_rules! impl_deserialize_num_method {
-    ($src_ty:ty, $method:ident, $from_method:ident) => {
-        #[inline]
-        fn $method<E>(&mut self, v: $src_ty) -> Result<T, E>
-            where E: Error,
-        {
-            match FromPrimitive::$from_method(v) {
-                Some(v) => Ok(v),
-                None => Err(Error::syntax_error()),
-            }
-        }
-    }
-}
-
-pub struct PrimitiveVisitor<T> {
-    marker: PhantomData<T>,
-}
-
-impl<T> PrimitiveVisitor<T> {
-    #[inline]
-    pub fn new() -> Self {
-        PrimitiveVisitor {
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<
-    T: Deserialize + FromPrimitive
-> self::Visitor for PrimitiveVisitor<T> {
-    type Value = T;
-
-    impl_deserialize_num_method!(isize, visit_isize, from_isize);
-    impl_deserialize_num_method!(i8, visit_i8, from_i8);
-    impl_deserialize_num_method!(i16, visit_i16, from_i16);
-    impl_deserialize_num_method!(i32, visit_i32, from_i32);
-    impl_deserialize_num_method!(i64, visit_i64, from_i64);
-    impl_deserialize_num_method!(usize, visit_usize, from_usize);
-    impl_deserialize_num_method!(u8, visit_u8, from_u8);
-    impl_deserialize_num_method!(u16, visit_u16, from_u16);
-    impl_deserialize_num_method!(u32, visit_u32, from_u32);
-    impl_deserialize_num_method!(u64, visit_u64, from_u64);
-    impl_deserialize_num_method!(f32, visit_f32, from_f32);
-    impl_deserialize_num_method!(f64, visit_f64, from_f64);
-}
-
-macro_rules! impl_deserialize_num {
-    ($ty:ty) => {
-        impl Deserialize for $ty {
-            #[inline]
-            fn deserialize<D>(deserializer: &mut D) -> Result<$ty, D::Error>
-                where D: Deserializer,
-            {
-                deserializer.visit(PrimitiveVisitor::new())
-            }
-        }
-    }
-}
-
-impl_deserialize_num!(isize);
-impl_deserialize_num!(i8);
-impl_deserialize_num!(i16);
-impl_deserialize_num!(i32);
-impl_deserialize_num!(i64);
-impl_deserialize_num!(usize);
-impl_deserialize_num!(u8);
-impl_deserialize_num!(u16);
-impl_deserialize_num!(u32);
-impl_deserialize_num!(u64);
-impl_deserialize_num!(f32);
-impl_deserialize_num!(f64);
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct CharVisitor;
-
-impl Visitor for CharVisitor {
-    type Value = char;
-
-    #[inline]
-    fn visit_char<E>(&mut self, v: char) -> Result<char, E>
-        where E: Error,
-    {
-        Ok(v)
-    }
-
-    #[inline]
-    fn visit_str<E>(&mut self, v: &str) -> Result<char, E>
-        where E: Error,
-    {
-        let mut iter = v.chars();
-        if let Some(v) = iter.next() {
-            if iter.next().is_some() {
-                Err(Error::syntax_error())
-            } else {
-                Ok(v)
-            }
-        } else {
-            Err(Error::end_of_stream_error())
-        }
-    }
-}
-
-impl Deserialize for char {
-    #[inline]
-    fn deserialize<D>(deserializer: &mut D) -> Result<char, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(CharVisitor)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct StringVisitor;
-
-impl Visitor for StringVisitor {
-    type Value = String;
-
-    fn visit_str<E>(&mut self, v: &str) -> Result<String, E>
-        where E: Error,
-    {
-        Ok(v.to_string())
-    }
-
-    fn visit_string<E>(&mut self, v: String) -> Result<String, E>
-        where E: Error,
-    {
-        Ok(v)
-    }
-}
-
-impl Deserialize for String {
-    fn deserialize<D>(deserializer: &mut D) -> Result<String, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(StringVisitor)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct OptionVisitor<T> {
-    marker: PhantomData<T>,
-}
-
-impl<
-    T: Deserialize,
-> Visitor for OptionVisitor<T> {
-    type Value = Option<T>;
-
-    #[inline]
-    fn visit_none<E>(&mut self) -> Result<Option<T>, E>
-        where E: Error,
-    {
-        Ok(None)
-    }
-
-    #[inline]
-    fn visit_some<D>(&mut self, deserializer: &mut D) -> Result<Option<T>, D::Error>
-        where D: Deserializer,
-    {
-        Ok(Some(try!(Deserialize::deserialize(deserializer))))
-    }
-}
-
-impl<T> Deserialize for Option<T> where T: Deserialize {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Option<T>, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit_option(OptionVisitor { marker: PhantomData })
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub struct VecVisitor<T> {
-    marker: PhantomData<T>,
-}
-
-impl<T> VecVisitor<T> {
-    pub fn new() -> Self {
-        VecVisitor {
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<T> Visitor for VecVisitor<T> where T: Deserialize {
-    type Value = Vec<T>;
-
-    #[inline]
-    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<Vec<T>, V::Error>
-        where V: SeqVisitor,
-    {
-        let (len, _) = visitor.size_hint();
-        let mut values = Vec::with_capacity(len);
-
-        while let Some(value) = try!(visitor.visit()) {
-            values.push(value);
-        }
-
-        Ok(values)
-    }
-}
-
-impl<T: Deserialize> Deserialize for Vec<T> {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Vec<T>, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(VecVisitor::new())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-macro_rules! tuple_impls {
-    () => {};
-    ($($visitor:ident => ($($name:ident),+),)+) => {
-        $(
-            struct $visitor<$($name,)+> {
-                marker: PhantomData<($($name,)+)>,
-            }
-
-            impl<
-                $($name: Deserialize,)+
-            > Visitor for $visitor<$($name,)+> {
-                type Value = ($($name,)+);
-
-                #[inline]
-                #[allow(non_snake_case)]
-                fn visit_seq<V>(&mut self, mut visitor: V) -> Result<($($name,)+), V::Error>
-                    where V: SeqVisitor,
-                {
-                    $(
-                        let $name = match try!(visitor.visit()) {
-                            Some(value) => value,
-                            None => { return Err(Error::end_of_stream_error()); }
-                        };
-                     )+;
-
-                    try!(visitor.end());
-
-                    Ok(($($name,)+))
-                }
-            }
-
-            impl<
-                $($name: Deserialize),+
-            > Deserialize for ($($name,)+) {
-                #[inline]
-                fn deserialize<D>(deserializer: &mut D) -> Result<($($name,)+), D::Error>
-                    where D: Deserializer,
-                {
-                    deserializer.visit($visitor { marker: PhantomData })
-                }
-            }
-        )+
-    }
-}
-
-tuple_impls! {
-    TupleVisitor1 => (T0),
-    TupleVisitor2 => (T0, T1),
-    TupleVisitor3 => (T0, T1, T2),
-    TupleVisitor4 => (T0, T1, T2, T3),
-    TupleVisitor5 => (T0, T1, T2, T3, T4),
-    TupleVisitor6 => (T0, T1, T2, T3, T4, T5),
-    TupleVisitor7 => (T0, T1, T2, T3, T4, T5, T6),
-    TupleVisitor8 => (T0, T1, T2, T3, T4, T5, T6, T7),
-    TupleVisitor9 => (T0, T1, T2, T3, T4, T5, T6, T7, T8),
-    TupleVisitor10 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9),
-    TupleVisitor11 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10),
-    TupleVisitor12 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11),
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub struct HashMapVisitor<K, V> {
-    marker: PhantomData<HashMap<K, V>>,
-}
-
-impl<K, V> HashMapVisitor<K, V> {
-    #[inline]
-    pub fn new() -> Self {
-        HashMapVisitor {
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<K, V> Visitor for HashMapVisitor<K, V>
-    where K: Deserialize + Eq + Hash,
-          V: Deserialize,
-{
-    type Value = HashMap<K, V>;
-
-    #[inline]
-    fn visit_map<V_>(&mut self, mut visitor: V_) -> Result<HashMap<K, V>, V_::Error>
-        where V_: MapVisitor,
-    {
-        let (len, _) = visitor.size_hint();
-        let mut values = HashMap::with_capacity(len);
-
-        while let Some((key, value)) = try!(visitor.visit()) {
-            values.insert(key, value);
-        }
-
-        Ok(values)
-    }
-}
-
-impl<K, V> Deserialize for HashMap<K, V>
-    where K: Deserialize + Eq + Hash,
-          V: Deserialize,
-{
-    fn deserialize<D>(deserializer: &mut D) -> Result<HashMap<K, V>, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(HashMapVisitor::new())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub struct BTreeMapVisitor<K, V> {
-    marker: PhantomData<BTreeMap<K, V>>,
-}
-
-impl<K, V> BTreeMapVisitor<K, V> {
-    #[inline]
-    pub fn new() -> Self {
-        BTreeMapVisitor {
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<K, V> Visitor for BTreeMapVisitor<K, V>
-    where K: Deserialize + Ord,
-          V: Deserialize
-{
-    type Value = BTreeMap<K, V>;
-
-    #[inline]
-    fn visit_map<Visitor>(&mut self, mut visitor: Visitor) -> Result<BTreeMap<K, V>, Visitor::Error>
-        where Visitor: MapVisitor,
-    {
-        let mut values = BTreeMap::new();
-
-        while let Some((key, value)) = try!(visitor.visit()) {
-            values.insert(key, value);
-        }
-
-        Ok(values)
-    }
-}
-
-impl<
-    K: Deserialize + Eq + Ord,
-    V: Deserialize,
-> Deserialize for BTreeMap<K, V> {
-    fn deserialize<D>(deserializer: &mut D) -> Result<BTreeMap<K, V>, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(BTreeMapVisitor::new())
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct PathBufVisitor;
-
-impl Visitor for PathBufVisitor {
-    type Value = path::PathBuf;
-
-    fn visit_str<E>(&mut self, v: &str) -> Result<path::PathBuf, E>
-        where E: Error,
-    {
-        Ok(path::PathBuf::new(&v))
-    }
-
-    fn visit_string<E>(&mut self, v: String) -> Result<path::PathBuf, E>
-        where E: Error,
-    {
-        self.visit_str(&v)
-    }
-}
-
-impl Deserialize for path::PathBuf {
-    fn deserialize<D>(deserializer: &mut D) -> Result<path::PathBuf, D::Error>
-        where D: Deserializer,
-    {
-        deserializer.visit(PathBufVisitor)
-    }
-}

src/json/builder.rs

@@ -1,84 +0,0 @@
-// Copyright 2012-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.
-
-use std::collections::BTreeMap;
-
-use ser::{self, Serialize};
-use json::value::{self, Value};
-
-pub struct ArrayBuilder {
-    array: Vec<Value>,
-}
-
-impl ArrayBuilder {
-    pub fn new() -> ArrayBuilder {
-        ArrayBuilder { array: Vec::new() }
-    }
-
-    pub fn unwrap(self) -> Value {
-        Value::Array(self.array)
-    }
-
-    pub fn push<T: ser::Serialize>(mut self, v: T) -> ArrayBuilder {
-        self.array.push(value::to_value(&v));
-        self
-    }
-
-    pub fn push_array<F>(mut self, f: F) -> ArrayBuilder where
-        F: FnOnce(ArrayBuilder) -> ArrayBuilder
-    {
-        let builder = ArrayBuilder::new();
-        self.array.push(f(builder).unwrap());
-        self
-    }
-
-    pub fn push_object<F>(mut self, f: F) -> ArrayBuilder where
-        F: FnOnce(ObjectBuilder) -> ObjectBuilder
-    {
-        let builder = ObjectBuilder::new();
-        self.array.push(f(builder).unwrap());
-        self
-    }
-}
-
-pub struct ObjectBuilder {
-    object: BTreeMap<String, Value>,
-}
-
-impl ObjectBuilder {
-    pub fn new() -> ObjectBuilder {
-        ObjectBuilder { object: BTreeMap::new() }
-    }
-
-    pub fn unwrap(self) -> Value {
-        Value::Object(self.object)
-    }
-
-    pub fn insert<V: ser::Serialize>(mut self, k: String, v: V) -> ObjectBuilder {
-        self.object.insert(k, value::to_value(&v));
-        self
-    }
-
-    pub fn insert_array<F>(mut self, key: String, f: F) -> ObjectBuilder where
-        F: FnOnce(ArrayBuilder) -> ArrayBuilder
-    {
-        let builder = ArrayBuilder::new();
-        self.object.insert(key, f(builder).unwrap());
-        self
-    }
-
-    pub fn insert_object<F>(mut self, key: String, f: F) -> ObjectBuilder where
-        F: FnOnce(ObjectBuilder) -> ObjectBuilder
-    {
-        let builder = ObjectBuilder::new();
-        self.object.insert(key, f(builder).unwrap());
-        self
-    }
-}

src/json/de.rs

@@ -1,636 +0,0 @@
-use std::char;
-use std::num::Float;
-use unicode::str::Utf16Item;
-use std::str;
-
-use de;
-use super::error::{Error, ErrorCode};
-
-pub struct Deserializer<Iter> {
-    rdr: Iter,
-    ch: Option<u8>,
-    line: usize,
-    col: usize,
-    buf: Vec<u8>,
-}
-
-impl<Iter> Deserializer<Iter>
-    where Iter: Iterator<Item=u8>,
-{
-    /// Creates the JSON parser.
-    #[inline]
-    pub fn new(rdr: Iter) -> Deserializer<Iter> {
-        let mut p = Deserializer {
-            rdr: rdr,
-            ch: Some(b'\x00'),
-            line: 1,
-            col: 0,
-            buf: Vec::with_capacity(128),
-        };
-        p.bump();
-        return p;
-    }
-
-    #[inline]
-    pub fn end(&mut self) -> Result<(), Error> {
-        self.parse_whitespace();
-        if self.eof() {
-            Ok(())
-        } else {
-            Err(self.error(ErrorCode::TrailingCharacters))
-        }
-    }
-
-    fn eof(&self) -> bool { self.ch.is_none() }
-
-    fn ch_or_null(&self) -> u8 { self.ch.unwrap_or(b'\x00') }
-
-    fn bump(&mut self) {
-        self.ch = self.rdr.next();
-
-        if self.ch_is(b'\n') {
-            self.line += 1;
-            self.col = 1;
-        } else {
-            self.col += 1;
-        }
-    }
-
-    fn next_char(&mut self) -> Option<u8> {
-        self.bump();
-        self.ch
-    }
-
-    fn ch_is(&self, c: u8) -> bool {
-        self.ch == Some(c)
-    }
-
-    fn error(&mut self, reason: ErrorCode) -> Error {
-        Error::SyntaxError(reason, self.line, self.col)
-    }
-
-    fn parse_whitespace(&mut self) {
-        while self.ch_is(b' ') ||
-              self.ch_is(b'\n') ||
-              self.ch_is(b'\t') ||
-              self.ch_is(b'\r') { self.bump(); }
-    }
-
-    fn parse_value<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        self.parse_whitespace();
-
-        if self.eof() {
-            return Err(self.error(ErrorCode::EOFWhileParsingValue));
-        }
-
-        match self.ch_or_null() {
-            b'n' => {
-                try!(self.parse_ident(b"ull"));
-                visitor.visit_unit()
-            }
-            b't' => {
-                try!(self.parse_ident(b"rue"));
-                visitor.visit_bool(true)
-            }
-            b'f' => {
-                try!(self.parse_ident(b"alse"));
-                visitor.visit_bool(false)
-            }
-            b'0' ... b'9' | b'-' => self.parse_number(visitor),
-            b'"' => {
-                try!(self.parse_string());
-                let s = str::from_utf8(&self.buf).unwrap();
-                visitor.visit_str(s)
-            }
-            b'[' => {
-                self.bump();
-                visitor.visit_seq(SeqVisitor::new(self))
-            }
-            b'{' => {
-                self.bump();
-                visitor.visit_map(MapVisitor::new(self))
-            }
-            _ => {
-                Err(self.error(ErrorCode::ExpectedSomeValue))
-            }
-        }
-    }
-
-    fn parse_ident(&mut self, ident: &[u8]) -> Result<(), Error> {
-        if ident.iter().all(|c| Some(*c) == self.next_char()) {
-            self.bump();
-            Ok(())
-        } else {
-            Err(self.error(ErrorCode::ExpectedSomeIdent))
-        }
-    }
-
-    fn parse_number<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        let mut neg = 1;
-
-        if self.ch_is(b'-') {
-            self.bump();
-            neg = -1;
-        }
-
-        let res = try!(self.parse_integer());
-
-        if self.ch_is(b'.') || self.ch_is(b'e') || self.ch_is(b'E') {
-            let neg = neg as f64;
-            let mut res = res as f64;
-
-            if self.ch_is(b'.') {
-                res = try!(self.parse_decimal(res));
-            }
-
-            if self.ch_is(b'e') || self.ch_is(b'E') {
-                res = try!(self.parse_exponent(res));
-            }
-
-            visitor.visit_f64(neg * res)
-        } else {
-            visitor.visit_i64(neg * res)
-        }
-    }
-
-    fn parse_integer(&mut self) -> Result<i64, Error> {
-        let mut res = 0;
-
-        match self.ch_or_null() {
-            b'0' => {
-                self.bump();
-
-                // There can be only one leading '0'.
-                match self.ch_or_null() {
-                    b'0' ... b'9' => {
-                        return Err(self.error(ErrorCode::InvalidNumber));
-                    }
-                    _ => ()
-                }
-            },
-            b'1' ... b'9' => {
-                while !self.eof() {
-                    match self.ch_or_null() {
-                        c @ b'0' ... b'9' => {
-                            res *= 10;
-                            res += (c as i64) - (b'0' as i64);
-                            self.bump();
-                        }
-                        _ => break,
-                    }
-                }
-            }
-            _ => { return Err(self.error(ErrorCode::InvalidNumber)); }
-        }
-
-        Ok(res)
-    }
-
-    fn parse_decimal(&mut self, res: f64) -> Result<f64, Error> {
-        self.bump();
-
-        // Make sure a digit follows the decimal place.
-        match self.ch_or_null() {
-            b'0' ... b'9' => (),
-             _ => { return Err(self.error(ErrorCode::InvalidNumber)); }
-        }
-
-        let mut res = res;
-        let mut dec = 1.0;
-        while !self.eof() {
-            match self.ch_or_null() {
-                c @ b'0' ... b'9' => {
-                    dec /= 10.0;
-                    res += (((c as u64) - (b'0' as u64)) as f64) * dec;
-                    self.bump();
-                }
-                _ => break,
-            }
-        }
-
-        Ok(res)
-    }
-
-    fn parse_exponent(&mut self, mut res: f64) -> Result<f64, Error> {
-        self.bump();
-
-        let mut exp = 0;
-        let mut neg_exp = false;
-
-        if self.ch_is(b'+') {
-            self.bump();
-        } else if self.ch_is(b'-') {
-            self.bump();
-            neg_exp = true;
-        }
-
-        // Make sure a digit follows the exponent place.
-        match self.ch_or_null() {
-            b'0' ... b'9' => (),
-            _ => { return Err(self.error(ErrorCode::InvalidNumber)); }
-        }
-        while !self.eof() {
-            match self.ch_or_null() {
-                c @ b'0' ... b'9' => {
-                    exp *= 10;
-                    exp += (c as i32) - (b'0' as i32);
-
-                    self.bump();
-                }
-                _ => break
-            }
-        }
-
-        let exp: f64 = 10_f64.powi(exp);
-        if neg_exp {
-            res /= exp;
-        } else {
-            res *= exp;
-        }
-
-        Ok(res)
-    }
-
-    fn decode_hex_escape(&mut self) -> Result<u16, Error> {
-        let mut i = 0;
-        let mut n = 0u16;
-        while i < 4 && !self.eof() {
-            self.bump();
-            n = match self.ch_or_null() {
-                c @ b'0' ... b'9' => n * 16_u16 + ((c as u16) - (b'0' as u16)),
-                b'a' | b'A' => n * 16_u16 + 10_u16,
-                b'b' | b'B' => n * 16_u16 + 11_u16,
-                b'c' | b'C' => n * 16_u16 + 12_u16,
-                b'd' | b'D' => n * 16_u16 + 13_u16,
-                b'e' | b'E' => n * 16_u16 + 14_u16,
-                b'f' | b'F' => n * 16_u16 + 15_u16,
-                _ => { return Err(self.error(ErrorCode::InvalidEscape)); }
-            };
-
-            i += 1;
-        }
-
-        // Error out if we didn't parse 4 digits.
-        if i != 4 {
-            return Err(self.error(ErrorCode::InvalidEscape));
-        }
-
-        Ok(n)
-    }
-
-    fn parse_string(&mut self) -> Result<(), Error> {
-        self.buf.clear();
-
-        let mut escape = false;
-
-        loop {
-            let ch = match self.next_char() {
-                Some(ch) => ch,
-                None => { return Err(self.error(ErrorCode::EOFWhileParsingString)); }
-            };
-
-            if escape {
-                match ch {
-                    b'"' => self.buf.push(b'"'),
-                    b'\\' => self.buf.push(b'\\'),
-                    b'/' => self.buf.push(b'/'),
-                    b'b' => self.buf.push(b'\x08'),
-                    b'f' => self.buf.push(b'\x0c'),
-                    b'n' => self.buf.push(b'\n'),
-                    b'r' => self.buf.push(b'\r'),
-                    b't' => self.buf.push(b'\t'),
-                    b'u' => {
-                        let c = match try!(self.decode_hex_escape()) {
-                            0xDC00 ... 0xDFFF => {
-                                return Err(self.error(ErrorCode::LoneLeadingSurrogateInHexEscape));
-                            }
-
-                            // Non-BMP characters are encoded as a sequence of
-                            // two hex escapes, representing UTF-16 surrogates.
-                            n1 @ 0xD800 ... 0xDBFF => {
-                                let c1 = self.next_char();
-                                let c2 = self.next_char();
-                                match (c1, c2) {
-                                    (Some(b'\\'), Some(b'u')) => (),
-                                    _ => {
-                                        return Err(self.error(ErrorCode::UnexpectedEndOfHexEscape));
-                                    }
-                                }
-
-                                let buf = &[n1, try!(self.decode_hex_escape())];
-                                match ::unicode::str::utf16_items(buf).next() {
-                                    Some(Utf16Item::ScalarValue(c)) => c,
-                                    _ => {
-                                        return Err(self.error(ErrorCode::LoneLeadingSurrogateInHexEscape));
-                                    }
-                                }
-                            }
-
-                            n => match char::from_u32(n as u32) {
-                                Some(c) => c,
-                                None => {
-                                    return Err(self.error(ErrorCode::InvalidUnicodeCodePoint));
-                                }
-                            }
-                        };
-
-                        let buf = &mut [0; 4];
-                        let len = c.encode_utf8(buf).unwrap_or(0);
-                        self.buf.extend(buf[..len].iter().map(|b| *b));
-                    }
-                    _ => {
-                        return Err(self.error(ErrorCode::InvalidEscape));
-                    }
-                }
-                escape = false;
-            } else {
-                match ch {
-                    b'"' => {
-                        self.bump();
-                        return Ok(());
-                    }
-                    b'\\' => {
-                        escape = true;
-                    }
-                    ch => {
-                        self.buf.push(ch);
-                    }
-                }
-            }
-        }
-    }
-
-    fn parse_object_colon(&mut self) -> Result<(), Error> {
-        self.parse_whitespace();
-
-        if self.ch_is(b':') {
-            self.bump();
-            Ok(())
-        } else if self.eof() {
-            Err(self.error(ErrorCode::EOFWhileParsingObject))
-        } else {
-            Err(self.error(ErrorCode::ExpectedColon))
-        }
-    }
-}
-
-impl<Iter> de::Deserializer for Deserializer<Iter>
-    where Iter: Iterator<Item=u8>,
-{
-    type Error = Error;
-
-    #[inline]
-    fn visit<V>(&mut self, visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        self.parse_value(visitor)
-    }
-
-    #[inline]
-    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        self.parse_whitespace();
-
-        if self.eof() {
-            return Err(self.error(ErrorCode::EOFWhileParsingValue));
-        }
-
-        if self.ch_is(b'n') {
-            try!(self.parse_ident(b"ull"));
-            visitor.visit_none()
-        } else {
-            visitor.visit_some(self)
-        }
-    }
-
-    #[inline]
-    fn visit_enum<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        self.parse_whitespace();
-
-        if self.ch_is(b'{') {
-            self.bump();
-            self.parse_whitespace();
-
-            try!(self.parse_string());
-            try!(self.parse_object_colon());
-
-            let variant = str::from_utf8(&self.buf).unwrap().to_string();
-
-            let value = try!(visitor.visit_variant(&variant, EnumVisitor {
-                de: self,
-            }));
-
-            self.parse_whitespace();
-
-            if self.ch_is(b'}') {
-                self.bump();
-                Ok(value)
-            } else {
-                return Err(self.error(ErrorCode::ExpectedSomeValue));
-            }
-        } else {
-            Err(self.error(ErrorCode::ExpectedSomeValue))
-        }
-    }
-}
-
-struct SeqVisitor<'a, Iter: 'a> {
-    de: &'a mut Deserializer<Iter>,
-    first: bool,
-}
-
-impl<'a, Iter> SeqVisitor<'a, Iter> {
-    fn new(de: &'a mut Deserializer<Iter>) -> Self {
-        SeqVisitor {
-            de: de,
-            first: true,
-        }
-    }
-}
-
-impl<'a, Iter> de::SeqVisitor for SeqVisitor<'a, Iter>
-    where Iter: Iterator<Item=u8>
-{
-    type Error = Error;
-
-    fn visit<T>(&mut self) -> Result<Option<T>, Error>
-        where T: de::Deserialize,
-    {
-        self.de.parse_whitespace();
-
-        if self.de.ch_is(b']') {
-            self.de.bump();
-            return Ok(None);
-        }
-
-        if self.first {
-            self.first = false;
-        } else {
-            if self.de.ch_is(b',') {
-                self.de.bump();
-            } else if self.de.eof() {
-                return Err(self.de.error(ErrorCode::EOFWhileParsingList));
-            } else {
-                return Err(self.de.error(ErrorCode::ExpectedListCommaOrEnd));
-            }
-        }
-
-        let value = try!(de::Deserialize::deserialize(self.de));
-        Ok(Some(value))
-    }
-
-    fn end(&mut self) -> Result<(), Error> {
-        self.de.parse_whitespace();
-
-        if self.de.ch_is(b']') {
-            self.de.bump();
-            Ok(())
-        } else if self.de.eof() {
-            Err(self.de.error(ErrorCode::EOFWhileParsingList))
-        } else {
-            Err(self.de.error(ErrorCode::TrailingCharacters))
-        }
-    }
-}
-
-struct MapVisitor<'a, Iter: 'a> {
-    de: &'a mut Deserializer<Iter>,
-    first: bool,
-}
-
-impl<'a, Iter> MapVisitor<'a, Iter> {
-    fn new(de: &'a mut Deserializer<Iter>) -> Self {
-        MapVisitor {
-            de: de,
-            first: true,
-        }
-    }
-}
-
-impl<'a, Iter> de::MapVisitor for MapVisitor<'a, Iter>
-    where Iter: Iterator<Item=u8>
-{
-    type Error = Error;
-
-    fn visit_key<K>(&mut self) -> Result<Option<K>, Error>
-        where K: de::Deserialize,
-    {
-        self.de.parse_whitespace();
-
-        if self.de.ch_is(b'}') {
-            self.de.bump();
-            return Ok(None);
-        }
-
-        if self.first {
-            self.first = false;
-        } else {
-            if self.de.ch_is(b',') {
-                self.de.bump();
-                self.de.parse_whitespace();
-            } else if self.de.eof() {
-                return Err(self.de.error(ErrorCode::EOFWhileParsingObject));
-            } else {
-                return Err(self.de.error(ErrorCode::ExpectedObjectCommaOrEnd));
-            }
-        }
-
-        if self.de.eof() {
-            return Err(self.de.error(ErrorCode::EOFWhileParsingValue));
-        }
-
-        if !self.de.ch_is(b'"') {
-            return Err(self.de.error(ErrorCode::KeyMustBeAString));
-        }
-
-        Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-    }
-
-    fn visit_value<V>(&mut self) -> Result<V, Error>
-        where V: de::Deserialize,
-    {
-        try!(self.de.parse_object_colon());
-
-        Ok(try!(de::Deserialize::deserialize(self.de)))
-    }
-
-    fn end(&mut self) -> Result<(), Error> {
-        self.de.parse_whitespace();
-
-        if self.de.ch_is(b']') {
-            self.de.bump();
-            Ok(())
-        } else if self.de.eof() {
-            Err(self.de.error(ErrorCode::EOFWhileParsingList))
-        } else {
-            Err(self.de.error(ErrorCode::TrailingCharacters))
-        }
-    }
-}
-
-struct EnumVisitor<'a, Iter: 'a> {
-    de: &'a mut Deserializer<Iter>,
-}
-
-impl<'a, Iter> de::EnumVisitor for EnumVisitor<'a, Iter>
-    where Iter: Iterator<Item=u8>,
-{
-    type Error = Error;
-
-    fn visit_unit(&mut self) -> Result<(), Error> {
-        de::Deserialize::deserialize(self.de)
-    }
-
-    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::EnumSeqVisitor,
-    {
-        self.de.parse_whitespace();
-
-        if self.de.ch_is(b'[') {
-            self.de.bump();
-            visitor.visit(SeqVisitor::new(self.de))
-        } else {
-            Err(self.de.error(ErrorCode::ExpectedSomeValue))
-        }
-    }
-
-    fn visit_map<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::EnumMapVisitor,
-    {
-        self.de.parse_whitespace();
-
-        if self.de.ch_is(b'{') {
-            self.de.bump();
-            visitor.visit(MapVisitor::new(self.de))
-        } else {
-            Err(self.de.error(ErrorCode::ExpectedSomeValue))
-        }
-    }
-}
-
-/// Decodes a json value from an `Iterator<u8>`.
-pub fn from_iter<I, T>(iter: I) -> Result<T, Error>
-    where I: Iterator<Item=u8>,
-          T: de::Deserialize
-{
-    let mut de = Deserializer::new(iter);
-    let value = try!(de::Deserialize::deserialize(&mut de));
-
-    // Make sure the whole stream has been consumed.
-    try!(de.end());
-    Ok(value)
-}
-
-/// Decodes a json value from a string
-pub fn from_str<'a, T>(s: &'a str) -> Result<T, Error>
-    where T: de::Deserialize
-{
-    from_iter(s.bytes())
-}

src/json/error.rs

@@ -1,160 +0,0 @@
-use std::error;
-use std::fmt;
-use std::io;
-
-use de;
-
-/// The errors that can arise while parsing a JSON stream.
-#[derive(Copy, Clone, PartialEq)]
-pub enum ErrorCode {
-    EOFWhileParsingList,
-    EOFWhileParsingObject,
-    EOFWhileParsingString,
-    EOFWhileParsingValue,
-    ExpectedColon,
-    ExpectedConversion,
-    ExpectedEnumEnd,
-    ExpectedEnumEndToken,
-    ExpectedEnumMapStart,
-    ExpectedEnumToken,
-    ExpectedEnumVariantString,
-    ExpectedListCommaOrEnd,
-    ExpectedName,
-    ExpectedObjectCommaOrEnd,
-    ExpectedSomeIdent,
-    ExpectedSomeValue,
-    InvalidEscape,
-    InvalidNumber,
-    InvalidUnicodeCodePoint,
-    KeyMustBeAString,
-    LoneLeadingSurrogateInHexEscape,
-    MissingField(&'static str),
-    NotFourDigit,
-    NotUtf8,
-    TrailingCharacters,
-    UnexpectedEndOfHexEscape,
-    UnknownVariant,
-    UnrecognizedHex,
-}
-
-impl fmt::Debug for ErrorCode {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use std::fmt::Debug;
-
-        match *self {
-            //ErrorCode::ConversionError(ref token) => write!(f, "failed to convert {}", token),
-            ErrorCode::EOFWhileParsingList => "EOF While parsing list".fmt(f),
-            ErrorCode::EOFWhileParsingObject => "EOF While parsing object".fmt(f),
-            ErrorCode::EOFWhileParsingString => "EOF While parsing string".fmt(f),
-            ErrorCode::EOFWhileParsingValue => "EOF While parsing value".fmt(f),
-            ErrorCode::ExpectedColon => "expected `:`".fmt(f),
-            ErrorCode::ExpectedConversion => "expected conversion".fmt(f),
-            ErrorCode::ExpectedEnumEnd => "expected enum end".fmt(f),
-            ErrorCode::ExpectedEnumEndToken => "expected enum map end".fmt(f),
-            ErrorCode::ExpectedEnumMapStart => "expected enum map start".fmt(f),
-            ErrorCode::ExpectedEnumToken => "expected enum token".fmt(f),
-            ErrorCode::ExpectedEnumVariantString => "expected variant".fmt(f),
-            ErrorCode::ExpectedListCommaOrEnd => "expected `,` or `]`".fmt(f),
-            ErrorCode::ExpectedName => "expected name".fmt(f),
-            ErrorCode::ExpectedObjectCommaOrEnd => "expected `,` or `}`".fmt(f),
-            ErrorCode::ExpectedSomeIdent => "expected ident".fmt(f),
-            ErrorCode::ExpectedSomeValue => "expected value".fmt(f),
-            //ErrorCode::ExpectedTokens(ref token, tokens) => write!(f, "expected {}, found {}", tokens, token),
-            ErrorCode::InvalidEscape => "invalid escape".fmt(f),
-            ErrorCode::InvalidNumber => "invalid number".fmt(f),
-            ErrorCode::InvalidUnicodeCodePoint => "invalid unicode code point".fmt(f),
-            ErrorCode::KeyMustBeAString => "key must be a string".fmt(f),
-            ErrorCode::LoneLeadingSurrogateInHexEscape => "lone leading surrogate in hex escape".fmt(f),
-            ErrorCode::MissingField(ref field) => write!(f, "missing field \"{}\"", field),
-            ErrorCode::NotFourDigit => "invalid \\u escape (not four digits)".fmt(f),
-            ErrorCode::NotUtf8 => "contents not utf-8".fmt(f),
-            ErrorCode::TrailingCharacters => "trailing characters".fmt(f),
-            ErrorCode::UnexpectedEndOfHexEscape => "unexpected end of hex escape".fmt(f),
-            //ErrorCode::UnexpectedName(ref name) => write!(f, "unexpected name {}", name),
-            ErrorCode::UnknownVariant => "unknown variant".fmt(f),
-            ErrorCode::UnrecognizedHex => "invalid \\u escape (unrecognized hex)".fmt(f),
-        }
-    }
-}
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum Error {
-    /// msg, line, col
-    SyntaxError(ErrorCode, usize, usize),
-    IoError(io::Error),
-    /*
-    ExpectedError(String, String),
-    */
-    MissingFieldError(&'static str),
-    /*
-    UnknownVariantError(String),
-    */
-}
-
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        match *self {
-            Error::SyntaxError(..) => "syntax error",
-            Error::IoError(ref error) => error.description(),
-            /*
-            Error::ExpectedError(ref expected, _) => &expected,
-            */
-            Error::MissingFieldError(_) => "missing field",
-            /*
-            Error::UnknownVariantError(_) => "unknown variant",
-            */
-        }
-    }
-
-    fn cause(&self) -> Option<&error::Error> {
-        match *self {
-            Error::IoError(ref error) => Some(error),
-            _ => None,
-        }
-    }
-
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Error::SyntaxError(ref code, line, col) => {
-                write!(fmt, "{:?} at line {} column {}", code, line, col)
-            }
-            Error::IoError(ref error) => fmt::Display::fmt(error, fmt),
-            /*
-            Error::ExpectedError(ref expected, ref found) => {
-                Some(format!("expected {}, found {}", expected, found))
-            }
-            */
-            Error::MissingFieldError(ref field) => {
-                write!(fmt, "missing field {}", field)
-            }
-            /*
-            Error::UnknownVariantError(ref variant) => {
-                Some(format!("unknown variant {}", variant))
-            }
-            */
-        }
-    }
-}
-
-impl error::FromError<io::Error> for Error {
-    fn from_error(error: io::Error) -> Error {
-        Error::IoError(error)
-    }
-}
-
-impl de::Error for Error {
-    fn syntax_error() -> Error {
-        Error::SyntaxError(ErrorCode::ExpectedSomeValue, 0, 0)
-    }
-
-    fn end_of_stream_error() -> Error {
-        Error::SyntaxError(ErrorCode::EOFWhileParsingValue, 0, 0)
-    }
-
-    fn missing_field_error(field: &'static str) -> Error {
-        Error::MissingFieldError(field)
-    }
-}

src/json/mod.rs

@@ -1,19 +0,0 @@
-pub use self::de::{Deserializer, from_str};
-pub use self::error::{Error, ErrorCode};
-pub use self::ser::{
-    Serializer,
-    to_writer,
-    to_writer_pretty,
-    to_vec,
-    to_vec_pretty,
-    to_string,
-    to_string_pretty,
-    escape_str,
-};
-pub use self::value::{Value, to_value, from_value};
-
-pub mod builder;
-pub mod de;
-pub mod error;
-pub mod ser;
-pub mod value;

src/json/ser.rs

@@ -1,457 +0,0 @@
-use std::{f32, f64};
-use std::io;
-use std::num::{Float, FpCategory};
-use std::string::FromUtf8Error;
-
-use ser;
-
-/// A structure for implementing serialization to JSON.
-pub struct Serializer<W> {
-    writer: W,
-    format: Format,
-    current_indent: usize,
-    indent: usize,
-}
-
-#[derive(Copy, PartialEq)]
-enum Format {
-    Compact,
-    Pretty,
-}
-
-impl<W: io::Write> Serializer<W> {
-    /// Creates a new JSON visitr whose output will be written to the writer
-    /// specified.
-    #[inline]
-    pub fn new(writer: W) -> Serializer<W> {
-        Serializer {
-            writer: writer,
-            format: Format::Compact,
-            current_indent: 0,
-            indent: 0,
-        }
-    }
-
-    /// Creates a new JSON visitr whose output will be written to the writer
-    /// specified.
-    #[inline]
-    pub fn new_pretty(writer: W) -> Serializer<W> {
-        Serializer {
-            writer: writer,
-            format: Format::Pretty,
-            current_indent: 0,
-            indent: 2,
-        }
-    }
-
-    /// Unwrap the `Writer` from the `Serializer`.
-    #[inline]
-    pub fn into_inner(self) -> W {
-        self.writer
-    }
-}
-
-impl<W: io::Write> ser::Serializer for Serializer<W> {
-    type Value = ();
-    type Error = io::Error;
-
-    #[inline]
-    fn visit<T>(&mut self, value: &T) -> io::Result<()>
-        where T: ser::Serialize,
-    {
-        value.visit(&mut Visitor {
-            writer: &mut self.writer,
-            format: self.format,
-            current_indent: self.current_indent,
-            indent: self.indent,
-        })
-    }
-}
-
-struct Visitor<'a, W: 'a> {
-    writer: &'a mut W,
-    format: Format,
-    current_indent: usize,
-    indent: usize,
-}
-
-impl<'a, W> Visitor<'a, W> where W: io::Write, {
-    fn serialize_sep(&mut self, first: bool) -> io::Result<()> {
-        match self.format {
-            Format::Compact => {
-                if first {
-                    Ok(())
-                } else {
-                    self.writer.write_all(b",")
-                }
-            }
-            Format::Pretty => {
-                if first {
-                    self.current_indent += self.indent;
-                    try!(self.writer.write_all(b"\n"));
-                } else {
-                    try!(self.writer.write_all(b",\n"));
-                }
-
-                spaces(&mut self.writer, self.current_indent)
-            }
-        }
-    }
-
-    fn serialize_colon(&mut self) -> io::Result<()> {
-        match self.format {
-            Format::Compact => self.writer.write_all(b":"),
-            Format::Pretty => self.writer.write_all(b": "),
-        }
-    }
-
-    fn serialize_end(&mut self, current_indent: usize, s: &[u8]) -> io::Result<()> {
-        if self.format == Format::Pretty && current_indent != self.current_indent {
-            self.current_indent -= self.indent;
-            try!(self.writer.write(b"\n"));
-            try!(spaces(&mut self.writer, self.current_indent));
-        }
-
-        self.writer.write_all(s)
-    }
-}
-
-impl<'a, W> ser::Visitor for Visitor<'a, W> where W: io::Write, {
-    type Value = ();
-    type Error = io::Error;
-
-    #[inline]
-    fn visit_bool(&mut self, value: bool) -> io::Result<()> {
-        if value {
-            self.writer.write_all(b"true")
-        } else {
-            self.writer.write_all(b"false")
-        }
-    }
-
-    #[inline]
-    fn visit_isize(&mut self, value: isize) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_i8(&mut self, value: i8) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_i16(&mut self, value: i16) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_i32(&mut self, value: i32) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_i64(&mut self, value: i64) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_usize(&mut self, value: usize) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_u8(&mut self, value: u8) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_u16(&mut self, value: u16) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_u32(&mut self, value: u32) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_u64(&mut self, value: u64) -> io::Result<()> {
-        write!(self.writer, "{}", value)
-    }
-
-    #[inline]
-    fn visit_f32(&mut self, value: f32) -> io::Result<()> {
-        fmt_f32_or_null(self.writer, value)
-    }
-
-    #[inline]
-    fn visit_f64(&mut self, value: f64) -> io::Result<()> {
-        fmt_f64_or_null(self.writer, value)
-    }
-
-    #[inline]
-    fn visit_char(&mut self, value: char) -> io::Result<()> {
-        escape_char(self.writer, value)
-    }
-
-    #[inline]
-    fn visit_str(&mut self, value: &str) -> io::Result<()> {
-        escape_str(self.writer, value)
-    }
-
-    #[inline]
-    fn visit_none(&mut self) -> io::Result<()> {
-        self.visit_unit()
-    }
-
-    #[inline]
-    fn visit_some<V>(&mut self, value: V) -> io::Result<()>
-        where V: ser::Serialize
-    {
-        value.visit(self)
-    }
-
-    #[inline]
-    fn visit_unit(&mut self) -> io::Result<()> {
-        self.writer.write_all(b"null")
-    }
-
-    #[inline]
-    fn visit_enum_unit(&mut self, _name: &str, variant: &str) -> io::Result<()> {
-        let current_indent = self.current_indent;
-
-        try!(self.writer.write_all(b"{"));
-        try!(self.serialize_sep(true));
-        try!(self.visit_str(variant));
-        try!(self.serialize_colon());
-        try!(self.writer.write_all(b"[]"));
-        self.serialize_end(current_indent, b"}")
-    }
-
-    #[inline]
-    fn visit_seq<V>(&mut self, mut visitor: V) -> io::Result<()>
-        where V: ser::SeqVisitor,
-    {
-        let current_indent = self.current_indent;
-
-        try!(self.writer.write_all(b"["));
-
-        while let Some(()) = try!(visitor.visit(self)) { }
-
-        self.serialize_end(current_indent, b"]")
-    }
-
-    #[inline]
-    fn visit_enum_seq<V>(&mut self, _name: &str, variant: &str, visitor: V) -> io::Result<()>
-        where V: ser::SeqVisitor,
-    {
-        let current_indent = self.current_indent;
-
-        try!(self.writer.write_all(b"{"));
-        try!(self.serialize_sep(true));
-        try!(self.visit_str(variant));
-        try!(self.serialize_colon());
-        try!(self.visit_seq(visitor));
-        self.serialize_end(current_indent, b"}")
-    }
-
-    #[inline]
-    fn visit_seq_elt<T>(&mut self, first: bool, value: T) -> io::Result<()>
-        where T: ser::Serialize,
-    {
-        try!(self.serialize_sep(first));
-
-        value.visit(self)
-    }
-
-    #[inline]
-    fn visit_map<V>(&mut self, mut visitor: V) -> io::Result<()>
-        where V: ser::MapVisitor,
-    {
-        let current_indent = self.current_indent;
-
-        try!(self.writer.write_all(b"{"));
-
-        while let Some(()) = try!(visitor.visit(self)) { }
-
-        self.serialize_end(current_indent, b"}")
-    }
-
-    #[inline]
-    fn visit_enum_map<V>(&mut self, _name: &str, variant: &str, visitor: V) -> io::Result<()>
-        where V: ser::MapVisitor,
-    {
-        let current_indent = self.current_indent;
-
-        try!(self.writer.write_all(b"{"));
-        try!(self.serialize_sep(true));
-        try!(self.visit_str(variant));
-        try!(self.serialize_colon());
-        try!(self.visit_map(visitor));
-        self.serialize_end(current_indent, b"}")
-    }
-
-    #[inline]
-    fn visit_map_elt<K, V>(&mut self, first: bool, key: K, value: V) -> io::Result<()>
-        where K: ser::Serialize,
-              V: ser::Serialize,
-    {
-        try!(self.serialize_sep(first));
-        try!(key.visit(self));
-        try!(self.serialize_colon());
-        value.visit(self)
-    }
-}
-
-#[inline]
-pub fn escape_bytes<W>(wr: &mut W, bytes: &[u8]) -> io::Result<()>
-    where W: io::Write
-{
-    try!(wr.write_all(b"\""));
-
-    let mut start = 0;
-
-    for (i, byte) in bytes.iter().enumerate() {
-        let escaped = match *byte {
-            b'"' => b"\\\"",
-            b'\\' => b"\\\\",
-            b'\x08' => b"\\b",
-            b'\x0c' => b"\\f",
-            b'\n' => b"\\n",
-            b'\r' => b"\\r",
-            b'\t' => b"\\t",
-            _ => { continue; }
-        };
-
-        if start < i {
-            try!(wr.write_all(&bytes[start..i]));
-        }
-
-        try!(wr.write_all(escaped));
-
-        start = i + 1;
-    }
-
-    if start != bytes.len() {
-        try!(wr.write_all(&bytes[start..]));
-    }
-
-    try!(wr.write_all(b"\""));
-    Ok(())
-}
-
-#[inline]
-pub fn escape_str<W>(wr: &mut W, value: &str) -> io::Result<()>
-    where W: io::Write
-{
-    escape_bytes(wr, value.as_bytes())
-}
-
-#[inline]
-fn escape_char<W>(wr: &mut W, value: char) -> io::Result<()>
-    where W: io::Write
-{
-    let buf = &mut [0; 4];
-    value.encode_utf8(buf);
-    escape_bytes(wr, buf)
-}
-
-fn fmt_f32_or_null<W>(wr: &mut W, value: f32) -> io::Result<()>
-    where W: io::Write
-{
-    match value.classify() {
-        FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null"),
-        _ => wr.write_all(f32::to_str_digits(value, 6).as_bytes()),
-    }
-}
-
-fn fmt_f64_or_null<W>(wr: &mut W, value: f64) -> io::Result<()>
-    where W: io::Write
-{
-    match value.classify() {
-        FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null"),
-        _ => wr.write_all(f64::to_str_digits(value, 6).as_bytes()),
-    }
-}
-
-/// Encode the specified struct into a json `[u8]` writer.
-#[inline]
-pub fn to_writer<W, T>(writer: &mut W, value: &T) -> io::Result<()>
-    where W: io::Write,
-          T: ser::Serialize,
-{
-    let mut ser = Serializer::new(writer);
-    try!(ser::Serializer::visit(&mut ser, value));
-    Ok(())
-}
-
-/// Encode the specified struct into a json `[u8]` writer.
-#[inline]
-pub fn to_writer_pretty<W, T>(writer: &mut W, value: &T) -> io::Result<()>
-    where W: io::Write,
-          T: ser::Serialize,
-{
-    let mut ser = Serializer::new_pretty(writer);
-    try!(ser::Serializer::visit(&mut ser, value));
-    Ok(())
-}
-
-/// Encode the specified struct into a json `[u8]` buffer.
-#[inline]
-pub fn to_vec<T>(value: &T) -> Vec<u8>
-    where T: ser::Serialize,
-{
-    // We are writing to a Vec, which doesn't fail. So we can ignore
-    // the error.
-    let mut writer = Vec::with_capacity(128);
-    to_writer(&mut writer, value).unwrap();
-    writer
-}
-
-/// Encode the specified struct into a json `[u8]` buffer.
-#[inline]
-pub fn to_vec_pretty<T>(value: &T) -> Vec<u8>
-    where T: ser::Serialize,
-{
-    // We are writing to a Vec, which doesn't fail. So we can ignore
-    // the error.
-    let mut writer = Vec::with_capacity(128);
-    to_writer_pretty(&mut writer, value).unwrap();
-    writer
-}
-
-/// Encode the specified struct into a json `String` buffer.
-#[inline]
-pub fn to_string<T>(value: &T) -> Result<String, FromUtf8Error>
-    where T: ser::Serialize
-{
-    let vec = to_vec(value);
-    String::from_utf8(vec)
-}
-
-/// Encode the specified struct into a json `String` buffer.
-#[inline]
-pub fn to_string_pretty<T>(value: &T) -> Result<String, FromUtf8Error>
-    where T: ser::Serialize
-{
-    let vec = to_vec_pretty(value);
-    String::from_utf8(vec)
-}
-
-fn spaces<W>(wr: &mut W, mut n: usize) -> io::Result<()>
-    where W: io::Write,
-{
-    const LEN: usize = 16;
-    const BUF: &'static [u8; LEN] = &[b' '; 16];
-
-    while n >= LEN {
-        try!(wr.write_all(BUF));
-        n -= LEN;
-    }
-
-    if n > 0 {
-        wr.write_all(&BUF[..n])
-    } else {
-        Ok(())
-    }
-}

src/json/value.rs

@@ -1,604 +0,0 @@
-use std::collections::{BTreeMap, btree_map};
-use std::fmt;
-use std::io;
-use std::str;
-use std::vec;
-
-use de;
-use ser;
-use super::error::Error;
-
-#[derive(Clone, PartialEq)]
-pub enum Value {
-    Null,
-    Bool(bool),
-    I64(i64),
-    F64(f64),
-    String(String),
-    Array(Vec<Value>),
-    Object(BTreeMap<String, Value>),
-}
-
-impl ser::Serialize for Value {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: ser::Visitor,
-    {
-        match *self {
-            Value::Null => visitor.visit_unit(),
-            Value::Bool(v) => visitor.visit_bool(v),
-            Value::I64(v) => visitor.visit_i64(v),
-            Value::F64(v) => visitor.visit_f64(v),
-            Value::String(ref v) => visitor.visit_str(&v),
-            Value::Array(ref v) => v.visit(visitor),
-            Value::Object(ref v) => v.visit(visitor),
-        }
-    }
-}
-
-impl de::Deserialize for Value {
-    #[inline]
-    fn deserialize<D>(deserializer: &mut D) -> Result<Value, D::Error>
-        where D: de::Deserializer,
-    {
-        struct ValueVisitor;
-
-        impl de::Visitor for ValueVisitor {
-            type Value = Value;
-
-            #[inline]
-            fn visit_bool<E>(&mut self, value: bool) -> Result<Value, E> {
-                Ok(Value::Bool(value))
-            }
-
-            #[inline]
-            fn visit_i64<E>(&mut self, value: i64) -> Result<Value, E> {
-                Ok(Value::I64(value))
-            }
-
-            #[inline]
-            fn visit_f64<E>(&mut self, value: f64) -> Result<Value, E> {
-                Ok(Value::F64(value))
-            }
-
-            #[inline]
-            fn visit_str<E>(&mut self, value: &str) -> Result<Value, E>
-                where E: de::Error,
-            {
-                self.visit_string(value.to_string())
-            }
-
-            #[inline]
-            fn visit_string<E>(&mut self, value: String) -> Result<Value, E> {
-                Ok(Value::String(value))
-            }
-
-            #[inline]
-            fn visit_none<E>(&mut self) -> Result<Value, E> {
-                Ok(Value::Null)
-            }
-
-            #[inline]
-            fn visit_some<D>(&mut self, deserializer: &mut D) -> Result<Value, D::Error>
-                where D: de::Deserializer,
-            {
-                de::Deserialize::deserialize(deserializer)
-            }
-
-            #[inline]
-            fn visit_unit<E>(&mut self) -> Result<Value, E> {
-                Ok(Value::Null)
-            }
-
-            #[inline]
-            fn visit_seq<V>(&mut self, visitor: V) -> Result<Value, V::Error>
-                where V: de::SeqVisitor,
-            {
-                let values = try!(de::VecVisitor::new().visit_seq(visitor));
-                Ok(Value::Array(values))
-            }
-
-            #[inline]
-            fn visit_map<V>(&mut self, visitor: V) -> Result<Value, V::Error>
-                where V: de::MapVisitor,
-            {
-                let values = try!(de::BTreeMapVisitor::new().visit_map(visitor));
-                Ok(Value::Object(values))
-            }
-        }
-
-        deserializer.visit(ValueVisitor)
-    }
-}
-
-struct WriterFormatter<'a, 'b: 'a> {
-    inner: &'a mut fmt::Formatter<'b>,
-}
-
-impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        match self.inner.write_str(str::from_utf8(buf).unwrap()) {
-            Ok(_) => Ok(buf.len()),
-            Err(_) => Err(io::Error::last_os_error()),
-        }
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-impl fmt::Debug for Value {
-    /// Serializes a json value into a string
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut wr = WriterFormatter { inner: f };
-        super::ser::to_writer(&mut wr, self).map_err(|_| fmt::Error)
-    }
-}
-
-#[derive(Debug)]
-enum State {
-    Value(Value),
-    Array(Vec<Value>),
-    Object(BTreeMap<String, Value>),
-}
-
-pub struct Serializer {
-    state: Vec<State>,
-}
-
-impl Serializer {
-    pub fn new() -> Serializer {
-        Serializer {
-            state: Vec::with_capacity(4),
-        }
-    }
-
-    pub fn unwrap(mut self) -> Value {
-        match self.state.pop().unwrap() {
-            State::Value(value) => value,
-            state => panic!("expected value, found {:?}", state),
-        }
-    }
-}
-
-impl ser::Serializer for Serializer {
-    type Value = ();
-    type Error = ();
-
-    #[inline]
-    fn visit<T>(&mut self, value: &T) -> Result<(), ()>
-        where T: ser::Serialize,
-    {
-        try!(value.visit(self));
-        Ok(())
-    }
-}
-
-impl ser::Visitor for Serializer {
-    type Value = ();
-    type Error = ();
-
-    #[inline]
-    fn visit_bool(&mut self, value: bool) -> Result<(), ()> {
-        self.state.push(State::Value(Value::Bool(value)));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_i64(&mut self, value: i64) -> Result<(), ()> {
-        self.state.push(State::Value(Value::I64(value)));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_u64(&mut self, value: u64) -> Result<(), ()> {
-        self.state.push(State::Value(Value::I64(value as i64)));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_f64(&mut self, value: f64) -> Result<(), ()> {
-        self.state.push(State::Value(Value::F64(value as f64)));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_char(&mut self, value: char) -> Result<(), ()> {
-        self.state.push(State::Value(Value::String(value.to_string())));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_str(&mut self, value: &str) -> Result<(), ()> {
-        self.state.push(State::Value(Value::String(value.to_string())));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_none(&mut self) -> Result<(), ()> {
-        self.visit_unit()
-    }
-
-    #[inline]
-    fn visit_some<V>(&mut self, value: V) -> Result<(), ()>
-        where V: ser::Serialize,
-    {
-        value.visit(self)
-    }
-
-    #[inline]
-    fn visit_unit(&mut self) -> Result<(), ()> {
-        self.state.push(State::Value(Value::Null));
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_enum_unit(&mut self, _name: &str, variant: &str) -> Result<(), ()> {
-        let mut values = BTreeMap::new();
-        values.insert(variant.to_string(), Value::Array(vec![]));
-
-        self.state.push(State::Value(Value::Object(values)));
-
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<(), ()>
-        where V: ser::SeqVisitor,
-    {
-        let len = match visitor.size_hint() {
-            (_, Some(len)) => len,
-            (len, None) => len,
-        };
-
-        let values = Vec::with_capacity(len);
-
-        self.state.push(State::Array(values));
-
-        while let Some(()) = try!(visitor.visit(self)) { }
-
-        let values = match self.state.pop().unwrap() {
-            State::Array(values) => values,
-            state => panic!("Expected array, found {:?}", state),
-        };
-
-        self.state.push(State::Value(Value::Array(values)));
-
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_enum_seq<V>(&mut self, _name: &str, variant: &str, visitor: V) -> Result<(), ()>
-        where V: ser::SeqVisitor,
-    {
-        try!(self.visit_seq(visitor));
-
-        let value = match self.state.pop().unwrap() {
-            State::Value(value) => value,
-            state => panic!("expected value, found {:?}", state),
-        };
-
-        let mut object = BTreeMap::new();
-
-        object.insert(variant.to_string(), value);
-
-        self.state.push(State::Value(Value::Object(object)));
-
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_seq_elt<T>(&mut self, _first: bool, value: T) -> Result<(), ()>
-        where T: ser::Serialize,
-    {
-        try!(value.visit(self));
-
-        let value = match self.state.pop().unwrap() {
-            State::Value(value) => value,
-            state => panic!("expected value, found {:?}", state),
-        };
-
-        match *self.state.last_mut().unwrap() {
-            State::Array(ref mut values) => { values.push(value); }
-            ref state => panic!("expected array, found {:?}", state),
-        }
-
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_map<V>(&mut self, mut visitor: V) -> Result<(), ()>
-        where V: ser::MapVisitor,
-    {
-        let values = BTreeMap::new();
-
-        self.state.push(State::Object(values));
-
-        while let Some(()) = try!(visitor.visit(self)) { }
-
-        let values = match self.state.pop().unwrap() {
-            State::Object(values) => values,
-            state => panic!("expected object, found {:?}", state),
-        };
-
-        self.state.push(State::Value(Value::Object(values)));
-
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_enum_map<V>(&mut self, _name: &str, variant: &str, visitor: V) -> Result<(), ()>
-        where V: ser::MapVisitor,
-    {
-        try!(self.visit_map(visitor));
-
-        let value = match self.state.pop().unwrap() {
-            State::Value(value) => value,
-            state => panic!("expected value, found {:?}", state),
-        };
-
-        let mut object = BTreeMap::new();
-
-        object.insert(variant.to_string(), value);
-
-        self.state.push(State::Value(Value::Object(object)));
-
-        Ok(())
-    }
-
-    #[inline]
-    fn visit_map_elt<K, V>(&mut self, _first: bool, key: K, value: V) -> Result<(), ()>
-        where K: ser::Serialize,
-              V: ser::Serialize,
-    {
-        try!(key.visit(self));
-
-        let key = match self.state.pop().unwrap() {
-            State::Value(Value::String(value)) => value,
-            state => panic!("expected key, found {:?}", state),
-        };
-
-        try!(value.visit(self));
-
-        let value = match self.state.pop().unwrap() {
-            State::Value(value) => value,
-            state => panic!("expected value, found {:?}", state),
-        };
-
-        match *self.state.last_mut().unwrap() {
-            State::Object(ref mut values) => { values.insert(key, value); }
-            ref state => panic!("expected object, found {:?}", state),
-        }
-
-        Ok(())
-    }
-}
-
-pub struct Deserializer {
-    value: Option<Value>,
-}
-
-impl Deserializer {
-    /// Creates a new deserializer instance for deserializing the specified JSON value.
-    pub fn new(value: Value) -> Deserializer {
-        Deserializer {
-            value: Some(value),
-        }
-    }
-}
-
-impl de::Deserializer for Deserializer {
-    type Error = Error;
-
-    #[inline]
-    fn visit<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        let value = match self.value.take() {
-            Some(value) => value,
-            None => { return Err(de::Error::end_of_stream_error()); }
-        };
-
-        match value {
-            Value::Null => visitor.visit_unit(),
-            Value::Bool(v) => visitor.visit_bool(v),
-            Value::I64(v) => visitor.visit_i64(v),
-            Value::F64(v) => visitor.visit_f64(v),
-            Value::String(v) => visitor.visit_string(v),
-            Value::Array(v) => {
-                let len = v.len();
-                visitor.visit_seq(SeqDeserializer {
-                    de: self,
-                    iter: v.into_iter(),
-                    len: len,
-                })
-            }
-            Value::Object(v) => {
-                let len = v.len();
-                visitor.visit_map(MapDeserializer {
-                    de: self,
-                    iter: v.into_iter(),
-                    value: None,
-                    len: len,
-                })
-            }
-        }
-    }
-
-    #[inline]
-    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.value {
-            Some(Value::Null) => visitor.visit_none(),
-            Some(_) => visitor.visit_some(self),
-            None => Err(de::Error::end_of_stream_error()),
-        }
-    }
-
-    #[inline]
-    fn visit_enum<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        let value = match self.value.take() {
-            Some(Value::Object(value)) => value,
-            Some(_) => { return Err(de::Error::syntax_error()); }
-            None => { return Err(de::Error::end_of_stream_error()); }
-        };
-
-        let mut iter = value.into_iter();
-
-        let value = match iter.next() {
-            Some((variant, Value::Array(fields))) => {
-                let len = fields.len();
-                try!(visitor.visit_variant(&variant, SeqDeserializer {
-                    de: self,
-                    iter: fields.into_iter(),
-                    len: len,
-                }))
-            }
-            Some((variant, Value::Object(fields))) => {
-                let len = fields.len();
-                try!(visitor.visit_variant(&variant, MapDeserializer {
-                    de: self,
-                    iter: fields.into_iter(),
-                    value: None,
-                    len: len,
-                }))
-            }
-            Some(_) => { return Err(de::Error::syntax_error()); }
-            None => { return Err(de::Error::syntax_error()); }
-        };
-
-        match iter.next() {
-            Some(_) => Err(de::Error::syntax_error()),
-            None => Ok(value)
-        }
-    }
-}
-
-struct SeqDeserializer<'a> {
-    de: &'a mut Deserializer,
-    iter: vec::IntoIter<Value>,
-    len: usize,
-}
-
-impl<'a> de::SeqVisitor for SeqDeserializer<'a> {
-    type Error = Error;
-
-    fn visit<T>(&mut self) -> Result<Option<T>, Error>
-        where T: de::Deserialize
-    {
-        match self.iter.next() {
-            Some(value) => {
-                self.len -= 1;
-                self.de.value = Some(value);
-                Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-            }
-            None => Ok(None),
-        }
-    }
-
-    fn end(&mut self) -> Result<(), Error> {
-        if self.len == 0 {
-            Ok(())
-        } else {
-            Err(de::Error::end_of_stream_error())
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.len, Some(self.len))
-    }
-}
-
-impl<'a> de::EnumVisitor for SeqDeserializer<'a> {
-    type Error = Error;
-
-    fn visit_unit(&mut self) -> Result<(), Error> {
-        if self.len == 0 {
-            Ok(())
-        } else {
-            Err(de::Error::syntax_error())
-        }
-    }
-
-    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::EnumSeqVisitor,
-    {
-        visitor.visit(self)
-    }
-}
-
-struct MapDeserializer<'a> {
-    de: &'a mut Deserializer,
-    iter: btree_map::IntoIter<String, Value>,
-    value: Option<Value>,
-    len: usize,
-}
-
-impl<'a> de::MapVisitor for MapDeserializer<'a> {
-    type Error = Error;
-
-    fn visit_key<T>(&mut self) -> Result<Option<T>, Error>
-        where T: de::Deserialize
-    {
-        match self.iter.next() {
-            Some((key, value)) => {
-                self.len -= 1;
-                self.value = Some(value);
-                self.de.value = Some(Value::String(key));
-                Ok(Some(try!(de::Deserialize::deserialize(self.de))))
-            }
-            None => Ok(None),
-        }
-    }
-
-    fn visit_value<T>(&mut self) -> Result<T, Error>
-        where T: de::Deserialize
-    {
-        let value = self.value.take().unwrap();
-        self.de.value = Some(value);
-        Ok(try!(de::Deserialize::deserialize(self.de)))
-    }
-
-    fn end(&mut self) -> Result<(), Error> {
-        if self.len == 0 {
-            Ok(())
-        } else {
-            Err(de::Error::end_of_stream_error())
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.len, Some(self.len))
-    }
-}
-
-impl<'a> de::EnumVisitor for MapDeserializer<'a> {
-    type Error = Error;
-
-    fn visit_map<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::EnumMapVisitor,
-    {
-        visitor.visit(self)
-    }
-}
-
-/// Shortcut function to encode a `T` into a JSON `Value`
-pub fn to_value<T>(value: &T) -> Value
-    where T: ser::Serialize
-{
-    let mut ser = Serializer::new();
-    ser::Serializer::visit(&mut ser, value).ok().unwrap();
-    ser.unwrap()
-}
-
-/// Shortcut function to decode a JSON `Value` into a `T`
-pub fn from_value<T>(value: Value) -> Result<T, Error>
-    where T: de::Deserialize
-{
-    let mut de = Deserializer::new(value);
-    de::Deserialize::deserialize(&mut de)
-}

src/lib.rs

@@ -1,10 +0,0 @@
-#![feature(core, io, path, std_misc, unicode)]
-
-extern crate unicode;
-
-pub use ser::{Serialize, Serializer};
-pub use de::{Deserialize, Deserializer, Error};
-
-pub mod ser;
-pub mod de;
-pub mod json;

src/ser.rs

@@ -1,660 +0,0 @@
-use std::collections::hash_state::HashState;
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
-use std::hash::Hash;
-use std::path;
-use std::rc::Rc;
-use std::str;
-use std::sync::Arc;
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait Serialize {
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait Serializer {
-    type Value;
-    type Error;
-
-    fn visit<T>(&mut self, value: &T) -> Result<Self::Value, Self::Error>
-        where T: Serialize;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub trait Visitor {
-    type Value;
-    type Error;
-
-    fn visit_bool(&mut self, v: bool) -> Result<Self::Value, Self::Error>;
-
-    #[inline]
-    fn visit_isize(&mut self, v: isize) -> Result<Self::Value, Self::Error> {
-        self.visit_i64(v as i64)
-    }
-
-    #[inline]
-    fn visit_i8(&mut self, v: i8) -> Result<Self::Value, Self::Error> {
-        self.visit_i64(v as i64)
-    }
-
-    #[inline]
-    fn visit_i16(&mut self, v: i16) -> Result<Self::Value, Self::Error> {
-        self.visit_i64(v as i64)
-    }
-
-    #[inline]
-    fn visit_i32(&mut self, v: i32) -> Result<Self::Value, Self::Error> {
-        self.visit_i64(v as i64)
-    }
-
-    #[inline]
-    fn visit_i64(&mut self, v: i64) -> Result<Self::Value, Self::Error>;
-
-    #[inline]
-    fn visit_usize(&mut self, v: usize) -> Result<Self::Value, Self::Error> {
-        self.visit_u64(v as u64)
-    }
-
-    #[inline]
-    fn visit_u8(&mut self, v: u8) -> Result<Self::Value, Self::Error> {
-        self.visit_u64(v as u64)
-    }
-
-    #[inline]
-    fn visit_u16(&mut self, v: u16) -> Result<Self::Value, Self::Error> {
-        self.visit_u64(v as u64)
-    }
-
-    #[inline]
-    fn visit_u32(&mut self, v: u32) -> Result<Self::Value, Self::Error> {
-        self.visit_u64(v as u64)
-    }
-
-    #[inline]
-    fn visit_u64(&mut self, v: u64) -> Result<Self::Value, Self::Error>;
-
-    #[inline]
-    fn visit_f32(&mut self, v: f32) -> Result<Self::Value, Self::Error> {
-        self.visit_f64(v as f64)
-    }
-
-    fn visit_f64(&mut self, v: f64) -> Result<Self::Value, Self::Error>;
-
-    #[inline]
-    fn visit_char(&mut self, v: char) -> Result<Self::Value, Self::Error> {
-        // The unwraps in here should be safe.
-        let mut s = &mut [0; 4];
-        let len = v.encode_utf8(s).unwrap();
-        self.visit_str(str::from_utf8(&s[..len]).unwrap())
-    }
-
-    fn visit_str(&mut self, value: &str) -> Result<Self::Value, Self::Error>;
-
-    fn visit_unit(&mut self) -> Result<Self::Value, Self::Error>;
-
-    #[inline]
-    fn visit_named_unit(&mut self, _name: &str) -> Result<Self::Value, Self::Error> {
-        self.visit_unit()
-    }
-
-    #[inline]
-    fn visit_enum_unit(&mut self,
-                       _name: &str,
-                       _variant: &str) -> Result<Self::Value, Self::Error> {
-        self.visit_unit()
-    }
-
-    fn visit_none(&mut self) -> Result<Self::Value, Self::Error>;
-
-    fn visit_some<V>(&mut self, value: V) -> Result<Self::Value, Self::Error>
-        where V: Serialize;
-
-    fn visit_seq<V>(&mut self, visitor: V) -> Result<Self::Value, Self::Error>
-        where V: SeqVisitor;
-
-    #[inline]
-    fn visit_named_seq<V>(&mut self,
-                          _name: &'static str,
-                          visitor: V) -> Result<Self::Value, Self::Error>
-        where V: SeqVisitor,
-    {
-        self.visit_seq(visitor)
-    }
-
-    #[inline]
-    fn visit_enum_seq<V>(&mut self,
-                         _name: &'static str,
-                         _variant: &'static str,
-                         visitor: V) -> Result<Self::Value, Self::Error>
-        where V: SeqVisitor,
-    {
-        self.visit_seq(visitor)
-    }
-
-    fn visit_seq_elt<T>(&mut self,
-                        first: bool,
-                        value: T) -> Result<Self::Value, Self::Error>
-        where T: Serialize;
-
-    fn visit_map<V>(&mut self, visitor: V) -> Result<Self::Value, Self::Error>
-        where V: MapVisitor;
-
-    #[inline]
-    fn visit_named_map<V>(&mut self,
-                          _name: &'static str,
-                          visitor: V) -> Result<Self::Value, Self::Error>
-        where V: MapVisitor,
-    {
-        self.visit_map(visitor)
-    }
-
-    #[inline]
-    fn visit_enum_map<V>(&mut self,
-                          _name: &'static str,
-                          _variant: &'static str,
-                          visitor: V) -> Result<Self::Value, Self::Error>
-        where V: MapVisitor,
-    {
-        self.visit_map(visitor)
-    }
-
-    fn visit_map_elt<K, V>(&mut self,
-                           first: bool,
-                           key: K,
-                           value: V) -> Result<Self::Value, Self::Error>
-        where K: Serialize,
-              V: Serialize;
-}
-
-pub trait SeqVisitor {
-    fn visit<V>(&mut self, visitor: &mut V) -> Result<Option<V::Value>, V::Error>
-        where V: Visitor;
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, None)
-    }
-}
-
-pub trait MapVisitor {
-    fn visit<V>(&mut self, visitor: &mut V) -> Result<Option<V::Value>, V::Error>
-        where V: Visitor;
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, None)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-macro_rules! impl_visit {
-    ($ty:ty, $method:ident) => {
-        impl Serialize for $ty {
-            #[inline]
-            fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-                where V: Visitor,
-            {
-                visitor.$method(*self)
-            }
-        }
-    }
-}
-
-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<'a> Serialize for &'a str {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        visitor.visit_str(*self)
-    }
-}
-
-impl Serialize for String {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (&self[..]).visit(visitor)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl<T> Serialize for Option<T> where T: Serialize {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        match *self {
-            Some(ref value) => visitor.visit_some(value),
-            None => visitor.visit_none(),
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub struct SeqIteratorVisitor<Iter> {
-    iter: Iter,
-    first: bool,
-}
-
-impl<T, Iter> SeqIteratorVisitor<Iter>
-    where Iter: Iterator<Item=T>
-{
-    #[inline]
-    pub fn new(iter: Iter) -> SeqIteratorVisitor<Iter> {
-        SeqIteratorVisitor {
-            iter: iter,
-            first: true,
-        }
-    }
-}
-
-impl<T, Iter> SeqVisitor for SeqIteratorVisitor<Iter>
-    where T: Serialize,
-          Iter: Iterator<Item=T>,
-{
-    #[inline]
-    fn visit<V>(&mut self, visitor: &mut V) -> Result<Option<V::Value>, V::Error>
-        where V: Visitor,
-    {
-        let first = self.first;
-        self.first = false;
-
-        match self.iter.next() {
-            Some(value) => {
-                let value = try!(visitor.visit_seq_elt(first, value));
-                Ok(Some(value))
-            }
-            None => Ok(None),
-        }
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl<'a, T> Serialize for &'a [T]
-    where T: Serialize,
-{
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        visitor.visit_seq(SeqIteratorVisitor::new(self.iter()))
-    }
-}
-
-impl<T> Serialize for Vec<T> where T: Serialize {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (&self[..]).visit(visitor)
-    }
-}
-
-impl<T> Serialize for BTreeSet<T> where T: Serialize {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        visitor.visit_seq(SeqIteratorVisitor::new(self.iter()))
-    }
-}
-
-impl<T, S> Serialize for HashSet<T, S>
-    where T: Serialize + Eq + Hash,
-          S: HashState,
-{
-    #[inline]
-    fn visit<V: Visitor>(&self, visitor: &mut V) -> Result<V::Value, V::Error> {
-        visitor.visit_seq(SeqIteratorVisitor::new(self.iter()))
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl Serialize for () {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        visitor.visit_unit()
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-// FIXME(rust #19630) Remove this work-around
-macro_rules! e {
-    ($e:expr) => { $e }
-}
-
-macro_rules! tuple_impls {
-    ($(
-        $TupleVisitor:ident ($len:expr, $($T:ident),+) {
-            $($state:pat => $idx:tt,)+
-        }
-    )+) => {
-        $(
-            pub struct $TupleVisitor<'a, $($T: 'a),+> {
-                tuple: &'a ($($T,)+),
-                state: u8,
-                first: bool,
-            }
-
-            impl<'a, $($T: 'a),+> $TupleVisitor<'a, $($T),+> {
-                pub fn new(tuple: &'a ($($T,)+)) -> $TupleVisitor<'a, $($T),+> {
-                    $TupleVisitor {
-                        tuple: tuple,
-                        state: 0,
-                        first: true,
-                    }
-                }
-            }
-
-            impl<'a, $($T),+> SeqVisitor for $TupleVisitor<'a, $($T),+>
-                where $($T: Serialize),+
-            {
-                fn visit<V>(&mut self, visitor: &mut V) -> Result<Option<V::Value>, V::Error>
-                    where V: Visitor,
-                {
-                    let first = self.first;
-                    self.first = false;
-
-                    match self.state {
-                        $(
-                            $state => {
-                                self.state += 1;
-                                Ok(Some(try!(visitor.visit_seq_elt(first, &e!(self.tuple.$idx)))))
-                            }
-                        )+
-                        _ => {
-                            Ok(None)
-                        }
-                    }
-                }
-
-                fn size_hint(&self) -> (usize, Option<usize>) {
-                    ($len, Some($len))
-                }
-            }
-
-            impl<$($T),+> Serialize for ($($T,)+)
-                where $($T: Serialize),+
-            {
-                #[inline]
-                fn visit<V: Visitor>(&self, visitor: &mut V) -> Result<V::Value, V::Error> {
-                    visitor.visit_seq($TupleVisitor::new(self))
-                }
-            }
-        )+
-    }
-}
-
-tuple_impls! {
-    TupleVisitor1 (1, T0) {
-        0 => 0,
-    }
-    TupleVisitor2 (2, T0, T1) {
-        0 => 0,
-        1 => 1,
-    }
-    TupleVisitor3 (3, T0, T1, T2) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-    }
-    TupleVisitor4 (4, T0, T1, T2, T3) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-    }
-    TupleVisitor5 (5, T0, T1, T2, T3, T4) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-    }
-    TupleVisitor6 (6, T0, T1, T2, T3, T4, T5) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-    }
-    TupleVisitor7 (7, T0, T1, T2, T3, T4, T5, T6) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-    }
-    TupleVisitor8 (8, T0, T1, T2, T3, T4, T5, T6, T7) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-    }
-    TupleVisitor9 (9, T0, T1, T2, T3, T4, T5, T6, T7, T8) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-    }
-    TupleVisitor10 (10, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-    }
-    TupleVisitor11 (11, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-    }
-    TupleVisitor12 (12, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) {
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-pub struct MapIteratorVisitor<Iter> {
-    iter: Iter,
-    first: bool,
-}
-
-impl<K, V, Iter> MapIteratorVisitor<Iter>
-    where Iter: Iterator<Item=(K, V)>
-{
-    #[inline]
-    pub fn new(iter: Iter) -> MapIteratorVisitor<Iter> {
-        MapIteratorVisitor {
-            iter: iter,
-            first: true,
-        }
-    }
-}
-
-impl<K, V, I> MapVisitor for MapIteratorVisitor<I>
-    where K: Serialize,
-          V: Serialize,
-          I: Iterator<Item=(K, V)>,
-{
-    #[inline]
-    fn visit<V_>(&mut self, visitor: &mut V_) -> Result<Option<V_::Value>, V_::Error>
-        where V_: Visitor,
-    {
-        let first = self.first;
-        self.first = false;
-
-        match self.iter.next() {
-            Some((key, value)) => {
-                let value = try!(visitor.visit_map_elt(first, key, value));
-                Ok(Some(value))
-            }
-            None => Ok(None)
-        }
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl<K, V> Serialize for BTreeMap<K, V>
-    where K: Serialize + Ord,
-          V: Serialize,
-{
-    #[inline]
-    fn visit<V_: Visitor>(&self, visitor: &mut V_) -> Result<V_::Value, V_::Error> {
-        visitor.visit_map(MapIteratorVisitor::new(self.iter()))
-    }
-}
-
-impl<K, V, S> Serialize for HashMap<K, V, S>
-    where K: Serialize + Eq + Hash,
-          V: Serialize,
-          S: HashState,
-{
-    #[inline]
-    fn visit<V_: Visitor>(&self, visitor: &mut V_) -> Result<V_::Value, V_::Error> {
-        visitor.visit_map(MapIteratorVisitor::new(self.iter()))
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl<'a, T> Serialize for &'a T where T: Serialize {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (**self).visit(visitor)
-    }
-}
-
-impl<'a, T> Serialize for &'a mut T where T: Serialize {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (**self).visit(visitor)
-    }
-}
-
-impl<T> Serialize for Box<T> where T: Serialize {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (**self).visit(visitor)
-    }
-}
-
-impl<T> Serialize for Rc<T> where T: Serialize, {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (**self).visit(visitor)
-    }
-}
-
-impl<T> Serialize for Arc<T> where T: Serialize, {
-    #[inline]
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        (**self).visit(visitor)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl Serialize for path::Path {
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        self.to_str().unwrap().visit(visitor)
-    }
-}
-
-impl Serialize for path::PathBuf {
-    fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
-        where V: Visitor,
-    {
-        self.to_str().unwrap().visit(visitor)
-    }
-}

test_suite/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "serde_test_suite"
+version = "0.0.0"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+publish = false
+
+[features]
+unstable = ["serde/unstable", "compiletest_rs"]
+
+[dev-dependencies]
+fnv = "1.0"
+rustc-serialize = "0.3.16"
+serde = { path = "../serde" }
+serde_derive = { path = "../serde_derive" }
+serde_test = { path = "../serde_test" }
+
+[dependencies]
+compiletest_rs = { version = "0.2", optional = true }

test_suite/deps/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "serde_test_suite_deps"
+version = "0.0.0"
+authors = ["David Tolnay <dtolnay@gmail.com>"]
+publish = false
+
+[workspace]
+
+[dependencies]
+serde = { path = "../../serde" }
+serde_derive = { path = "../../serde_derive" }

test_suite/no_std/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "serde_derive_tests_no_std"
+version = "0.0.0"
+publish = false
+
+[dependencies]
+serde = { path = "../../serde", default-features = false }
+serde_derive = { path = "../../serde_derive" }

test_suite/no_std/src/main.rs

@@ -0,0 +1,53 @@
+#![feature(lang_items, start, libc, compiler_builtins_lib)]
+#![no_std]
+
+extern crate libc;
+extern crate compiler_builtins;
+
+#[start]
+fn start(_argc: isize, _argv: *const *const u8) -> isize {
+    0
+}
+
+#[lang = "eh_personality"]
+#[no_mangle]
+pub extern fn rust_eh_personality() {}
+
+#[lang = "eh_unwind_resume"]
+#[no_mangle]
+pub extern fn rust_eh_unwind_resume() {}
+
+#[lang = "panic_fmt"]
+#[no_mangle]
+pub extern fn rust_begin_panic(_msg: core::fmt::Arguments,
+                               _file: &'static str,
+                               _line: u32) -> ! {
+    unsafe {
+        libc::abort()
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize, Deserialize)]
+struct Unit;
+
+#[derive(Serialize, Deserialize)]
+struct Newtype(u8);
+
+#[derive(Serialize, Deserialize)]
+struct Tuple(u8, u8);
+
+#[derive(Serialize, Deserialize)]
+struct Struct { f: u8 }
+
+#[derive(Serialize, Deserialize)]
+enum Enum {
+    Unit,
+    Newtype(u8),
+    Tuple(u8, u8),
+    Struct { f: u8 },
+}

test_suite/tests/compile-fail/default-attribute/enum.rs

@@ -0,0 +1,8 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(default)] //~^ HELP: #[serde(default)] can only be used on structs
+enum E {
+    S { f: u8 },
+}

test_suite/tests/compile-fail/default-attribute/nameless_struct_fields.rs

@@ -0,0 +1,8 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(default)] //~^ HELP: #[serde(default)] can only be used on structs
+struct T(u8, u8);
+
+fn main() { }

test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(rename="x", serialize="y")] //~^^ HELP: unknown serde field attribute `serialize`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs

@@ -0,0 +1,11 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(rename="x")]
+    #[serde(rename(deserialize="y"))] //~^^^ HELP: duplicate serde attribute `rename`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(rename(serialize="x"), rename(serialize="y"))] //~^^ HELP: duplicate serde attribute `rename`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs

@@ -0,0 +1,11 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(rename(serialize="x"))]
+    #[serde(rename="y")] //~^^^ HELP: duplicate serde attribute `rename`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(rename(serialize="x", serialize="y"))] //~^^ HELP: duplicate serde attribute `rename`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs

@@ -0,0 +1,11 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(rename(serialize="x"))]
+    #[serde(rename(serialize="y"))] //~^^^ HELP: duplicate serde attribute `rename`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/duplicate-attribute/with-and-serialize-with.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct S {
+    #[serde(with = "w", serialize_with = "s")] //~^^ HELP: duplicate serde attribute `serialize_with`
+    x: (),
+}
+
+fn main() {}

test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(tag = "type")] //~^ HELP: #[serde(tag = "...")] cannot be used with tuple variants
+enum E {
+    Tuple(u8, u8),
+}
+
+fn main() {}

test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs

@@ -0,0 +1,8 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(tag = "type")] //~^ HELP: #[serde(tag = "...")] can only be used on enums
+struct S;
+
+fn main() {}

test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs

@@ -0,0 +1,12 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(untagged)]
+#[serde(tag = "type")] //~^^ HELP: enum cannot be both untagged and internally tagged
+enum E {
+    A(u8),
+    B(String),
+}
+
+fn main() {}

test_suite/tests/compile-fail/enum-representation/untagged-struct.rs

@@ -0,0 +1,8 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(untagged)] //~^ HELP: #[serde(untagged)] can only be used on enums
+struct S;
+
+fn main() {}

test_suite/tests/compile-fail/str_ref_deser.rs

@@ -0,0 +1,9 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize, Deserialize)] //~ ERROR: proc-macro derive panicked
+struct Test<'a> {
+    s: &'a str, //~^^ HELP: Serde does not support deserializing fields of type &str
+}
+
+fn main() {}

test_suite/tests/compile-fail/type-attribute/from.rs

@@ -0,0 +1,11 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(from = "Option<T")] //~^ HELP: failed to parse type: from = "Option<T"
+enum TestOne {
+    Testing,
+    One,
+    Two,
+    Three,
+}

test_suite/tests/compile-fail/type-attribute/into.rs

@@ -0,0 +1,11 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(into = "Option<T")] //~^ HELP: failed to parse type: into = "Option<T"
+enum TestOne {
+    Testing,
+    One,
+    Two,
+    Three,
+}

test_suite/tests/compile-fail/unknown-attribute/container.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(abc="xyz")] //~^ HELP: unknown serde container attribute `abc`
+struct A {
+    x: u32,
+}
+
+fn main() { }

test_suite/tests/compile-fail/unknown-attribute/field.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+struct C {
+    #[serde(abc="xyz")] //~^^ HELP: unknown serde field attribute `abc`
+    x: u32,
+}
+
+fn main() { }

test_suite/tests/compile-fail/unknown-attribute/variant.rs

@@ -0,0 +1,10 @@
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+enum E {
+    #[serde(abc="xyz")] //~^^ HELP: unknown serde variant attribute `abc`
+    V,
+}
+
+fn main() { }

test_suite/tests/compiletest.rs

@@ -0,0 +1,28 @@
+#![cfg(feature = "unstable")]
+
+extern crate compiletest_rs as compiletest;
+
+use std::env;
+
+fn run_mode(mode: &'static str) {
+    let mut config = compiletest::default_config();
+
+    config.mode = mode.parse().expect("invalid mode");
+    config.target_rustcflags = Some("-L deps/target/debug/deps".to_owned());
+    if let Ok(name) = env::var("TESTNAME") {
+        config.filter = Some(name);
+    }
+    config.src_base = format!("tests/{}", mode).into();
+
+    compiletest::run_tests(&config);
+}
+
+#[test]
+fn compile_fail() {
+    run_mode("compile-fail");
+}
+
+#[test]
+fn run_pass() {
+    run_mode("run-pass");
+}

test_suite/tests/macros.rs

@@ -0,0 +1,67 @@
+macro_rules! btreeset {
+    () => {
+        BTreeSet::new()
+    };
+    ($($value:expr),+) => {
+        {
+            let mut set = BTreeSet::new();
+            $(set.insert($value);)+
+            set
+        }
+    }
+}
+
+macro_rules! btreemap {
+    () => {
+        BTreeMap::new()
+    };
+    ($($key:expr => $value:expr),+) => {
+        {
+            let mut map = BTreeMap::new();
+            $(map.insert($key, $value);)+
+            map
+        }
+    }
+}
+
+macro_rules! hashset {
+    () => {
+        HashSet::new()
+    };
+    ($($value:expr),+) => {
+        {
+            let mut set = HashSet::new();
+            $(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
+        }
+    }
+}
+
+macro_rules! hashmap {
+    () => {
+        HashMap::new()
+    };
+    ($($key:expr => $value:expr),+) => {
+        {
+            let mut map = HashMap::new();
+            $(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
+        }
+    }
+}