Release 0.9.9

Fixes #775.

.travis.yml

@@ -1,35 +1,17 @@
 sudo: false
 language: rust
+cache: cargo
+
+# run builds for all the trains (and more)
 rust:
-- stable
-- nightly
-- 1.8.0
-- 1.9.0
-- beta
-addons:
-  apt:
-    packages:
-    - libcurl4-openssl-dev
-    - libelf-dev
-    - libdw-dev
-before_script:
-- pip install 'travis-cargo<0.2' --user
-- export PATH=$HOME/.local/bin:$PATH
-script:
-- (cd serde && travis-cargo build)
-- (cd serde && travis-cargo --skip nightly test)
-- (cd serde && travis-cargo --only nightly test -- --features unstable-testing)
-- (cd serde && travis-cargo build -- --no-default-features)
-- (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc)
-- (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
-- (cd testing && travis-cargo --skip nightly test)
-- (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
-- (cd serde_derive && travis-cargo --only nightly test)
-- (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
-- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
-- (cd serde && travis-cargo --only stable doc)
-after_success:
-- (cd testing && travis-cargo --only stable coveralls --no-sudo)
-env:
-  global:
-  - TRAVIS_CARGO_NIGHTLY_FEATURE=""
+  - 1.13.0
+  - stable
+  - beta
+  - nightly
+
+matrix:
+  include:
+    - rust: nightly
+      env: CLIPPY=true
+
+script: ./travis.sh

Cargo.toml

@@ -0,0 +1,9 @@
+[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

@@ -11,12 +11,11 @@ You may be looking for:
 - [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
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
@@ -50,8 +49,9 @@ fn main() {
 Serde developers live in the #serde channel on
 [`irc.mozilla.org`](https://wiki.mozilla.org/IRC). The #rust channel is also a
 good resource with generally faster response time but less specific knowledge
-about Serde. If IRC is not your thing, we are happy to respond to [GitHub
-issues](https://github.com/serde-rs/serde/issues/new) as well.
+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
 

examples/serde-syntex-example/.gitignore

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

examples/serde-syntex-example/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "serde-syntex-example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-build = "build.rs"
-
-[features]
-default = ["serde_codegen"]
-unstable = ["serde_derive"]
-
-[build-dependencies]
-serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" }
-
-[dependencies]
-serde = "^0.8"
-serde_derive = { version = "^0.8", optional = true, path = "../../serde_derive" }
-serde_json = "^0.8"

examples/serde-syntex-example/README.md

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

examples/serde-syntex-example/build.rs

@@ -1,25 +0,0 @@
-#[cfg(not(feature = "serde_derive"))]
-mod inner {
-    extern crate serde_codegen;
-
-    use std::env;
-    use std::path::Path;
-
-    pub fn main() {
-        let out_dir = env::var_os("OUT_DIR").unwrap();
-
-        let src = Path::new("src/main.rs.in");
-        let dst = Path::new(&out_dir).join("main.rs");
-
-        serde_codegen::expand(&src, &dst).unwrap();
-    }
-}
-
-#[cfg(feature = "serde_derive")]
-mod inner {
-    pub fn main() {}
-}
-
-fn main() {
-    inner::main();
-}

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

@@ -1,14 +0,0 @@
-#![cfg_attr(feature = "serde_derive", feature(rustc_macro))]
-
-#[cfg(feature = "serde_derive")]
-#[macro_use]
-extern crate serde_derive;
-
-extern crate serde;
-extern crate serde_json;
-
-#[cfg(feature = "serde_derive")]
-include!("main.rs.in");
-
-#[cfg(not(feature = "serde_derive"))]
-include!(concat!(env!("OUT_DIR"), "/main.rs"));

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

@@ -1,16 +0,0 @@
-#[derive(Serialize, Deserialize, Debug)]
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-fn main() {
-    let point = Point { x: 1, y: 2 };
-    let serialized = serde_json::to_string(&point).unwrap();
-
-    println!("{}", serialized);
-
-    let deserialized: Point = serde_json::from_str(&serialized).unwrap();
-
-    println!("{:?}", deserialized);
-}

serde/Cargo.toml

@@ -1,15 +1,19 @@
 [package]
 name = "serde"
-version = "0.8.11"
+version = "0.9.9"
 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"
-keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }
 
 [features]
 default = ["std"]
@@ -18,7 +22,13 @@ std = []
 unstable = []
 alloc = ["unstable"]
 collections = ["alloc"]
-unstable-testing = ["clippy", "unstable", "std"]
+unstable-testing = ["unstable", "std"]
+
+# to get serde_derive picked up by play.integer32.com
+playground = ["serde_derive"]
 
 [dependencies]
-clippy = { version = "^0.*", optional = true }
+serde_derive = { version = "0.9", optional = true }
+
+[dev-dependencies]
+serde_derive = "0.9"

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

@@ -1,4 +1,20 @@
-//! Helper module to enable serializing bytes more efficiently
+//! 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;
@@ -6,14 +22,36 @@ use core::fmt::Write;
 use ser;
 
 #[cfg(any(feature = "std", feature = "collections"))]
-pub use self::bytebuf::{ByteBuf, ByteBufVisitor};
+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;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// `Bytes` wraps a `&[u8]` in order to serialize into a byte array.
+/// 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],
@@ -22,9 +60,7 @@ pub struct Bytes<'a> {
 impl<'a> Bytes<'a> {
     /// Wrap an existing `&[u8]`.
     pub fn new(bytes: &'a [u8]) -> Self {
-        Bytes {
-            bytes: bytes,
-        }
+        Bytes { bytes: bytes }
     }
 }
 
@@ -60,12 +96,14 @@ impl<'a> Into<&'a [u8]> for Bytes<'a> {
 impl<'a> ops::Deref for Bytes<'a> {
     type Target = [u8];
 
-    fn deref(&self) -> &[u8] { self.bytes }
+    fn deref(&self) -> &[u8] {
+        self.bytes
+    }
 }
 
 impl<'a> ser::Serialize for Bytes<'a> {
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: ser::Serializer
     {
         serializer.serialize_bytes(self.bytes)
@@ -76,6 +114,7 @@ impl<'a> ser::Serialize for Bytes<'a> {
 
 #[cfg(any(feature = "std", feature = "collections"))]
 mod bytebuf {
+    use core::cmp;
     use core::ops;
     use core::fmt;
     use core::fmt::Write;
@@ -84,9 +123,27 @@ mod bytebuf {
     use de;
 
     #[cfg(feature = "collections")]
-    use collections::Vec;
+    use collections::{String, Vec};
 
-    /// `ByteBuf` wraps a `Vec<u8>` and serializes as a byte array.
+    /// 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>,
@@ -105,9 +162,7 @@ mod bytebuf {
 
         /// Wrap existing bytes in a `ByteBuf`.
         pub fn from<T: Into<Vec<u8>>>(bytes: T) -> Self {
-            ByteBuf {
-                bytes: bytes.into(),
-            }
+            ByteBuf { bytes: bytes.into() }
         }
     }
 
@@ -160,15 +215,19 @@ mod bytebuf {
     impl ops::Deref for ByteBuf {
         type Target = [u8];
 
-        fn deref(&self) -> &[u8] { &self.bytes[..] }
+        fn deref(&self) -> &[u8] {
+            &self.bytes[..]
+        }
     }
 
     impl ops::DerefMut for ByteBuf {
-        fn deref_mut(&mut self) -> &mut [u8] { &mut self.bytes[..] }
+        fn deref_mut(&mut self) -> &mut [u8] {
+            &mut self.bytes[..]
+        }
     }
 
     impl ser::Serialize for ByteBuf {
-        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where S: ser::Serializer
         {
             serializer.serialize_bytes(self)
@@ -181,39 +240,53 @@ mod bytebuf {
     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>(&mut self) -> Result<ByteBuf, E>
-            where E: de::Error,
+        fn visit_unit<E>(self) -> Result<ByteBuf, E>
+            where E: de::Error
         {
             Ok(ByteBuf::new())
         }
 
         #[inline]
-        fn visit_seq<V>(&mut self, mut visitor: V) -> Result<ByteBuf, V::Error>
-            where V: de::SeqVisitor,
+        fn visit_seq<V>(self, mut visitor: V) -> Result<ByteBuf, V::Error>
+            where V: de::SeqVisitor
         {
-            let (len, _) = visitor.size_hint();
+            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);
             }
 
-            try!(visitor.end());
-
             Ok(ByteBuf::from(values))
         }
 
         #[inline]
-        fn visit_bytes<E>(&mut self, v: &[u8]) -> Result<ByteBuf, E>
-            where E: de::Error,
+        fn visit_bytes<E>(self, v: &[u8]) -> Result<ByteBuf, E>
+            where E: de::Error
         {
-            self.visit_byte_buf(v.to_vec())
+            Ok(ByteBuf::from(v))
         }
 
         #[inline]
-        fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<ByteBuf, E>
-            where E: de::Error,
+        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))
         }
@@ -221,10 +294,10 @@ mod bytebuf {
 
     impl de::Deserialize for ByteBuf {
         #[inline]
-        fn deserialize<D>(deserializer: &mut D) -> Result<ByteBuf, D::Error>
+        fn deserialize<D>(deserializer: D) -> Result<ByteBuf, D::Error>
             where D: de::Deserializer
         {
-            deserializer.deserialize_bytes(ByteBufVisitor)
+            deserializer.deserialize_byte_buf(ByteBufVisitor)
         }
     }
 }
@@ -232,7 +305,9 @@ mod bytebuf {
 ///////////////////////////////////////////////////////////////////////////////
 
 #[inline]
-fn escape_bytestring<'a>(bytes: &'a [u8]) -> iter::FlatMap<slice::Iter<'a, u8>, char::EscapeDefault, fn(&u8) -> char::EscapeDefault> {
+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()
     }

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

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

serde/src/export.rs

@@ -0,0 +1,34 @@
+#[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::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

@@ -4,13 +4,13 @@ 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>>> {
+pub struct LineColIterator<Iter: Iterator<Item = io::Result<u8>>> {
     iter: Iter,
     line: usize,
     col: usize,
 }
 
-impl<Iter: Iterator<Item=io::Result<u8>>> LineColIterator<Iter> {
+impl<Iter: Iterator<Item = io::Result<u8>>> LineColIterator<Iter> {
     /// Construct a new `LineColIterator<Iter>`.
     pub fn new(iter: Iter) -> LineColIterator<Iter> {
         LineColIterator {
@@ -21,27 +21,39 @@ impl<Iter: Iterator<Item=io::Result<u8>>> LineColIterator<Iter> {
     }
 
     /// Report the current line inside the iterator.
-    pub fn line(&self) -> usize { self.line }
+    pub fn line(&self) -> usize {
+        self.line
+    }
 
     /// Report the current column inside the iterator.
-    pub fn col(&self) -> usize { self.col }
+    pub fn col(&self) -> usize {
+        self.col
+    }
 
     /// Gets a reference to the underlying iterator.
-    pub fn get_ref(&self) -> &Iter { &self.iter }
+    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 }
+    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 }
+    pub fn into_inner(self) -> Iter {
+        self.iter
+    }
 }
 
-impl<Iter: Iterator<Item=io::Result<u8>>> LineColIterator<Peekable<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() }
+    pub fn peek(&mut self) -> Option<&io::Result<u8>> {
+        self.iter.peek()
+    }
 }
 
-impl<Iter: Iterator<Item=io::Result<u8>>> Iterator for LineColIterator<Iter> {
+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() {
@@ -50,11 +62,11 @@ impl<Iter: Iterator<Item=io::Result<u8>>> Iterator for LineColIterator<Iter> {
                 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

@@ -1,49 +1,93 @@
-//! Serde Serialization Framework
+//! # Serde
 //!
-//! Serde is a powerful framework that enables serialization libraries to generically serialize
-//! Rust data structures without the overhead of runtime type information. In many situations, the
-//! handshake protocol between serializers and serializees can be completely optimized away,
-//! leaving serde to perform roughly the same speed as a hand written serializer for a specific
-//! type.
+//! Serde is a framework for ***ser***ializing and ***de***serializing Rust data
+//! structures efficiently and generically.
 //!
-//! For a detailed tutorial on the different ways to use serde please check out the
-//! [github repository](https://github.com/serde-rs/serde)
+//! 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(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))]
+#![cfg_attr(feature = "unstable", feature(inclusive_range, nonzero, specialization, zero_one))]
 #![cfg_attr(feature = "alloc", feature(alloc))]
-#![cfg_attr(feature = "collections", feature(collections, enumset))]
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-#![cfg_attr(feature = "clippy", allow(linkedlist))]
-
-#![cfg_attr(any(not(feature = "std"), feature = "unstable"), allow(unused_variables, unused_imports, unused_features, dead_code))]
-
+#![cfg_attr(feature = "collections", feature(collections))]
+#![cfg_attr(feature = "cargo-clippy", allow(linkedlist, type_complexity, doc_markdown))]
 #![deny(missing_docs)]
 
-#[cfg(all(feature = "unstable", feature = "collections"))]
+#[cfg(feature = "collections")]
 extern crate collections;
 
-#[cfg(all(feature = "unstable", feature = "alloc"))]
+#[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};
+                  usize, f32, f64, char, str, num, slice, iter, cell, default, result, option};
     #[cfg(feature = "unstable")]
-    extern crate core;
-    #[cfg(feature = "unstable")]
-    pub use self::core::nonzero;
+    pub use actual_core::nonzero;
 }
 
+#[doc(inline)]
 pub use ser::{Serialize, Serializer};
-pub use de::{Deserialize, Deserializer, Error};
-
-#[cfg(not(feature = "std"))]
-macro_rules! format {
-    ($s:expr, $($rest:tt)*) => ($s)
-}
+#[doc(inline)]
+pub use de::{Deserialize, Deserializer};
 
 #[macro_use]
 mod macros;
@@ -51,8 +95,13 @@ mod macros;
 pub mod bytes;
 pub mod de;
 #[cfg(feature = "std")]
+#[doc(hidden)]
 pub mod iter;
 pub mod ser;
-#[cfg(not(feature = "std"))]
+#[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;

serde/src/macros.rs

@@ -4,7 +4,7 @@
 macro_rules! forward_to_deserialize_method {
     ($func:ident($($arg:ty),*)) => {
         #[inline]
-        fn $func<__V>(&mut self, $(_: $arg,)* visitor: __V) -> ::std::result::Result<__V::Value, Self::Error>
+        fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> ::std::result::Result<__V::Value, Self::Error>
             where __V: $crate::de::Visitor
         {
             self.deserialize(visitor)
@@ -18,7 +18,7 @@ macro_rules! forward_to_deserialize_method {
 macro_rules! forward_to_deserialize_method {
     ($func:ident($($arg:ty),*)) => {
         #[inline]
-        fn $func<__V>(&mut self, $(_: $arg,)* visitor: __V) -> ::core::result::Result<__V::Value, Self::Error>
+        fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> ::core::result::Result<__V::Value, Self::Error>
             where __V: $crate::de::Visitor
         {
             self.deserialize(visitor)
@@ -26,43 +26,12 @@ macro_rules! forward_to_deserialize_method {
     };
 }
 
-#[cfg(feature = "std")]
-#[doc(hidden)]
-#[macro_export]
-macro_rules! forward_to_deserialize_enum {
-    () => {
-        #[inline]
-        fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _: __V) -> ::std::result::Result<__V::Value, Self::Error>
-            where __V: $crate::de::EnumVisitor
-        {
-            Err($crate::de::Error::invalid_type($crate::de::Type::Enum))
-        }
-    };
-}
-
-#[cfg(not(feature = "std"))]
-#[doc(hidden)]
-#[macro_export]
-macro_rules! forward_to_deserialize_enum {
-    () => {
-        #[inline]
-        fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _: __V) -> ::core::result::Result<__V::Value, Self::Error>
-            where __V: $crate::de::EnumVisitor
-        {
-            Err($crate::de::Error::invalid_type($crate::de::Type::Enum))
-        }
-    };
-}
-
 #[doc(hidden)]
 #[macro_export]
 macro_rules! forward_to_deserialize_helper {
     (bool) => {
         forward_to_deserialize_method!{deserialize_bool()}
     };
-    (usize) => {
-        forward_to_deserialize_method!{deserialize_usize()}
-    };
     (u8) => {
         forward_to_deserialize_method!{deserialize_u8()}
     };
@@ -75,9 +44,6 @@ macro_rules! forward_to_deserialize_helper {
     (u64) => {
         forward_to_deserialize_method!{deserialize_u64()}
     };
-    (isize) => {
-        forward_to_deserialize_method!{deserialize_isize()}
-    };
     (i8) => {
         forward_to_deserialize_method!{deserialize_i8()}
     };
@@ -120,6 +86,9 @@ macro_rules! forward_to_deserialize_helper {
     (bytes) => {
         forward_to_deserialize_method!{deserialize_bytes()}
     };
+    (byte_buf) => {
+        forward_to_deserialize_method!{deserialize_byte_buf()}
+    };
     (map) => {
         forward_to_deserialize_method!{deserialize_map()}
     };
@@ -141,39 +110,113 @@ macro_rules! forward_to_deserialize_helper {
     (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()}
     };
-    (enum) => {
-        forward_to_deserialize_enum!();
-    };
 }
 
-/// Helper to forward `Deserializer` methods to `Deserializer::deserialize`.
-/// Every given method ignores all arguments and forwards to `deserialize`.
-/// Note that `deserialize_enum` simply returns an `Error::invalid_type`; a
-/// better approach is tracked in [serde-rs/serde#521][1].
+// 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.
 ///
-/// ```rust,ignore
+/// 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 {
-///     fn deserialize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+/// #   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 usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
-///         unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+///         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() {}
 /// ```
-///
-/// [1]: https://github.com/serde-rs/serde/issues/521
 #[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,635 @@
+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

@@ -1,48 +1,23 @@
-//! Implementations for all of Rust's builtin types. Tuples implement the `Serialize` trait if they
-//! have at most 16 fields. Arrays implement the `Serialize` trait if their length is 32 or less.
-//! You can always forward array serialization to slice serialization, which works for any length.
-//! Long tuples are best replaced by tuple structs, for which you can use `derive(Serialize)`. In
-//! that case the number of fields is irrelevant.
-
 #[cfg(feature = "std")]
 use std::borrow::Cow;
 #[cfg(all(feature = "collections", not(feature = "std")))]
 use collections::borrow::Cow;
 
 #[cfg(feature = "std")]
-use std::collections::{
-    BinaryHeap,
-    BTreeMap,
-    BTreeSet,
-    LinkedList,
-    HashMap,
-    HashSet,
-    VecDeque,
-};
+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,
-};
+use collections::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque, String, Vec};
 
-#[cfg(all(feature = "unstable", feature = "collections"))]
-use collections::enum_set::{CLike, EnumSet};
-#[cfg(all(feature = "unstable", feature = "collections"))]
+#[cfg(feature = "collections")]
 use collections::borrow::ToOwned;
 
+#[cfg(feature = "std")]
 use core::hash::{Hash, BuildHasher};
 #[cfg(feature = "unstable")]
 use core::iter;
 #[cfg(feature = "std")]
 use std::net;
 #[cfg(feature = "unstable")]
-use core::num;
-#[cfg(feature = "unstable")]
 use core::ops;
 #[cfg(feature = "std")]
 use std::path;
@@ -66,34 +41,32 @@ use core::marker::PhantomData;
 #[cfg(feature = "unstable")]
 use core::nonzero::{NonZero, Zeroable};
 
-use super::{
-    Error,
-    Serialize,
-    Serializer,
-};
+use super::{Serialize, SerializeSeq, SerializeTuple, Serializer};
+#[cfg(feature = "std")]
+use super::Error;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 macro_rules! impl_visit {
-    ($ty:ty, $method:ident) => {
+    ($ty:ty, $method:ident $($cast:tt)*) => {
         impl Serialize for $ty {
             #[inline]
-            fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                 where S: Serializer,
             {
-                serializer.$method(*self)
+                serializer.$method(*self $($cast)*)
             }
         }
     }
 }
 
 impl_visit!(bool, serialize_bool);
-impl_visit!(isize, serialize_isize);
+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_usize);
+impl_visit!(usize, serialize_u64 as u64);
 impl_visit!(u8, serialize_u8);
 impl_visit!(u16, serialize_u16);
 impl_visit!(u32, serialize_u32);
@@ -106,8 +79,8 @@ impl_visit!(char, serialize_char);
 
 impl Serialize for str {
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         serializer.serialize_str(self)
     }
@@ -116,8 +89,8 @@ impl Serialize for str {
 #[cfg(any(feature = "std", feature = "collections"))]
 impl Serialize for String {
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         (&self[..]).serialize(serializer)
     }
@@ -125,10 +98,12 @@ impl Serialize for String {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<T> Serialize for Option<T> where T: Serialize {
+impl<T> Serialize for Option<T>
+    where T: Serialize
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         match *self {
             Some(ref value) => serializer.serialize_some(value),
@@ -141,45 +116,27 @@ impl<T> Serialize for Option<T> where T: Serialize {
 
 impl<T> Serialize for PhantomData<T> {
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         serializer.serialize_unit_struct("PhantomData")
     }
 }
 
-
-///////////////////////////////////////////////////////////////////////////////
-
-impl<T> Serialize for [T]
-    where T: Serialize,
-{
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        let mut state = try!(serializer.serialize_seq(Some(self.len())));
-        for e in self {
-            try!(serializer.serialize_seq_elt(&mut state, e));
-        }
-        serializer.serialize_seq_end(state)
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 macro_rules! array_impls {
     ($len:expr) => {
         impl<T> Serialize for [T; $len] where T: Serialize {
             #[inline]
-            fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                 where S: Serializer,
             {
-                let mut state = try!(serializer.serialize_seq_fixed_size($len));
+                let mut seq = try!(serializer.serialize_seq_fixed_size($len));
                 for e in self {
-                    try!(serializer.serialize_seq_elt(&mut state, e));
+                    try!(seq.serialize_element(e));
                 }
-                serializer.serialize_seq_end(state)
+                seq.end()
             }
         }
     }
@@ -224,18 +181,20 @@ array_impls!(32);
 macro_rules! serialize_seq {
     () => {
         #[inline]
-        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where S: Serializer,
         {
-            let mut state = try!(serializer.serialize_seq(Some(self.len())));
-            for e in self {
-                try!(serializer.serialize_seq_elt(&mut state, e));
-            }
-            serializer.serialize_seq_end(state)
+            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
@@ -245,14 +204,7 @@ impl<T> Serialize for BinaryHeap<T>
 
 #[cfg(any(feature = "std", feature = "collections"))]
 impl<T> Serialize for BTreeSet<T>
-    where T: Serialize + Ord,
-{
-    serialize_seq!();
-}
-
-#[cfg(all(feature = "unstable", feature = "collections"))]
-impl<T> Serialize for EnumSet<T>
-    where T: Serialize + CLike
+    where T: Serialize + Ord
 {
     serialize_seq!();
 }
@@ -260,43 +212,63 @@ impl<T> Serialize for EnumSet<T>
 #[cfg(feature = "std")]
 impl<T, H> Serialize for HashSet<T, H>
     where T: Serialize + Eq + Hash,
-          H: BuildHasher,
+          H: BuildHasher
 {
     serialize_seq!();
 }
 
 #[cfg(any(feature = "std", feature = "collections"))]
 impl<T> Serialize for LinkedList<T>
-    where T: Serialize,
+    where T: Serialize
 {
     serialize_seq!();
 }
 
 #[cfg(any(feature = "std", feature = "collections"))]
-impl<T> Serialize for Vec<T> where T: Serialize {
+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 {
+impl<T> Serialize for VecDeque<T>
+    where T: Serialize
+{
     serialize_seq!();
 }
 
 #[cfg(feature = "unstable")]
 impl<A> Serialize for ops::Range<A>
-    where A: Serialize + Clone + iter::Step + num::One,
-          for<'a> &'a A: ops::Add<&'a A, Output = A>,
+    where ops::Range<A>: ExactSizeIterator + iter::Iterator<Item = A> + Clone,
+          A: Serialize
 {
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
-        let len = iter::Step::steps_between(&self.start, &self.end, &A::one());
-        let mut state = try!(serializer.serialize_seq(len));
+        let mut seq = try!(serializer.serialize_seq(Some(self.len())));
         for e in self.clone() {
-            try!(serializer.serialize_seq_elt(&mut state, e));
+            try!(seq.serialize_element(&e));
         }
-        serializer.serialize_seq_end(state)
+        seq.end()
+    }
+}
+
+#[cfg(feature = "unstable")]
+impl<A> Serialize for ops::RangeInclusive<A>
+    where ops::RangeInclusive<A>: ExactSizeIterator + iter::Iterator<Item = A> + Clone,
+          A: Serialize
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
+    {
+        let mut seq = try!(serializer.serialize_seq(Some(self.len())));
+        for e in self.clone() {
+            try!(seq.serialize_element(&e));
+        }
+        seq.end()
     }
 }
 
@@ -304,8 +276,8 @@ impl<A> Serialize for ops::Range<A>
 
 impl Serialize for () {
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         serializer.serialize_unit()
     }
@@ -313,11 +285,6 @@ impl Serialize for () {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// FIXME(rust #19630) Remove this work-around
-macro_rules! e {
-    ($e:expr) => { $e }
-}
-
 macro_rules! tuple_impls {
     ($(
         $TupleVisitor:ident ($len:expr, $($T:ident),+) {
@@ -329,14 +296,14 @@ macro_rules! tuple_impls {
                 where $($T: Serialize),+
             {
                 #[inline]
-                fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+                fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                     where S: Serializer,
                 {
-                    let mut state = try!(serializer.serialize_tuple($len));
+                    let mut tuple = try!(serializer.serialize_tuple($len));
                     $(
-                        try!(serializer.serialize_tuple_elt(&mut state, &e!(self.$idx)));
+                        try!(tuple.serialize_element(&self.$idx));
                     )+
-                    serializer.serialize_tuple_end(state)
+                    tuple.end()
                 }
             }
         )+
@@ -519,15 +486,10 @@ tuple_impls! {
 macro_rules! serialize_map {
     () => {
         #[inline]
-        fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where S: Serializer,
         {
-            let mut state = try!(serializer.serialize_map(Some(self.len())));
-            for (k, v) in self {
-                try!(serializer.serialize_map_key(&mut state, k));
-                try!(serializer.serialize_map_value(&mut state, v));
-            }
-            serializer.serialize_map_end(state)
+            serializer.collect_map(self)
         }
     }
 }
@@ -535,7 +497,7 @@ macro_rules! serialize_map {
 #[cfg(any(feature = "std", feature = "collections"))]
 impl<K, V> Serialize for BTreeMap<K, V>
     where K: Serialize + Ord,
-          V: Serialize,
+          V: Serialize
 {
     serialize_map!();
 }
@@ -544,66 +506,78 @@ impl<K, V> Serialize for BTreeMap<K, V>
 impl<K, V, H> Serialize for HashMap<K, V, H>
     where K: Serialize + Eq + Hash,
           V: Serialize,
-          H: BuildHasher,
+          H: BuildHasher
 {
     serialize_map!();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<'a, T: ?Sized> Serialize for &'a T where T: Serialize {
+impl<'a, T: ?Sized> Serialize for &'a T
+    where T: Serialize
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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 {
+impl<'a, T: ?Sized> Serialize for &'a mut T
+    where T: Serialize
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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 {
+impl<T: ?Sized> Serialize for Box<T>
+    where T: Serialize
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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, {
+impl<T> Serialize for Rc<T>
+    where T: Serialize
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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, {
+impl<T> Serialize for Arc<T>
+    where T: Serialize
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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, {
+impl<'a, T: ?Sized> Serialize for Cow<'a, T>
+    where T: Serialize + ToOwned
+{
     #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         (**self).serialize(serializer)
     }
@@ -611,12 +585,15 @@ impl<'a, T: ?Sized> Serialize for Cow<'a, T> where T: Serialize + ToOwned, {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
+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::Ok(ref value) => serializer.serialize_newtype_variant("Result", 0, "Ok", value),
             Result::Err(ref value) => {
                 serializer.serialize_newtype_variant("Result", 1, "Err", value)
             }
@@ -628,13 +605,14 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
 
 #[cfg(feature = "std")]
 impl Serialize for Duration {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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!(serializer.serialize_struct_elt(&mut state, "secs", self.as_secs()));
-        try!(serializer.serialize_struct_elt(&mut state, "nanos", self.subsec_nanos()));
-        serializer.serialize_struct_end(state)
+        try!(state.serialize_field("secs", &self.as_secs()));
+        try!(state.serialize_field("nanos", &self.subsec_nanos()));
+        state.end()
     }
 }
 
@@ -642,28 +620,35 @@ impl Serialize for Duration {
 
 #[cfg(feature = "std")]
 impl Serialize for net::IpAddr {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
-        self.to_string().serialize(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: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
-        self.to_string().serialize(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: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
-        self.to_string().serialize(serializer)
+        /// "1000:1002:1003:1004:1005:1006:1007:1008".len()
+        const MAX_LEN: usize = 39;
+        serialize_display_bounded_length!(self, MAX_LEN, serializer)
     }
 }
 
@@ -671,8 +656,8 @@ impl Serialize for net::Ipv6Addr {
 
 #[cfg(feature = "std")]
 impl Serialize for net::SocketAddr {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         match *self {
             net::SocketAddr::V4(ref addr) => addr.serialize(serializer),
@@ -683,19 +668,23 @@ impl Serialize for net::SocketAddr {
 
 #[cfg(feature = "std")]
 impl Serialize for net::SocketAddrV4 {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
-        self.to_string().serialize(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: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
-        self.to_string().serialize(serializer)
+        /// "[1000:1002:1003:1004:1005:1006:1007:1008]:65000".len()
+        const MAX_LEN: usize = 47;
+        serialize_display_bounded_length!(self, MAX_LEN, serializer)
     }
 }
 
@@ -703,28 +692,32 @@ impl Serialize for net::SocketAddrV6 {
 
 #[cfg(feature = "std")]
 impl Serialize for path::Path {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    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::invalid_value("Path contains invalid UTF-8 characters")),
+            None => Err(Error::custom("path contains invalid UTF-8 characters")),
         }
     }
 }
 
 #[cfg(feature = "std")]
 impl Serialize for path::PathBuf {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: Serializer
     {
         self.as_path().serialize(serializer)
     }
 }
 
 #[cfg(feature = "unstable")]
-impl<T> Serialize for NonZero<T> where T: Serialize + Zeroable {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
+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/private.rs

@@ -0,0 +1,313 @@
+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

@@ -1,12 +1,12 @@
 //! Private utility functions
 
-const TAG_CONT: u8    = 0b1000_0000;
-const TAG_TWO_B: u8   = 0b1100_0000;
+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;
+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 {
@@ -21,17 +21,20 @@ pub fn encode_utf8(c: char) -> EncodeUtf8 {
         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[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[2] = (code >> 6 & 0x3F) as u8 | TAG_CONT;
         buf[3] = (code & 0x3F) as u8 | TAG_CONT;
         0
     };
-    EncodeUtf8 { buf: buf, pos: pos }
+    EncodeUtf8 {
+        buf: buf,
+        pos: pos,
+    }
 }
 
 pub struct EncodeUtf8 {
@@ -47,23 +50,22 @@ impl EncodeUtf8 {
 }
 
 #[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}')
-];
+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 {
+    r.binary_search_by(|&(lo, hi)| if c < lo {
             Greater
         } else if hi < c {
             Less
         } else {
             Equal
-        }
-    })
-    .is_ok()
+        })
+        .is_ok()
 }
 
 #[allow(non_snake_case)]

serde_codegen/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "serde_codegen"
-version = "0.8.11"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-license = "MIT/Apache-2.0"
-description = "Macros to auto-generate implementations for the serde framework"
-homepage = "https://serde.rs"
-repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde.rs/codegen.html"
-keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
-
-[features]
-default = ["with-syntex"]
-unstable = []
-unstable-testing = ["clippy"]
-with-syntex = [
-    "syntex",
-    "syntex_syntax",
-]
-with-syn = []
-
-[dependencies]
-clippy = { version = "^0.*", optional = true }
-quote = "0.2"
-serde_codegen_internals = { version = "=0.9.0", default-features = false, path = "../serde_codegen_internals" }
-syn = { version = "0.8", features = ["aster", "visit"] }
-syntex = { version = "^0.44.0", optional = true }
-syntex_syntax = { version = "^0.44.0", optional = true }

serde_codegen/src/bound.rs

@@ -1,121 +0,0 @@
-use std::collections::HashSet;
-
-use syn::{self, aster, visit};
-
-use internals::ast::Item;
-use internals::attr;
-
-// Remove the default from every type parameter because in the generated impls
-// they look like associated types: "error: associated type bindings are not
-// allowed here".
-pub fn without_defaults(generics: &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 {
-    aster::from_generics(generics.clone())
-        .with_predicates(predicates.to_vec())
-        .build()
-}
-
-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]>,
-{
-    aster::from_generics(generics.clone())
-        .with_predicates(
-            item.body.all_fields()
-                .flat_map(|field| from_field(&field.attrs))
-                .flat_map(|predicates| predicates.to_vec()))
-        .build()
-}
-
-// Puts the given bound on any generic type parameters that are used in fields
-// for which filter returns true.
-//
-// For example, the following struct needs the bound `A: Serialize, B: Serialize`.
-//
-//     struct S<'b, A, B: 'b, C> {
-//         a: A,
-//         b: Option<&'b B>
-//         #[serde(skip_serializing)]
-//         c: C,
-//     }
-pub fn with_bound<F>(
-    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);
-    }
-
-    aster::from_generics(generics.clone())
-        .with_predicates(
-            generics.ty_params.iter()
-                .map(|ty_param| ty_param.ident.clone())
-                .filter(|id| visitor.relevant_ty_params.contains(id))
-                .map(|id| aster::where_predicate()
-                    // the type parameter that is being bounded e.g. T
-                    .bound().build(aster::ty().id(id))
-                    // the bound e.g. Serialize
-                    .bound().trait_(bound.clone()).build()
-                    .build()))
-        .build()
-}

serde_codegen/src/lib.rs

@@ -1,293 +0,0 @@
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
-#![cfg_attr(feature = "clippy", allow(used_underscore_binding))]
-#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
-
-// The `quote!` macro requires deep recursion.
-#![recursion_limit = "192"]
-
-extern crate serde_codegen_internals as internals;
-
-#[cfg(feature = "with-syntex")]
-extern crate syntex;
-
-#[cfg(feature = "with-syntex")]
-#[macro_use]
-extern crate syntex_syntax as syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-#[macro_use]
-extern crate syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-extern crate rustc_plugin;
-
-extern crate syn;
-#[macro_use]
-extern crate quote;
-
-#[cfg(feature = "with-syntex")]
-use std::path::Path;
-
-#[cfg(not(feature = "with-syntex"))]
-use syntax::feature_gate::AttributeType;
-
-mod bound;
-mod de;
-mod ser;
-
-#[cfg(feature = "with-syntex")]
-fn syntex_registry() -> syntex::Registry {
-    use syntax::{ast, fold};
-
-    /// Strip the serde attributes from the crate.
-    #[cfg(feature = "with-syntex")]
-    fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-        /// Helper folder that strips the serde attributes after the extensions have been expanded.
-        struct StripAttributeFolder;
-
-        impl fold::Folder for StripAttributeFolder {
-            fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-                match attr.node.value.node {
-                    ast::MetaItemKind::List(ref n, _) if n == &"serde" => { return None; }
-                    _ => {}
-                }
-
-                Some(attr)
-            }
-
-            fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
-                fold::noop_fold_mac(mac, self)
-            }
-        }
-
-        fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
-    }
-
-    let mut reg = syntex::Registry::new();
-
-    reg.add_attr("feature(custom_derive)");
-    reg.add_attr("feature(custom_attribute)");
-
-    reg.add_decorator("derive_Serialize", expand_derive_serialize);
-    reg.add_decorator("derive_Deserialize", expand_derive_deserialize);
-
-    reg.add_post_expansion_pass(strip_attributes);
-
-    reg
-}
-
-#[cfg(feature = "with-syntex")]
-pub fn expand_str(src: &str) -> Result<String, syntex::Error> {
-    let src = src.to_owned();
-
-    let expand_thread = move || {
-        syntex_registry().expand_str("", "", &src)
-    };
-
-    syntex::with_extra_stack(expand_thread)
-}
-
-#[cfg(feature = "with-syntex")]
-pub fn expand<S, D>(src: S, dst: D) -> Result<(), syntex::Error>
-    where S: AsRef<Path>,
-          D: AsRef<Path>,
-{
-    let src = src.as_ref().to_owned();
-    let dst = dst.as_ref().to_owned();
-
-    let expand_thread = move || {
-        syntex_registry().expand("", src, dst)
-    };
-
-    syntex::with_extra_stack(expand_thread)
-}
-
-#[cfg(not(feature = "with-syntex"))]
-pub fn register(reg: &mut rustc_plugin::Registry) {
-    reg.register_syntax_extension(
-        syntax::parse::token::intern("derive_Serialize"),
-        syntax::ext::base::MultiDecorator(
-            Box::new(expand_derive_serialize)));
-
-    reg.register_syntax_extension(
-        syntax::parse::token::intern("derive_Deserialize"),
-        syntax::ext::base::MultiDecorator(
-            Box::new(expand_derive_deserialize)));
-
-    reg.register_attribute("serde".to_owned(), AttributeType::Normal);
-}
-
-macro_rules! shim {
-    ($name:ident $pkg:ident :: $func:ident) => {
-        fn $func(
-            cx: &mut ::syntax::ext::base::ExtCtxt,
-            span: ::syntax::codemap::Span,
-            meta_item: &::syntax::ast::MetaItem,
-            annotatable: &::syntax::ext::base::Annotatable,
-            push: &mut FnMut(::syntax::ext::base::Annotatable)
-        ) {
-            let item = match *annotatable {
-                ::syntax::ext::base::Annotatable::Item(ref item) => item,
-                _ => {
-                    cx.span_err(
-                        meta_item.span,
-                        concat!("`#[derive(",
-                                stringify!($name),
-                                ")]` may only be applied to structs and enums"));
-                    return;
-                }
-            };
-
-            use syntax::{attr, ast, visit};
-            struct MarkSerdeAttributesUsed;
-            impl visit::Visitor for MarkSerdeAttributesUsed {
-                fn visit_attribute(&mut self, attr: &ast::Attribute) {
-                    match attr.node.value.node {
-                        ast::MetaItemKind::List(ref name, _) if name == "serde" => {
-                            attr::mark_used(attr);
-                        }
-                        _ => {}
-                    }
-                }
-            }
-            visit::walk_item(&mut MarkSerdeAttributesUsed, item);
-
-            use syntax::print::pprust;
-            let s = pprust::item_to_string(item);
-
-            let syn_item = syn::parse_macro_input(&s).unwrap();
-            let expanded = match $pkg::$func(&syn_item) {
-                Ok(expanded) => expanded.to_string(),
-                Err(msg) => {
-                    cx.span_err(span, &msg);
-                    return;
-                }
-            };
-
-            use syntax::parse;
-            let name = stringify!($name).to_string();
-            let cfg = Vec::new();
-            let sess = parse::ParseSess::new();
-            let impl_item = parse::parse_item_from_source_str(name, expanded, cfg, &sess);
-            push(::syntax::ext::base::Annotatable::Item(impl_item.unwrap().unwrap()));
-        }
-    };
-}
-
-shim!(Serialize ser::expand_derive_serialize);
-shim!(Deserialize de::expand_derive_deserialize);
-
-#[cfg(feature = "with-syn")]
-pub fn expand_single_item(item: &str) -> Result<String, String> {
-    let syn_item = syn::parse_macro_input(item).unwrap();
-    let (ser, de, syn_item) = strip_serde_derives(syn_item);
-    let expanded_ser = if ser {
-        Some(try!(ser::expand_derive_serialize(&syn_item)))
-    } else {
-        None
-    };
-    let expanded_de = if de {
-        Some(try!(de::expand_derive_deserialize(&syn_item)))
-    } else {
-        None::<quote::Tokens>
-    };
-    let syn_item = strip_serde_attrs(syn_item);
-    return Ok(quote!(#expanded_ser #expanded_de #syn_item).to_string());
-
-    fn strip_serde_derives(item: syn::MacroInput) -> (bool, bool, syn::MacroInput) {
-        let mut ser = false;
-        let mut de = false;
-        let item = syn::MacroInput {
-            attrs: item.attrs.into_iter().flat_map(|attr| {
-                if attr.is_sugared_doc {
-                    return Some(attr);
-                }
-                let (name, nested) = match attr.value {
-                    syn::MetaItem::List(name, nested) => (name, nested),
-                    _ => return Some(attr)
-                };
-                if name != "derive" {
-                    return Some(syn::Attribute {
-                        value: syn::MetaItem::List(name, nested),
-                        is_sugared_doc: false,
-                    });
-                }
-                let rest: Vec<_> = nested.into_iter().filter(|nested| {
-                    match *nested {
-                        syn::MetaItem::Word(ref word) if word == "Serialize" => {
-                            ser = true;
-                            false
-                        }
-                        syn::MetaItem::Word(ref word) if word == "Deserialize" => {
-                            de = true;
-                            false
-                        }
-                        _ => true,
-                    }
-                }).collect();
-                if rest.is_empty() {
-                    None
-                } else {
-                    Some(syn::Attribute {
-                        value: syn::MetaItem::List(name, rest),
-                        is_sugared_doc: false,
-                    })
-                }
-            }).collect(),
-            ..item
-        };
-        (ser, de, item)
-    }
-
-    fn strip_serde_attrs(item: syn::MacroInput) -> syn::MacroInput {
-        syn::MacroInput {
-            attrs: strip_serde_from_attrs(item.attrs),
-            body: match item.body {
-                syn::Body::Enum(variants) => syn::Body::Enum(
-                    variants.into_iter().map(|variant| {
-                        syn::Variant {
-                            ident: variant.ident,
-                            attrs: strip_serde_from_attrs(variant.attrs),
-                            data: strip_serde_from_variant_data(variant.data),
-                            discriminant: variant.discriminant,
-                        }
-                    }).collect()
-                ),
-                syn::Body::Struct(variant_data) => syn::Body::Struct(
-                    strip_serde_from_variant_data(variant_data)
-                ),
-            },
-            ..item
-        }
-    }
-
-    fn strip_serde_from_variant_data(data: syn::VariantData) -> syn::VariantData {
-        match data {
-            syn::VariantData::Struct(fields) => syn::VariantData::Struct(
-                fields.into_iter().map(strip_serde_from_field).collect()
-            ),
-            syn::VariantData::Tuple(fields) => syn::VariantData::Tuple(
-                fields.into_iter().map(strip_serde_from_field).collect()
-            ),
-            syn::VariantData::Unit => syn::VariantData::Unit,
-        }
-    }
-
-    fn strip_serde_from_field(field: syn::Field) -> syn::Field {
-        syn::Field {
-            attrs: strip_serde_from_attrs(field.attrs),
-            ..field
-        }
-    }
-
-    fn strip_serde_from_attrs(attrs: Vec<syn::Attribute>) -> Vec<syn::Attribute> {
-        attrs.into_iter().filter(|attr| {
-            match attr.value {
-                syn::MetaItem::List(ref ident, _) => ident != "serde",
-                _ => true,
-            }
-        }).collect()
-    }
-}

serde_codegen/src/ser.rs

@@ -1,566 +0,0 @@
-use syn::{self, aster};
-use quote::Tokens;
-
-use bound;
-use internals::ast::{Body, Field, Item, Style, Variant};
-use internals::{self, attr};
-
-pub fn expand_derive_serialize(item: &syn::MacroInput) -> Result<Tokens, String> {
-    let ctxt = internals::Ctxt::new();
-    let item = Item::from_ast(&ctxt, item);
-    try!(ctxt.check());
-
-    let impl_generics = build_impl_generics(&item);
-
-    let ty = aster::ty().path()
-        .segment(item.ident.clone()).with_generics(impl_generics.clone()).build()
-        .build();
-
-    let body = serialize_body(&item,
-                              &impl_generics,
-                              ty.clone());
-
-    let where_clause = &impl_generics.where_clause;
-
-    let dummy_const = aster::id(format!("_IMPL_SERIALIZE_FOR_{}", item.ident));
-
-    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::ser::Serialize for #ty #where_clause {
-                fn serialize<__S>(&self, _serializer: &mut __S) -> ::std::result::Result<(), __S::Error>
-                    where __S: _serde::ser::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_impl_generics(item: &Item) -> syn::Generics {
-    let generics = bound::without_defaults(item.generics);
-
-    let generics = bound::with_where_predicates_from_fields(
-        item, &generics,
-        |attrs| attrs.ser_bound());
-
-    match item.attrs.ser_bound() {
-        Some(predicates) => {
-            bound::with_where_predicates(&generics, predicates)
-        }
-        None => {
-            bound::with_bound(item, &generics,
-                needs_serialize_bound,
-                &aster::path().ids(&["_serde", "ser", "Serialize"]).build())
-        }
-    }
-}
-
-// 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,
-    impl_generics: &syn::Generics,
-    ty: syn::Ty,
-) -> Tokens {
-    match item.body {
-        Body::Enum(ref variants) => {
-            serialize_item_enum(
-                &item.ident,
-                impl_generics,
-                ty,
-                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(
-                impl_generics,
-                ty,
-                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(
-                impl_generics,
-                ty,
-                fields,
-                &item.attrs)
-        }
-        Body::Struct(Style::Newtype, ref fields) => {
-            serialize_newtype_struct(
-                impl_generics,
-                ty,
-                &fields[0],
-                &item.attrs)
-        }
-        Body::Struct(Style::Unit, _) => {
-            serialize_unit_struct(
-                &item.attrs)
-        }
-    }
-}
-
-fn serialize_unit_struct(item_attrs: &attr::Item) -> Tokens {
-    let type_name = item_attrs.name().serialize_name();
-
-    quote! {
-        _serializer.serialize_unit_struct(#type_name)
-    }
-}
-
-fn serialize_newtype_struct(
-    impl_generics: &syn::Generics,
-    item_ty: syn::Ty,
-    field: &Field,
-    item_attrs: &attr::Item,
-) -> Tokens {
-    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(
-            &item_ty, impl_generics, field.ty, path, field_expr);
-    }
-
-    quote! {
-        _serializer.serialize_newtype_struct(#type_name, #field_expr)
-    }
-}
-
-fn serialize_tuple_struct(
-    impl_generics: &syn::Generics,
-    ty: syn::Ty,
-    fields: &[Field],
-    item_attrs: &attr::Item,
-) -> Tokens {
-    let serialize_stmts = serialize_tuple_struct_visitor(
-        ty.clone(),
-        fields,
-        impl_generics,
-        false,
-        aster::id("serialize_tuple_struct_elt"),
-    );
-
-    let type_name = item_attrs.name().serialize_name();
-    let len = serialize_stmts.len();
-    let let_mut = mut_if(len > 0);
-
-    quote! {
-        let #let_mut __serde_state = try!(_serializer.serialize_tuple_struct(#type_name, #len));
-        #(serialize_stmts)*
-        _serializer.serialize_tuple_struct_end(__serde_state)
-    }
-}
-
-fn serialize_struct(
-    impl_generics: &syn::Generics,
-    ty: syn::Ty,
-    fields: &[Field],
-    item_attrs: &attr::Item,
-) -> Tokens {
-    let serialize_fields = serialize_struct_visitor(
-        ty.clone(),
-        fields,
-        impl_generics,
-        false,
-        aster::id("serialize_struct_elt"),
-    );
-
-    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! {
-        let #let_mut __serde_state = try!(_serializer.serialize_struct(#type_name, #len));
-        #(serialize_fields)*
-        _serializer.serialize_struct_end(__serde_state)
-    }
-}
-
-fn serialize_item_enum(
-    type_ident: &syn::Ident,
-    impl_generics: &syn::Generics,
-    ty: syn::Ty,
-    variants: &[Variant],
-    item_attrs: &attr::Item,
-) -> Tokens {
-    let arms: Vec<_> =
-        variants.iter()
-            .enumerate()
-            .map(|(variant_index, variant)| {
-                serialize_variant(
-                    type_ident,
-                    impl_generics,
-                    ty.clone(),
-                    variant,
-                    variant_index,
-                    item_attrs,
-                )
-            })
-            .collect();
-
-    quote! {
-        match *self {
-            #(arms)*
-        }
-    }
-}
-
-fn serialize_variant(
-    type_ident: &syn::Ident,
-    generics: &syn::Generics,
-    ty: syn::Ty,
-    variant: &Variant,
-    variant_index: usize,
-    item_attrs: &attr::Item,
-) -> Tokens {
-    let type_name = item_attrs.name().serialize_name();
-
-    let variant_ident = variant.ident.clone();
-    let variant_name = variant.attrs.name().serialize_name();
-
-    match variant.style {
-        Style::Unit => {
-            quote! {
-                #type_ident::#variant_ident =>
-                    _serde::ser::Serializer::serialize_unit_variant(
-                        _serializer,
-                        #type_name,
-                        #variant_index,
-                        #variant_name,
-                    ),
-            }
-        },
-        Style::Newtype => {
-            let block = serialize_newtype_variant(
-                type_name,
-                variant_index,
-                variant_name,
-                ty,
-                generics,
-                &variant.fields[0],
-            );
-
-            quote! {
-                #type_ident::#variant_ident(ref __simple_value) => #block,
-            }
-        },
-        Style::Tuple => {
-            let field_names: Vec<Tokens> = (0 .. variant.fields.len())
-                .map(|i| {
-                    let id = aster::id(format!("__field{}", i));
-                    quote!(ref #id)
-                })
-                .collect();
-
-            let pat = quote!(#type_ident::#variant_ident(#(field_names),*));
-
-            let block = serialize_tuple_variant(
-                type_name,
-                variant_index,
-                variant_name,
-                generics,
-                ty,
-                &variant.fields,
-            );
-
-            quote! {
-                #pat => { #block }
-            }
-        }
-        Style::Struct => {
-            let fields = variant.fields.iter().map(|field| {
-                let id = match field.ident {
-                    Some(ref name) => name.clone(),
-                    None => panic!("struct variant has unnamed fields"),
-                };
-                quote!(ref #id)
-            });
-            let pat = quote!(#type_ident::#variant_ident { #(fields),* });
-
-            let block = serialize_struct_variant(
-                variant_index,
-                variant_name,
-                generics,
-                ty,
-                &variant.fields,
-                item_attrs,
-            );
-
-            quote! {
-                #pat => { #block }
-            }
-        }
-    }
-}
-
-fn serialize_newtype_variant(
-    type_name: String,
-    variant_index: usize,
-    variant_name: String,
-    item_ty: syn::Ty,
-    generics: &syn::Generics,
-    field: &Field,
-) -> Tokens {
-    let mut field_expr = quote!(__simple_value);
-    if let Some(path) = field.attrs.serialize_with() {
-        field_expr = wrap_serialize_with(
-            &item_ty, generics, field.ty, path, field_expr);
-    }
-
-    quote! {
-        _serde::ser::Serializer::serialize_newtype_variant(
-            _serializer,
-            #type_name,
-            #variant_index,
-            #variant_name,
-            #field_expr,
-        )
-    }
-}
-
-fn serialize_tuple_variant(
-    type_name: String,
-    variant_index: usize,
-    variant_name: String,
-    generics: &syn::Generics,
-    structure_ty: syn::Ty,
-    fields: &[Field],
-) -> Tokens {
-    let serialize_stmts = serialize_tuple_struct_visitor(
-        structure_ty,
-        fields,
-        generics,
-        true,
-        aster::id("serialize_tuple_variant_elt"),
-    );
-
-    let len = serialize_stmts.len();
-    let let_mut = mut_if(len > 0);
-
-    quote! {
-        let #let_mut __serde_state = try!(_serializer.serialize_tuple_variant(
-            #type_name,
-            #variant_index,
-            #variant_name,
-            #len));
-        #(serialize_stmts)*
-        _serializer.serialize_tuple_variant_end(__serde_state)
-    }
-}
-
-fn serialize_struct_variant(
-    variant_index: usize,
-    variant_name: String,
-    generics: &syn::Generics,
-    ty: syn::Ty,
-    fields: &[Field],
-    item_attrs: &attr::Item,
-) -> Tokens {
-    let serialize_fields = serialize_struct_visitor(
-        ty.clone(),
-        fields,
-        generics,
-        true,
-        aster::id("serialize_struct_variant_elt"),
-    );
-
-    let item_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");
-
-            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));
-
-    quote! {
-        let #let_mut __serde_state = try!(_serializer.serialize_struct_variant(
-            #item_name,
-            #variant_index,
-            #variant_name,
-            #len,
-        ));
-        #(serialize_fields)*
-        _serializer.serialize_struct_variant_end(__serde_state)
-    }
-}
-
-fn serialize_tuple_struct_visitor(
-    structure_ty: syn::Ty,
-    fields: &[Field],
-    generics: &syn::Generics,
-    is_enum: bool,
-    func: syn::Ident,
-) -> Vec<Tokens> {
-    fields.iter()
-        .enumerate()
-        .map(|(i, field)| {
-            let mut field_expr = if is_enum {
-                let id = aster::id(format!("__field{}", i));
-                quote!(#id)
-            } else {
-                let i = aster::id(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(
-                    &structure_ty, generics, field.ty, path, field_expr);
-            }
-
-            let ser = quote! {
-                try!(_serializer.#func(&mut __serde_state, #field_expr));
-            };
-
-            match skip {
-                None => ser,
-                Some(skip) => quote!(if !#skip { #ser }),
-            }
-        })
-        .collect()
-}
-
-fn serialize_struct_visitor(
-    structure_ty: syn::Ty,
-    fields: &[Field],
-    generics: &syn::Generics,
-    is_enum: bool,
-    func: syn::Ident,
-) -> Vec<Tokens> {
-    fields.iter()
-        .filter(|&field| !field.attrs.skip_serializing())
-        .map(|field| {
-            let ident = field.ident.clone().expect("struct has unnamed field");
-            let mut field_expr = if is_enum {
-                quote!(#ident)
-            } else {
-                quote!(&self.#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(
-                    &structure_ty, generics, field.ty, path, field_expr)
-            }
-
-            let ser = quote! {
-                try!(_serializer.#func(&mut __serde_state, #key_expr, #field_expr));
-            };
-
-            match skip {
-                None => ser,
-                Some(skip) => quote!(if !#skip { #ser }),
-            }
-        })
-        .collect()
-}
-
-fn wrap_serialize_with(
-    item_ty: &syn::Ty,
-    generics: &syn::Generics,
-    field_ty: &syn::Ty,
-    path: &syn::Path,
-    value: Tokens,
-) -> Tokens {
-    let where_clause = &generics.where_clause;
-
-    let wrapper_generics = aster::from_generics(generics.clone())
-        .add_lifetime_bound("'__a")
-        .lifetime_name("'__a")
-        .build();
-
-    let wrapper_ty = aster::path()
-        .segment("__SerializeWith")
-            .with_generics(wrapper_generics.clone())
-            .build()
-        .build();
-
-    quote!({
-        struct __SerializeWith #wrapper_generics #where_clause {
-            value: &'__a #field_ty,
-            phantom: ::std::marker::PhantomData<#item_ty>,
-        }
-
-        impl #wrapper_generics _serde::ser::Serialize for #wrapper_ty #where_clause {
-            fn serialize<__S>(&self, __s: &mut __S) -> ::std::result::Result<(), __S::Error>
-                where __S: _serde::ser::Serializer
-            {
-                #path(self.value, __s)
-            }
-        }
-
-        __SerializeWith {
-            value: #value,
-            phantom: ::std::marker::PhantomData::<#item_ty>,
-        }
-    })
-}
-
-// Serialization of an empty struct results in code like:
-//
-//     let mut __serde_state = try!(serializer.serialize_struct("S", 0));
-//     serializer.serialize_struct_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_codegen_internals/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_codegen_internals"
-version = "0.9.0"
+version = "0.14.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "AST representation used by Serde codegen. Unstable."
@@ -8,11 +8,11 @@ homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
 documentation = "https://docs.serde.rs/serde_codegen_internals/"
 keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
-
-[features]
-unstable-testing = ["clippy"]
+readme = "../README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [dependencies]
-clippy = { version = "^0.*", optional = true }
-syn = "0.8"
+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

@@ -39,9 +39,7 @@ impl<'a> Item<'a> {
         let attrs = attr::Item::from_ast(cx, item);
 
         let body = match item.body {
-            syn::Body::Enum(ref variants) => {
-                Body::Enum(enum_from_ast(cx, variants))
-            }
+            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)
@@ -58,15 +56,13 @@ impl<'a> Item<'a> {
 }
 
 impl<'a> Body<'a> {
-    pub fn all_fields(&'a self) -> Box<Iterator<Item=&'a Field<'a>> + '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())
+                    .flat_map(|variant| variant.fields.iter()))
             }
+            Body::Struct(_, ref fields) => Box::new(fields.iter()),
         }
     }
 }
@@ -87,18 +83,12 @@ fn enum_from_ast<'a>(cx: &Ctxt, variants: &'a [syn::Variant]) -> Vec<Variant<'a>
 
 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::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())
-        }
+        syn::VariantData::Tuple(ref fields) => (Style::Tuple, fields_from_ast(cx, fields)),
+        syn::VariantData::Unit => (Style::Unit, Vec::new()),
     }
 }
 

serde_codegen_internals/src/attr.rs

@@ -1,5 +1,7 @@
 use Ctxt;
 use syn;
+use syn::MetaItem::{List, NameValue, Word};
+use syn::NestedMetaItem::{Literal, MetaItem};
 
 // This module handles parsing of `#[serde(...)]` attributes. The entrypoints
 // are `attr::Item::from_ast`, `attr::Variant::from_ast`, and
@@ -88,8 +90,42 @@ impl Name {
 pub struct Item {
     name: Name,
     deny_unknown_fields: bool,
+    default: Default,
     ser_bound: Option<Vec<syn::WherePredicate>>,
     de_bound: Option<Vec<syn::WherePredicate>>,
+    tag: EnumTag,
+}
+
+/// 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 {
@@ -98,14 +134,18 @@ impl Item {
         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 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");
 
         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")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "rename" => {
+                    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);
@@ -113,7 +153,7 @@ impl Item {
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    syn::MetaItem::List(ref name, ref meta_items) if name == "rename" => {
+                    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);
@@ -121,42 +161,160 @@ impl Item {
                     }
 
                     // Parse `#[serde(deny_unknown_fields)]`
-                    syn::MetaItem::Word(ref name) if name == "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")]`
-                    syn::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) {
+                    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"))]`
-                    syn::MetaItem::List(ref name, ref meta_items) if name == "bound" => {
+                    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")
+                                }
+                            }
+                        }
+                    }
+
+                    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),
             ser_bound: ser_bound.get(),
             de_bound: de_bound.get(),
+            tag: tag,
         }
     }
 
@@ -168,6 +326,10 @@ impl Item {
         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[..])
     }
@@ -175,24 +337,32 @@ impl Item {
     pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
         self.de_bound.as_ref().map(|vec| &vec[..])
     }
+
+    pub fn tag(&self) -> &EnumTag {
+        &self.tag
+    }
 }
 
 /// Represents variant attribute information
 #[derive(Debug)]
 pub struct Variant {
     name: Name,
+    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");
 
         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")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "rename" => {
+                    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);
@@ -200,16 +370,27 @@ impl Variant {
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    syn::MetaItem::List(ref name, ref meta_items) if name == "rename" => {
+                    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(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();
+                    }
 
-                    _ => {
-                        cx.error(format!("unknown serde variant attribute `{}`",
-                                         meta_item.name()));
+                    MetaItem(ref meta_item) => {
+                        cx.error(format!("unknown serde variant attribute `{}`", meta_item.name()));
+                    }
+
+                    Literal(_) => {
+                        cx.error("unexpected literal in serde variant attribute");
                     }
                 }
             }
@@ -220,12 +401,22 @@ impl Variant {
                 serialize: ser_name.get().unwrap_or_else(|| variant.ident.to_string()),
                 deserialize: de_name.get().unwrap_or_else(|| variant.ident.to_string()),
             },
+            skip_deserializing: skip_deserializing.get(),
+            skip_serializing: skip_serializing.get(),
         }
     }
 
     pub fn name(&self) -> &Name {
         &self.name
     }
+
+    pub fn skip_deserializing(&self) -> bool {
+        self.skip_deserializing
+    }
+
+    pub fn skip_serializing(&self) -> bool {
+        self.skip_serializing
+    }
 }
 
 /// Represents field attribute information
@@ -235,7 +426,7 @@ pub struct Field {
     skip_serializing: bool,
     skip_deserializing: bool,
     skip_serializing_if: Option<syn::Path>,
-    default: FieldDefault,
+    default: Default,
     serialize_with: Option<syn::Path>,
     deserialize_with: Option<syn::Path>,
     ser_bound: Option<Vec<syn::WherePredicate>>,
@@ -244,7 +435,7 @@ pub struct Field {
 
 /// Represents the default to use for a field when deserializing.
 #[derive(Debug, PartialEq)]
-pub enum FieldDefault {
+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()`.
@@ -255,9 +446,7 @@ pub enum FieldDefault {
 
 impl Field {
     /// Extract out the `#[serde(...)]` attributes from a struct field.
-    pub fn from_ast(cx: &Ctxt,
-                    index: usize,
-                    field: &syn::Field) -> Self {
+    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");
@@ -278,7 +467,7 @@ impl Field {
             for meta_item in meta_items {
                 match meta_item {
                     // Parse `#[serde(rename="foo")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "rename" => {
+                    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);
@@ -286,7 +475,7 @@ impl Field {
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    syn::MetaItem::List(ref name, ref meta_items) if name == "rename" => {
+                    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);
@@ -294,67 +483,83 @@ impl Field {
                     }
 
                     // Parse `#[serde(default)]`
-                    syn::MetaItem::Word(ref name) if name == "default" => {
-                        default.set(FieldDefault::Default);
+                    MetaItem(Word(ref name)) if name == "default" => {
+                        default.set(Default::Default);
                     }
 
                     // Parse `#[serde(default="...")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "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(FieldDefault::Path(path));
+                            default.set(Default::Path(path));
                         }
                     }
 
                     // Parse `#[serde(skip_serializing)]`
-                    syn::MetaItem::Word(ref name) if name == "skip_serializing" => {
+                    MetaItem(Word(ref name)) if name == "skip_serializing" => {
                         skip_serializing.set_true();
                     }
 
                     // Parse `#[serde(skip_deserializing)]`
-                    syn::MetaItem::Word(ref name) if name == "skip_deserializing" => {
+                    MetaItem(Word(ref name)) if name == "skip_deserializing" => {
                         skip_deserializing.set_true();
                     }
 
                     // Parse `#[serde(skip_serializing_if="...")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "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="...")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "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="...")]`
-                    syn::MetaItem::NameValue(ref name, ref lit) if name == "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")]`
-                    syn::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) {
+                    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"))]`
-                    syn::MetaItem::List(ref name, ref meta_items) if name == "bound" => {
+                    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);
                         }
                     }
 
-                    _ => {
-                        cx.error(format!("unknown serde field attribute `{}`",
-                                         meta_item.name()));
+                    MetaItem(ref meta_item) => {
+                        cx.error(format!("unknown serde field attribute `{}`", meta_item.name()));
+                    }
+
+                    Literal(_) => {
+                        cx.error("unexpected literal in serde field attribute");
                     }
                 }
             }
@@ -363,18 +568,18 @@ impl Field {
         // 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(FieldDefault::Default);
+            default.set_if_none(Default::Default);
         }
 
         Field {
             name: Name {
-                serialize: ser_name.get().unwrap_or(ident.clone()),
+                serialize: ser_name.get().unwrap_or_else(|| ident.clone()),
                 deserialize: de_name.get().unwrap_or(ident),
             },
             skip_serializing: skip_serializing.get(),
             skip_deserializing: skip_deserializing.get(),
             skip_serializing_if: skip_serializing_if.get(),
-            default: default.get().unwrap_or(FieldDefault::None),
+            default: default.get().unwrap_or(Default::None),
             serialize_with: serialize_with.get(),
             deserialize_with: deserialize_with.get(),
             ser_bound: ser_bound.get(),
@@ -398,7 +603,7 @@ impl Field {
         self.skip_serializing_if.as_ref()
     }
 
-    pub fn default(&self) -> &FieldDefault {
+    pub fn default(&self) -> &Default {
         &self.default
     }
 
@@ -421,33 +626,33 @@ impl Field {
 
 type SerAndDe<T> = (Option<T>, Option<T>);
 
-fn get_ser_and_de<T, F>(
-    cx: &Ctxt,
-    attr_name: &'static str,
-    items: &[syn::MetaItem],
-    f: F
-) -> Result<SerAndDe<T>, ()>
-    where F: Fn(&Ctxt, &str, &str, &syn::Lit) -> Result<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 {
-            syn::MetaItem::NameValue(ref name, ref lit) if name == "serialize" => {
+            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);
                 }
             }
 
-            syn::MetaItem::NameValue(ref name, ref lit) if name == "deserialize" => {
+            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 = ...)`",
+                cx.error(format!("malformed {0} attribute, expected `{0}(serialize = ..., \
+                                  deserialize = ...)`",
                                  attr_name));
                 return Err(());
             }
@@ -457,35 +662,34 @@ fn get_ser_and_de<T, F>(
     Ok((ser_item.get(), de_item.get()))
 }
 
-fn get_renames(
-    cx: &Ctxt,
-    items: &[syn::MetaItem],
-) -> Result<SerAndDe<String>, ()> {
+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::MetaItem],
-) -> Result<SerAndDe<Vec<syn::WherePredicate>>, ()> {
+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::MetaItem>> {
+pub fn get_serde_meta_items(attr: &syn::Attribute) -> Option<Vec<syn::NestedMetaItem>> {
     match attr.value {
-        syn::MetaItem::List(ref name, ref items) if name == "serde" => {
-            Some(items.iter().cloned().collect())
-        }
-        _ => None
+        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, ()> {
+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));
+                         attr_name,
+                         meta_item_name));
         Err(())
     }
 }
@@ -495,7 +699,11 @@ fn parse_lit_into_path(cx: &Ctxt, attr_name: &str, lit: &syn::Lit) -> Result<syn
     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>, ()> {
+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());

serde_codegen_internals/src/ctxt.rs

@@ -8,9 +8,7 @@ pub struct Ctxt {
 
 impl Ctxt {
     pub fn new() -> Self {
-        Ctxt {
-            errors: RefCell::new(Some(Vec::new())),
-        }
+        Ctxt { errors: RefCell::new(Some(Vec::new())) }
     }
 
     pub fn error<T: Display>(&self, msg: T) {

serde_codegen_internals/src/lib.rs

@@ -1,6 +1,3 @@
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-
 extern crate syn;
 
 pub mod ast;

serde_derive/Cargo.toml

@@ -1,27 +1,27 @@
 [package]
 name = "serde_derive"
-version = "0.8.11"
+version = "0.9.9"
 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"]
-include = ["Cargo.toml", "src/**/*.rs"]
+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"
-rustc-macro = true
+proc-macro = true
 
-[dependencies.serde_codegen]
-version = "=0.8.11"
-path = "../serde_codegen"
-default-features = false
-features = ["with-syn"]
-
-[dev-dependencies]
-compiletest_rs = "^0.2.0"
-fnv = "1.0"
-serde = { version = "0.8.11", path = "../serde" }
-serde_test = { version = "0.8.11", path = "../serde_test" }
+[dependencies]
+quote = "0.3.8"
+serde_codegen_internals = { version = "=0.14.0", 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

@@ -1,24 +1,39 @@
-#![feature(rustc_macro, rustc_macro_lib)]
-#![cfg(not(test))]
+#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "cargo-clippy", allow(used_underscore_binding))]
 
-extern crate rustc_macro;
-extern crate serde_codegen;
+// The `quote!` macro requires deep recursion.
+#![recursion_limit = "192"]
 
-use rustc_macro::TokenStream;
+extern crate syn;
+#[macro_use]
+extern crate quote;
 
-#[rustc_macro_derive(Serialize)]
+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 item = format!("#[derive(Serialize)]\n{}", input);
-    match serde_codegen::expand_single_item(&item) {
+    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),
     }
 }
 
-#[rustc_macro_derive(Deserialize)]
+#[proc_macro_derive(Deserialize, attributes(serde))]
 pub fn derive_deserialize(input: TokenStream) -> TokenStream {
-    let item = format!("#[derive(Deserialize)]\n{}", input);
-    match serde_codegen::expand_single_item(&item) {
+    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,782 @@
+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 {
+    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_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_derive/tests/compile_tests.rs

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

serde_derive/tests/test.rs

@@ -1,10 +0,0 @@
-#![feature(test, rustc_macro, rustc_attrs)]
-
-#[macro_use]
-extern crate serde_derive;
-
-extern crate test;
-
-include!("../../testing/tests/test.rs.in");
-
-mod compile_tests;

serde_test/Cargo.toml

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

@@ -8,14 +8,14 @@ use token::Token;
 use std::fmt::Debug;
 
 pub fn assert_tokens<T>(value: &T, tokens: &[Token<'static>])
-    where T: Serialize + Deserialize + PartialEq + Debug,
+    where T: Serialize + Deserialize + PartialEq + Debug
 {
     assert_ser_tokens(value, tokens);
     assert_de_tokens(value, tokens);
 }
 
 pub fn assert_ser_tokens<T>(value: &T, tokens: &[Token])
-    where T: Serialize,
+    where T: Serialize
 {
     let mut ser = Serializer::new(tokens.iter());
     assert_eq!(Serialize::serialize(value, &mut ser), Ok(()));
@@ -24,7 +24,7 @@ pub fn assert_ser_tokens<T>(value: &T, tokens: &[Token])
 
 /// Expect an error serializing `T`.
 pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: Error)
-    where T: Serialize + PartialEq + Debug,
+    where T: Serialize + PartialEq + Debug
 {
     let mut ser = Serializer::new(tokens.iter());
     let v: Result<(), Error> = Serialize::serialize(value, &mut ser);
@@ -33,7 +33,7 @@ pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: Error)
 }
 
 pub fn assert_de_tokens<T>(value: &T, tokens: &[Token<'static>])
-    where T: Deserialize + PartialEq + Debug,
+    where T: Deserialize + PartialEq + Debug
 {
     let mut de = Deserializer::new(tokens.to_vec().into_iter());
     let v: Result<T, Error> = Deserialize::deserialize(&mut de);
@@ -43,7 +43,7 @@ pub fn assert_de_tokens<T>(value: &T, tokens: &[Token<'static>])
 
 /// Expect an error deserializing tokens into a `T`.
 pub fn assert_de_tokens_error<T>(tokens: &[Token<'static>], error: Error)
-    where T: Deserialize + PartialEq + Debug,
+    where T: Deserialize + PartialEq + Debug
 {
     let mut de = Deserializer::new(tokens.to_vec().into_iter());
     let v: Result<T, Error> = Deserialize::deserialize(&mut de);

serde_test/src/error.rs

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

@@ -1,13 +1,9 @@
+#[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,
-};
+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;

serde_test/src/ser.rs

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

serde_test/src/token.rs

@@ -1,12 +1,10 @@
 #[derive(Clone, PartialEq, Debug)]
 pub enum Token<'a> {
     Bool(bool),
-    Isize(isize),
     I8(i8),
     I16(i16),
     I32(i32),
     I64(i64),
-    Usize(usize),
     U8(u8),
     U16(u16),
     U32(u32),
@@ -17,6 +15,7 @@ pub enum Token<'a> {
     Str(&'a str),
     String(String),
     Bytes(&'a [u8]),
+    ByteBuf(Vec<u8>),
 
     Option(bool),
 

test_suite/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "serde_test_suite"
+version = "0.0.0"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+publish = false
+
+[features]
+unstable-testing = [
+    "compiletest_rs",
+    "serde/unstable-testing",
+]
+
+[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]]
+name = "test"
+path = "tests/test.rs"

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,52 @@
+#![feature(lang_items, start, libc)]
+#![no_std]
+
+extern crate libc;
+
+#[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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename="x", serialize="y")] //~^^ HELP: unknown serde field attribute `serialize`
     x: (),

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename="x")]
     #[serde(rename(deserialize="y"))] //~^^^ HELP: duplicate serde attribute `rename`

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x"), rename(serialize="y"))] //~^^ HELP: duplicate serde attribute `rename`
     x: (),

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x"))]
     #[serde(rename="y")] //~^^^ HELP: duplicate serde attribute `rename`

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x", serialize="y"))] //~^^ HELP: duplicate serde attribute `rename`
     x: (),

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct S {
     #[serde(rename(serialize="x"))]
     #[serde(rename(serialize="y"))] //~^^^ HELP: duplicate serde attribute `rename`

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

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

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(abc="xyz")] //~^ HELP: unknown serde container attribute `abc`
 struct A {
     x: u32,

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 struct C {
     #[serde(abc="xyz")] //~^^ HELP: unknown serde field attribute `abc`
     x: u32,

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

@@ -1,9 +1,7 @@
-#![feature(rustc_macro)]
-
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 enum E {
     #[serde(abc="xyz")] //~^^ HELP: unknown serde variant attribute `abc`
     V,

test_suite/tests/compiletest.rs

@@ -0,0 +1,26 @@
+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

@@ -1,31 +1,3 @@
-#[macro_export]
-macro_rules! declare_ser_tests {
-    ($($name:ident { $($value:expr => $tokens:expr,)+ })+) => {
-        $(
-            #[test]
-            fn $name() {
-                $(
-                    assert_ser_tokens(&$value, $tokens);
-                )+
-            }
-        )+
-    }
-}
-
-#[macro_export]
-macro_rules! btreemap {
-    () => {
-        BTreeMap::new()
-    };
-    ($($key:expr => $value:expr),+) => {
-        {
-            let mut map = BTreeMap::new();
-            $(map.insert($key, $value);)+
-            map
-        }
-    }
-}
-
 macro_rules! btreeset {
     () => {
         BTreeSet::new()

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

@@ -1,4 +1,3 @@
-#![feature(rustc_macro)]
 #![deny(identity_op)]
 
 #[macro_use]

test_suite/tests/test.rs

@@ -0,0 +1,23 @@
+#![cfg_attr(feature = "unstable-testing", feature(test, non_ascii_idents))]
+
+#[cfg(feature = "unstable-testing")]
+extern crate test;
+
+#[macro_use]
+extern crate serde_derive;
+
+extern crate serde;
+extern crate serde_test;
+
+#[macro_use]
+mod macros;
+
+mod test_annotations;
+mod test_bytes;
+mod test_de;
+mod test_gen;
+mod test_macros;
+mod test_ser;
+
+#[cfg(feature = "unstable-testing")]
+mod compiletest;

test_suite/tests/test_annotations.rs

@@ -20,12 +20,12 @@ trait ShouldSkip: Sized {
 }
 
 trait SerializeWith: Sized {
-    fn serialize_with<S>(&self, ser: &mut S) -> Result<(), S::Error>
+    fn serialize_with<S>(&self, ser: S) -> Result<S::Ok, S::Error>
         where S: Serializer;
 }
 
 trait DeserializeWith: Sized {
-    fn deserialize_with<D>(de: &mut D) -> Result<Self, D::Error>
+    fn deserialize_with<D>(de: D) -> Result<Self, D::Error>
         where D: Deserializer;
 }
 
@@ -38,7 +38,7 @@ impl ShouldSkip for i32 {
 }
 
 impl SerializeWith for i32 {
-    fn serialize_with<S>(&self, ser: &mut S) -> Result<(), S::Error>
+    fn serialize_with<S>(&self, ser: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         if *self == 123 {
@@ -50,7 +50,7 @@ impl SerializeWith for i32 {
 }
 
 impl DeserializeWith for i32 {
-    fn deserialize_with<D>(de: &mut D) -> Result<Self, D::Error>
+    fn deserialize_with<D>(de: D) -> Result<Self, D::Error>
         where D: Deserializer
     {
         if try!(Deserialize::deserialize(de)) {
@@ -145,7 +145,7 @@ fn test_default_enum() {
     assert_de_tokens(
         &DefaultEnum::Struct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
         &[
-            Token::EnumMapStart("DefaultEnum", "Struct", 5),
+            Token::EnumMapStart("DefaultEnum", "Struct", 3),
 
             Token::EnumMapSep,
             Token::Str("a1"),
@@ -174,7 +174,7 @@ fn test_default_enum() {
     assert_de_tokens(
         &DefaultEnum::Struct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 },
         &[
-            Token::EnumMapStart("DefaultEnum", "Struct", 5),
+            Token::EnumMapStart("DefaultEnum", "Struct", 3),
 
             Token::EnumMapSep,
             Token::Str("a1"),
@@ -239,7 +239,7 @@ impl Default for NotDeserializeStruct {
 }
 
 impl DeserializeWith for NotDeserializeStruct {
-    fn deserialize_with<D>(_: &mut D) -> Result<Self, D::Error>
+    fn deserialize_with<D>(_: D) -> Result<Self, D::Error>
         where D: Deserializer
     {
         panic!()
@@ -343,7 +343,7 @@ fn test_ignore_unknown() {
             Token::StructSep,
             Token::Str("whoops"),
         ],
-        Error::UnknownField("whoops".to_owned())
+        Error::Message("unknown field `whoops`, expected `a1`".to_owned())
     );
 }
 
@@ -642,7 +642,7 @@ struct NotSerializeStruct(i8);
 enum NotSerializeEnum { Trouble }
 
 impl SerializeWith for NotSerializeEnum {
-    fn serialize_with<S>(&self, ser: &mut S) -> Result<(), S::Error>
+    fn serialize_with<S>(&self, ser: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         "trouble".serialize(ser)
@@ -905,7 +905,7 @@ fn test_missing_renamed_field_struct() {
 
             Token::StructEnd,
         ],
-        Error::MissingField("a3"),
+        Error::Message("missing field `a3`".to_owned()),
     );
 
     assert_de_tokens_error::<RenameStructSerializeDeserialize>(
@@ -918,7 +918,7 @@ fn test_missing_renamed_field_struct() {
 
             Token::StructEnd,
         ],
-        Error::MissingField("a5"),
+        Error::Message("missing field `a5`".to_owned()),
     );
 }
 
@@ -930,7 +930,7 @@ fn test_missing_renamed_field_enum() {
 
             Token::EnumMapEnd,
         ],
-        Error::MissingField("b"),
+        Error::Message("missing field `b`".to_owned()),
     );
 
     assert_de_tokens_error::<RenameEnumSerializeDeserialize<i8>>(
@@ -943,7 +943,7 @@ fn test_missing_renamed_field_enum() {
 
             Token::EnumMapEnd,
         ],
-        Error::MissingField("d"),
+        Error::Message("missing field `d`".to_owned()),
     );
 }
 
@@ -962,7 +962,7 @@ fn test_invalid_length_enum() {
                 Token::I32(1),
             Token::EnumSeqEnd,
         ],
-        Error::InvalidLength(1),
+        Error::Message("invalid length 1, expected tuple of 3 elements".to_owned()),
     );
     assert_de_tokens_error::<InvalidLengthEnum>(
         &[
@@ -971,6 +971,6 @@ fn test_invalid_length_enum() {
                 Token::I32(1),
             Token::EnumSeqEnd,
         ],
-        Error::InvalidLength(1),
+        Error::Message("invalid length 1, expected tuple of 2 elements".to_owned()),
     );
 }

test_suite/tests/test_bytes.rs

@@ -0,0 +1,55 @@
+use serde::bytes::{ByteBuf, Bytes};
+use serde_test::{assert_tokens, assert_ser_tokens, assert_de_tokens, Token};
+
+#[test]
+fn test_bytes() {
+    let empty = Bytes::new(&[]);
+    assert_ser_tokens(&empty, &[Token::Bytes(b"")]);
+
+    let buf = vec![65, 66, 67];
+    let bytes = Bytes::new(&buf);
+    assert_ser_tokens(&bytes, &[Token::Bytes(b"ABC")]);
+}
+
+#[test]
+fn test_byte_buf() {
+    let empty = ByteBuf::new();
+    assert_tokens(&empty, &[Token::Bytes(b"")]);
+    assert_de_tokens(&empty, &[Token::ByteBuf(Vec::new())]);
+    assert_de_tokens(&empty, &[Token::Str("")]);
+    assert_de_tokens(&empty, &[Token::String(String::new())]);
+    assert_de_tokens(&empty, &[
+        Token::SeqStart(None),
+        Token::SeqEnd,
+    ]);
+    assert_de_tokens(&empty, &[
+        Token::SeqStart(Some(0)),
+        Token::SeqEnd,
+    ]);
+
+    let buf = ByteBuf::from(vec![65, 66, 67]);
+    assert_tokens(&buf, &[Token::Bytes(b"ABC")]);
+    assert_de_tokens(&buf, &[Token::ByteBuf(vec![65, 66, 67])]);
+    assert_de_tokens(&buf, &[Token::Str("ABC")]);
+    assert_de_tokens(&buf, &[Token::String("ABC".to_owned())]);
+    assert_de_tokens(&buf, &[
+        Token::SeqStart(None),
+        Token::SeqSep,
+        Token::U8(65),
+        Token::SeqSep,
+        Token::U8(66),
+        Token::SeqSep,
+        Token::U8(67),
+        Token::SeqEnd,
+    ]);
+    assert_de_tokens(&buf, &[
+        Token::SeqStart(Some(3)),
+        Token::SeqSep,
+        Token::U8(65),
+        Token::SeqSep,
+        Token::U8(66),
+        Token::SeqSep,
+        Token::U8(67),
+        Token::SeqEnd,
+    ]);
+}

test_suite/tests/test_de.rs

@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::net;
 use std::path::PathBuf;
 use std::time::Duration;
+use std::default::Default;
 
 use serde::Deserialize;
 
@@ -32,12 +33,59 @@ struct Struct {
     c: i32,
 }
 
+#[derive(PartialEq, Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+struct StructDenyUnknown {
+    a: i32,
+    #[serde(skip_deserializing)]
+    b: i32,
+}
+
+#[derive(PartialEq, Debug, Deserialize)]
+#[serde(default)]
+struct StructDefault<T> {
+    a: i32,
+    b: T,
+}
+
+impl Default for StructDefault<String> {
+    fn default() -> Self {
+        StructDefault {
+            a: 100,
+            b: "default".to_string(),
+        }
+    }
+}
+
+#[derive(PartialEq, Debug, Deserialize)]
+struct StructSkipAll {
+    #[serde(skip_deserializing)]
+    a: i32,
+}
+
+#[derive(PartialEq, Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+struct StructSkipAllDenyUnknown {
+    #[serde(skip_deserializing)]
+    a: i32,
+}
+
 #[derive(PartialEq, Debug, Deserialize)]
 enum Enum {
+    #[allow(dead_code)]
+    #[serde(skip_deserializing)]
+    Skipped,
     Unit,
     Simple(i32),
     Seq(i32, i32, i32),
-    Map { a: i32, b: i32, c: i32 }
+    Map { a: i32, b: i32, c: i32 },
+}
+
+#[derive(PartialEq, Debug, Deserialize)]
+enum EnumSkipAll {
+    #[allow(dead_code)]
+    #[serde(skip_deserializing)]
+    Skipped,
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -66,7 +114,7 @@ macro_rules! declare_tests {
 }
 
 macro_rules! declare_error_tests {
-    ($($name:ident<$target:ident> { $tokens:expr, $expected:expr, })+) => {
+    ($($name:ident<$target:ty> { $tokens:expr, $expected:expr, })+) => {
         $(
             #[test]
             fn $name() {
@@ -124,12 +172,10 @@ declare_tests! {
         false => &[Token::Bool(false)],
     }
     test_isize {
-        0isize => &[Token::Isize(0)],
         0isize => &[Token::I8(0)],
         0isize => &[Token::I16(0)],
         0isize => &[Token::I32(0)],
         0isize => &[Token::I64(0)],
-        0isize => &[Token::Usize(0)],
         0isize => &[Token::U8(0)],
         0isize => &[Token::U16(0)],
         0isize => &[Token::U32(0)],
@@ -138,14 +184,12 @@ declare_tests! {
         0isize => &[Token::F64(0.)],
     }
     test_ints {
-        0isize => &[Token::Isize(0)],
         0i8 => &[Token::I8(0)],
         0i16 => &[Token::I16(0)],
         0i32 => &[Token::I32(0)],
         0i64 => &[Token::I64(0)],
     }
     test_uints {
-        0usize => &[Token::Usize(0)],
         0u8 => &[Token::U8(0)],
         0u16 => &[Token::U16(0)],
         0u32 => &[Token::U32(0)],
@@ -198,7 +242,7 @@ declare_tests! {
         ],
         () => &[
             Token::TupleStructStart("Anything", 0),
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
     }
     test_unit_struct {
@@ -215,6 +259,9 @@ declare_tests! {
             Token::SeqEnd,
         ],
     }
+    test_unit_string {
+        String::new() => &[Token::Unit],
+    }
     test_tuple_struct {
         TupleStruct(1, 2, 3) => &[
             Token::SeqStart(Some(3)),
@@ -300,7 +347,7 @@ declare_tests! {
         ],
         BTreeSet::<isize>::new() => &[
             Token::TupleStructStart("Anything", 0),
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
     }
     test_hashset {
@@ -328,7 +375,7 @@ declare_tests! {
         ],
         HashSet::<isize>::new() => &[
             Token::TupleStructStart("Anything", 0),
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
         hashset![FnvHasher @ 1, 2, 3] => &[
             Token::SeqStart(Some(3)),
@@ -378,7 +425,7 @@ declare_tests! {
         ],
         Vec::<isize>::new() => &[
             Token::TupleStructStart("Anything", 0),
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
     }
     test_array {
@@ -442,7 +489,7 @@ declare_tests! {
         ],
         [0; 0] => &[
             Token::TupleStructStart("Anything", 0),
-            Token::SeqEnd,
+            Token::TupleStructEnd,
         ],
     }
     test_tuple {
@@ -534,7 +581,7 @@ declare_tests! {
         ],
         BTreeMap::<isize, isize>::new() => &[
             Token::StructStart("Anything", 0),
-            Token::MapEnd,
+            Token::StructEnd,
         ],
     }
     test_hashmap {
@@ -588,7 +635,7 @@ declare_tests! {
         ],
         HashMap::<isize, isize>::new() => &[
             Token::StructStart("Anything", 0),
-            Token::MapEnd,
+            Token::StructEnd,
         ],
         hashmap![FnvHasher @ 1 => 2, 3 => 4] => &[
             Token::MapStart(Some(2)),
@@ -675,6 +722,46 @@ declare_tests! {
             Token::StructEnd,
         ],
     }
+    test_struct_skip_all {
+        StructSkipAll { a: 0 } => &[
+            Token::StructStart("StructSkipAll", 0),
+            Token::StructEnd,
+        ],
+        StructSkipAll { a: 0 } => &[
+            Token::StructStart("StructSkipAll", 1),
+                Token::StructSep,
+                Token::Str("a"),
+                Token::I32(1),
+
+                Token::StructSep,
+                Token::Str("b"),
+                Token::I32(2),
+            Token::StructEnd,
+        ],
+    }
+    test_struct_skip_all_deny_unknown {
+        StructSkipAllDenyUnknown { a: 0 } => &[
+            Token::StructStart("StructSkipAllDenyUnknown", 0),
+            Token::StructEnd,
+        ],
+    }
+    test_struct_default {
+        StructDefault { a: 50, b: "overwritten".to_string() } => &[
+            Token::StructStart("StructDefault", 1),
+                Token::StructSep,
+                Token::Str("a"),
+                Token::I32(50),
+
+                Token::StructSep,
+                Token::Str("b"),
+                Token::String("overwritten".to_string()),
+            Token::StructEnd,
+        ],
+        StructDefault { a: 100, b: "default".to_string() } => &[
+            Token::StructStart("StructDefault", 0),
+            Token::StructEnd,
+        ],
+    }
     test_enum_unit {
         Enum::Unit => &[
             Token::EnumUnit("Enum", "Unit"),
@@ -720,7 +807,7 @@ declare_tests! {
     test_enum_unit_usize {
         Enum::Unit => &[
             Token::EnumStart("Enum"),
-            Token::Usize(0),
+            Token::U32(0),
             Token::Unit,
         ],
     }
@@ -796,11 +883,51 @@ fn test_net_ipaddr() {
 }
 
 declare_error_tests! {
+    test_unknown_field<StructDenyUnknown> {
+        &[
+            Token::StructStart("StructDenyUnknown", 2),
+                Token::StructSep,
+                Token::Str("a"),
+                Token::I32(0),
+
+                Token::StructSep,
+                Token::Str("d"),
+        ],
+        Error::Message("unknown field `d`, expected `a`".to_owned()),
+    }
+    test_skipped_field_is_unknown<StructDenyUnknown> {
+        &[
+            Token::StructStart("StructDenyUnknown", 2),
+                Token::StructSep,
+                Token::Str("b"),
+        ],
+        Error::Message("unknown field `b`, expected `a`".to_owned()),
+    }
+    test_skip_all_deny_unknown<StructSkipAllDenyUnknown> {
+        &[
+            Token::StructStart("StructSkipAllDenyUnknown", 1),
+                Token::StructSep,
+                Token::Str("a"),
+        ],
+        Error::Message("unknown field `a`, there are no fields".to_owned()),
+    }
     test_unknown_variant<Enum> {
         &[
             Token::EnumUnit("Enum", "Foo"),
         ],
-        Error::UnknownVariant("Foo".to_owned()),
+        Error::Message("unknown variant `Foo`, expected one of `Unit`, `Simple`, `Seq`, `Map`".to_owned()),
+    }
+    test_enum_skipped_variant<Enum> {
+        &[
+            Token::EnumUnit("Enum", "Skipped"),
+        ],
+        Error::Message("unknown variant `Skipped`, expected one of `Unit`, `Simple`, `Seq`, `Map`".to_owned()),
+    }
+    test_enum_skip_all<EnumSkipAll> {
+        &[
+            Token::EnumUnit("EnumSkipAll", "Skipped"),
+        ],
+        Error::Message("unknown variant `Skipped`, there are no variants".to_owned()),
     }
     test_struct_seq_too_long<Struct> {
         &[
@@ -821,7 +948,7 @@ declare_error_tests! {
                 Token::MapSep,
                 Token::Str("a"),
         ],
-        Error::DuplicateField("a"),
+        Error::Message("duplicate field `a`".to_owned()),
     }
     test_duplicate_field_enum<Enum> {
         &[
@@ -833,6 +960,32 @@ declare_error_tests! {
                 Token::EnumMapSep,
                 Token::Str("a"),
         ],
-        Error::DuplicateField("a"),
+        Error::Message("duplicate field `a`".to_owned()),
+    }
+    test_enum_out_of_range<Enum> {
+        &[
+            Token::EnumStart("Enum"),
+            Token::U32(4),
+            Token::Unit,
+        ],
+        Error::Message("invalid value: integer `4`, expected variant index 0 <= i < 4".into()),
+    }
+    test_short_tuple<(u8, u8, u8)> {
+        &[
+            Token::TupleStart(1),
+            Token::TupleSep,
+            Token::U8(1),
+            Token::TupleEnd,
+        ],
+        Error::Message("invalid length 1, expected a tuple of size 3".into()),
+    }
+    test_short_array<[u8; 3]> {
+        &[
+            Token::SeqStart(Some(1)),
+            Token::SeqSep,
+            Token::U8(1),
+            Token::SeqEnd,
+        ],
+        Error::Message("invalid length 1, expected an array of length 3".into()),
     }
 }

test_suite/tests/test_gen.rs

@@ -8,11 +8,15 @@ use self::serde::de::{Deserialize, Deserializer};
 
 use std::borrow::Cow;
 use std::marker::PhantomData;
+use std::result::Result as StdResult;
 
 // Try to trip up the generated code if it fails to use fully qualified paths.
 #[allow(dead_code)]
 struct Result;
-use std::result::Result as StdResult;
+#[allow(dead_code)]
+struct Ok;
+#[allow(dead_code)]
+struct Err;
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -26,6 +30,14 @@ fn test_gen() {
     }
     assert::<With<i32>>();
 
+    #[derive(Serialize, Deserialize)]
+    struct WithTogether<T> {
+        t: T,
+        #[serde(with="both_x")]
+        x: X,
+    }
+    assert::<WithTogether<i32>>();
+
     #[derive(Serialize, Deserialize)]
     struct WithRef<'a, T: 'a> {
         #[serde(skip_deserializing)]
@@ -202,6 +214,91 @@ fn test_gen() {
         EmptyStruct {},
     }
     assert::<EmptyEnumVariant>();
+
+    #[cfg(feature = "unstable-testing")]
+    #[cfg_attr(feature = "unstable-testing", derive(Serialize, Deserialize))]
+    struct NonAsciiIdents {
+        σ: f64
+    }
+
+    #[derive(Serialize, Deserialize)]
+    struct EmptyBraced {}
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(deny_unknown_fields)]
+    struct EmptyBracedDenyUnknown {}
+
+    #[derive(Serialize, Deserialize)]
+    struct BracedSkipAll {
+        #[serde(skip_deserializing)]
+        f: u8,
+    }
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(deny_unknown_fields)]
+    struct BracedSkipAllDenyUnknown {
+        #[serde(skip_deserializing)]
+        f: u8,
+    }
+
+    #[cfg(feature = "unstable-testing")]
+    #[cfg_attr(feature = "unstable-testing", derive(Serialize, Deserialize))]
+    struct EmptyTuple();
+
+    #[cfg(feature = "unstable-testing")]
+    #[cfg_attr(feature = "unstable-testing", derive(Serialize, Deserialize))]
+    #[serde(deny_unknown_fields)]
+    struct EmptyTupleDenyUnknown();
+
+    #[derive(Serialize, Deserialize)]
+    struct TupleSkipAll(#[serde(skip_deserializing)] u8);
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(deny_unknown_fields)]
+    struct TupleSkipAllDenyUnknown(#[serde(skip_deserializing)] u8);
+
+    #[derive(Serialize, Deserialize)]
+    enum EmptyEnum {}
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(deny_unknown_fields)]
+    enum EmptyEnumDenyUnknown {}
+
+    #[derive(Serialize, Deserialize)]
+    enum EnumSkipAll {
+        #[serde(skip_deserializing)]
+        #[allow(dead_code)]
+        Variant,
+    }
+
+    #[cfg(feature = "unstable-testing")]
+    #[cfg_attr(feature = "unstable-testing", derive(Serialize, Deserialize))]
+    enum EmptyVariants {
+        Braced {},
+        Tuple(),
+        BracedSkip {
+            #[serde(skip_deserializing)]
+            f: u8,
+        },
+        TupleSkip(#[serde(skip_deserializing)] u8),
+    }
+
+    #[cfg(feature = "unstable-testing")]
+    #[cfg_attr(feature = "unstable-testing", derive(Serialize, Deserialize))]
+    #[serde(deny_unknown_fields)]
+    enum EmptyVariantsDenyUnknown {
+        Braced {},
+        Tuple(),
+        BracedSkip {
+            #[serde(skip_deserializing)]
+            f: u8,
+        },
+        TupleSkip(#[serde(skip_deserializing)] u8),
+    }
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(deny_unknown_fields)]
+    struct UnitDenyUnknown;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -210,32 +307,36 @@ fn assert<T: Serialize + Deserialize>() {}
 fn assert_ser<T: Serialize>() {}
 
 trait SerializeWith {
-    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> StdResult<(), S::Error>;
+    fn serialize_with<S: Serializer>(_: &Self, _: S) -> StdResult<S::Ok, S::Error>;
 }
 
 trait DeserializeWith: Sized {
-    fn deserialize_with<D: Deserializer>(_: &mut D) -> StdResult<Self, D::Error>;
+    fn deserialize_with<D: Deserializer>(_: D) -> StdResult<Self, D::Error>;
 }
 
 // Implements neither Serialize nor Deserialize
-struct X;
+pub struct X;
 
-fn ser_x<S: Serializer>(_: &X, _: &mut S) -> StdResult<(), S::Error> {
+pub fn ser_x<S: Serializer>(_: &X, _: S) -> StdResult<S::Ok, S::Error> {
     unimplemented!()
 }
 
-fn de_x<D: Deserializer>(_: &mut D) -> StdResult<X, D::Error> {
+pub fn de_x<D: Deserializer>(_: D) -> StdResult<X, D::Error> {
     unimplemented!()
 }
 
+mod both_x {
+    pub use super::{ser_x as serialize, de_x as deserialize};
+}
+
 impl SerializeWith for X {
-    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> StdResult<(), S::Error> {
+    fn serialize_with<S: Serializer>(_: &Self, _: S) -> StdResult<S::Ok, S::Error> {
         unimplemented!()
     }
 }
 
 impl DeserializeWith for X {
-    fn deserialize_with<D: Deserializer>(_: &mut D) -> StdResult<Self, D::Error> {
+    fn deserialize_with<D: Deserializer>(_: D) -> StdResult<Self, D::Error> {
         unimplemented!()
     }
 }

test_suite/tests/test_ser.rs

@@ -15,6 +15,9 @@ use self::serde_test::{
 extern crate fnv;
 use self::fnv::FnvHasher;
 
+#[cfg(feature = "unstable")]
+use serde::ser::iterator;
+
 //////////////////////////////////////////////////////////////////////////
 
 #[derive(Serialize)]
@@ -30,17 +33,38 @@ struct Struct {
     c: i32,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, PartialEq, Debug)]
 enum Enum {
     Unit,
     One(i32),
     Seq(i32, i32),
     Map { a: i32, b: i32 },
+    #[serde(skip_serializing)]
+    SkippedUnit,
+    #[serde(skip_serializing)]
+    SkippedOne(i32),
+    #[serde(skip_serializing)]
+    SkippedSeq(i32, i32),
+    #[serde(skip_serializing)]
+    SkippedMap { _a: i32, _b: i32 },
 }
 
 //////////////////////////////////////////////////////////////////////////
 
-declare_ser_tests! {
+macro_rules! declare_tests {
+    ($($name:ident { $($value:expr => $tokens:expr,)+ })+) => {
+        $(
+            #[test]
+            fn $name() {
+                $(
+                    assert_ser_tokens(&$value, $tokens);
+                )+
+            }
+        )+
+    }
+}
+
+declare_tests! {
     test_unit {
         () => &[Token::Unit],
     }
@@ -49,14 +73,12 @@ declare_ser_tests! {
         false => &[Token::Bool(false)],
     }
     test_isizes {
-        0isize => &[Token::Isize(0)],
         0i8 => &[Token::I8(0)],
         0i16 => &[Token::I16(0)],
         0i32 => &[Token::I32(0)],
         0i64 => &[Token::I64(0)],
     }
     test_usizes {
-        0usize => &[Token::Usize(0)],
         0u8 => &[Token::U8(0)],
         0u16 => &[Token::U16(0)],
         0u32 => &[Token::U32(0)],
@@ -361,6 +383,49 @@ declare_ser_tests! {
     }
 }
 
+
+#[cfg(feature = "unstable")]
+#[test]
+fn test_iterator() {
+    assert_ser_tokens(iterator([0; 0].iter()), &[
+        Token::SeqStart(Some(0)),
+        Token::SeqEnd,
+    ]);
+    assert_ser_tokens(iterator([1, 2, 3].iter()), &[
+        Token::SeqStart(Some(3)),
+            Token::SeqSep,
+            Token::I32(1),
+
+            Token::SeqSep,
+            Token::I32(2),
+
+            Token::SeqSep,
+            Token::I32(3),
+        Token::SeqEnd,
+    ]);
+    assert_ser_tokens(iterator([1, 2, 3].iter().map(|x| x * 2)), &[
+        Token::SeqStart(Some(3)),
+            Token::SeqSep,
+            Token::I32(2),
+
+            Token::SeqSep,
+            Token::I32(4),
+
+            Token::SeqSep,
+            Token::I32(6),
+        Token::SeqEnd,
+    ]);
+    assert_ser_tokens(iterator([1, 2, 3].iter().filter(|&x| x % 2 != 0)), &[
+        Token::SeqStart(None),
+            Token::SeqSep,
+            Token::I32(1),
+
+            Token::SeqSep,
+            Token::I32(3),
+        Token::SeqEnd,
+    ]);
+}
+
 #[cfg(feature = "unstable")]
 #[test]
 fn test_net_ipaddr() {
@@ -378,7 +443,7 @@ fn test_cannot_serialize_paths() {
     assert_ser_tokens_error(
         &Path::new(path),
         &[],
-        Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
+        Error::Message("path contains invalid UTF-8 characters".to_owned()));
 
     let mut path_buf = PathBuf::new();
     path_buf.push(path);
@@ -386,5 +451,25 @@ fn test_cannot_serialize_paths() {
     assert_ser_tokens_error(
         &path_buf,
         &[],
-        Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
+        Error::Message("path contains invalid UTF-8 characters".to_owned()));
+}
+
+#[test]
+fn test_enum_skipped() {
+    assert_ser_tokens_error(
+        &Enum::SkippedUnit,
+        &[],
+        Error::Message("the enum variant Enum::SkippedUnit cannot be serialized".to_owned()));
+    assert_ser_tokens_error(
+        &Enum::SkippedOne(42),
+        &[],
+        Error::Message("the enum variant Enum::SkippedOne cannot be serialized".to_owned()));
+    assert_ser_tokens_error(
+        &Enum::SkippedSeq(1, 2),
+        &[],
+        Error::Message("the enum variant Enum::SkippedSeq cannot be serialized".to_owned()));
+    assert_ser_tokens_error(
+        &Enum::SkippedMap { _a: 1, _b: 2 },
+        &[],
+        Error::Message("the enum variant Enum::SkippedMap cannot be serialized".to_owned()));
 }

testing/Cargo.toml

@@ -1,35 +0,0 @@
-[package]
-name = "serde_testing"
-version = "0.8.11"
-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/"
-readme = "README.md"
-keywords = ["serialization"]
-build = "build.rs"
-
-[features]
-unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
-
-[build-dependencies]
-serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] }
-
-[dev-dependencies]
-fnv = "1.0"
-rustc-serialize = "^0.3.16"
-serde = { path = "../serde" }
-serde_test = { path = "../serde_test" }
-
-[dependencies]
-clippy = { version = "^0.*", optional = true }
-
-[[test]]
-name = "test"
-path = "tests/test.rs"
-
-[[bench]]
-name = "bench"
-path = "benches/bench.rs"

testing/benches/bench.rs

@@ -1,9 +0,0 @@
-#![feature(test)]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-
-extern crate rustc_serialize;
-extern crate serde;
-extern crate test;
-
-include!(concat!(env!("OUT_DIR"), "/bench.rs"));

testing/benches/bench.rs.in

@@ -1,4 +0,0 @@
-mod bench_enum;
-mod bench_map;
-mod bench_struct;
-mod bench_vec;