Release 1.0.13

Macro expansion fails before it would generate code to call any of these.

.gitignore

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

Cargo.toml

@@ -1,9 +1,8 @@
 [workspace]
 members = [
     "serde",
-    "serde_codegen_internals",
     "serde_derive",
+    "serde_derive_internals",
     "serde_test",
     "test_suite",
-    "test_suite/no_std",
 ]

README.md

@@ -1,4 +1,9 @@
-# Serde   [![Build Status](https://api.travis-ci.org/serde-rs/serde.svg?branch=master)](https://travis-ci.org/serde-rs/serde) [![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde)
+# Serde   [![Build Status]][travis] [![Latest Version]][crates.io]
+
+[Build Status]: https://api.travis-ci.org/serde-rs/serde.svg?branch=master
+[travis]: https://travis-ci.org/serde-rs/serde
+[Latest Version]: https://img.shields.io/crates/v/serde.svg
+[crates.io]: https://crates.io/crates/serde
 
 **Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
 
@@ -15,10 +20,15 @@ You may be looking for:
 
 ## Serde in action
 
+<a href="http://play.integer32.com/?gist=9003c5b88c1f4989941925d7190c6eec" target="_blank">
+<img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
+</a>
+
 ```rust
 #[macro_use]
 extern crate serde_derive;
 
+extern crate serde;
 extern crate serde_json;
 
 #[derive(Serialize, Deserialize, Debug)]

appveyor.yml

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

rustfmt.toml

@@ -0,0 +1,5 @@
+fn_args_layout = "Block"
+array_layout = "Block"
+where_style = "Rfc"
+generics_indent = "Block"
+fn_call_style = "Block"

serde/Cargo.toml

@@ -1,28 +1,68 @@
 [package]
 name = "serde"
-version = "0.9.6"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+version = "1.0.13" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@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 = ["serde", "serialization"]
+keywords = ["serde", "serialization", "no_std"]
 categories = ["encoding"]
-include = ["Cargo.toml", "src/**/*.rs"]
+readme = "README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [badges]
 travis-ci = { repository = "serde-rs/serde" }
+appveyor = { repository = "serde-rs/serde" }
+
+[dependencies]
+serde_derive = { version = "1.0", optional = true, path = "../serde_derive" }
+
+[dev-dependencies]
+serde_derive = { version = "1.0", path = "../serde_derive" }
+
+
+### FEATURES #################################################################
 
 [features]
 default = ["std"]
 
-std = []
-unstable = []
-alloc = ["unstable"]
-collections = ["alloc"]
-unstable-testing = ["unstable", "std"]
+# Re-export the derive(Serialize, Deserialize) macros. This is specifically
+# intended for library crates that provide optional Serde impls behind a Cargo
+# cfg of their own. All other crates should depend on serde_derive directly.
+#
+# Please refer to the long comment above the line `pub use serde_derive::*` in
+# src/lib.rs before enabling this feature. If you think you need this feature
+# and your use case does not precisely match the one described in the comment,
+# please open an issue to let us know about your use case.
+derive = ["serde_derive"]
 
-[dev-dependencies]
-serde_derive = "0.9"
+# Provide impls for common standard library types like Vec<T> and HashMap<K, V>.
+# Requires a dependency on the Rust standard library.
+std = []
+
+# Provide impls for types that require unstable functionality. For tracking and
+# discussion of unstable functionality please refer to this issue:
+#
+#    https://github.com/serde-rs/serde/issues/812
+unstable = []
+
+# Provide impls for types in the Rust core allocation and collections library
+# including String, Box<T>, Vec<T>, and Cow<T>. This is a subset of std but may
+# be enabled without depending on all of std.
+#
+# Requires a dependency on the unstable core allocation library:
+#
+#    https://doc.rust-lang.org/alloc/
+alloc = ["unstable"]
+
+# Opt into impls for Rc<T> and Arc<T>. Serializing and deserializing these types
+# does not preserve identity and may result in multiple copies of the same data.
+# Be sure that this is what you want before enabling this feature.
+rc = []
+
+# Get serde_derive picked up by the Integer 32 playground. Not public API.
+#
+#    http://play.integer32.com/
+playground = ["serde_derive"]

serde/LICENSE-APACHE

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

serde/LICENSE-MIT

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

serde/README.md

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

serde/src/bytes.rs

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

serde/src/de/content.rs

@@ -1,743 +0,0 @@
-// This module is doc(hidden) and nothing here should be used outside of
-// generated code.
-//
-// We will iterate on the implementation for a few releases and only have to
-// worry about backward compatibility for the `untagged` and `tag` attributes
-// rather than for this entire mechanism.
-//
-// This issue is tracking making some of this stuff public:
-// https://github.com/serde-rs/serde/issues/741
-
-#![doc(hidden)]
-
-use core::fmt;
-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;
-
-use de::{
-    self,
-    Deserialize,
-    DeserializeSeed,
-    Deserializer,
-    Visitor,
-    SeqVisitor,
-    MapVisitor,
-    EnumVisitor,
-};
-
-/// Used from generated code to buffer the contents of the Deserializer when
-/// deserializing untagged enums and internally tagged enums.
-///
-/// Not public API. Use serde-value instead.
-#[derive(Debug)]
-pub enum Content<E> {
-    // Don't mind the PhantomData, just need to use E somewhere.
-    Bool(bool, PhantomData<E>),
-
-    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<E>>),
-
-    Unit,
-    Newtype(Box<Content<E>>),
-    Seq(Vec<Content<E>>),
-    Map(Vec<(Content<E>, Content<E>)>),
-}
-
-impl<E> Deserialize for Content<E> {
-    fn deserialize<D: Deserializer>(deserializer: D) -> Result<Self, D::Error> {
-        // Untagged and internally tagged enums are only supported in
-        // self-describing formats.
-        deserializer.deserialize(ContentVisitor::new())
-    }
-}
-
-struct ContentVisitor<E> {
-    err: PhantomData<E>,
-}
-
-impl<E> ContentVisitor<E> {
-    fn new() -> Self {
-        ContentVisitor {
-            err: PhantomData,
-        }
-    }
-}
-
-impl<E> Visitor for ContentVisitor<E> {
-    type Value = Content<E>;
-
-    fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str("any value")
-    }
-
-    fn visit_bool<F>(self, value: bool) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::Bool(value, PhantomData))
-    }
-
-    fn visit_i8<F>(self, value: i8) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::I8(value))
-    }
-
-    fn visit_i16<F>(self, value: i16) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::I16(value))
-    }
-
-    fn visit_i32<F>(self, value: i32) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::I32(value))
-    }
-
-    fn visit_i64<F>(self, value: i64) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::I64(value))
-    }
-
-    fn visit_u8<F>(self, value: u8) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::U8(value))
-    }
-
-    fn visit_u16<F>(self, value: u16) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::U16(value))
-    }
-
-    fn visit_u32<F>(self, value: u32) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::U32(value))
-    }
-
-    fn visit_u64<F>(self, value: u64) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::U64(value))
-    }
-
-    fn visit_f32<F>(self, value: f32) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::F32(value))
-    }
-
-    fn visit_f64<F>(self, value: f64) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::F64(value))
-    }
-
-    fn visit_char<F>(self, value: char) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::Char(value))
-    }
-
-    fn visit_str<F>(self, value: &str) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::String(value.into()))
-    }
-
-    fn visit_string<F>(self, value: String) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::String(value))
-    }
-
-    fn visit_bytes<F>(self, value: &[u8]) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::Bytes(value.into()))
-    }
-
-    fn visit_byte_buf<F>(self, value: Vec<u8>) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::Bytes(value))
-    }
-
-    fn visit_unit<F>(self) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::Unit)
-    }
-
-    fn visit_none<F>(self) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        Ok(Content::None)
-    }
-
-    fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-        where D: Deserializer
-    {
-        Deserialize::deserialize(deserializer).map(|v| Content::Some(Box::new(v)))
-    }
-
-    fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-        where D: Deserializer
-    {
-        Deserialize::deserialize(deserializer).map(|v| Content::Newtype(Box::new(v)))
-    }
-
-    fn visit_seq<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
-        where V: SeqVisitor
-    {
-        let mut vec = Vec::with_capacity(visitor.size_hint().0);
-        while let Some(e) = try!(visitor.visit()) {
-            vec.push(e);
-        }
-        Ok(Content::Seq(vec))
-    }
-
-    fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
-        where V: MapVisitor
-    {
-        let mut vec = Vec::with_capacity(visitor.size_hint().0);
-        while let Some(kv) = try!(visitor.visit()) {
-            vec.push(kv);
-        }
-        Ok(Content::Map(vec))
-    }
-
-    fn visit_enum<V>(self, _visitor: V) -> Result<Self::Value, V::Error>
-        where V: EnumVisitor
-    {
-        Err(de::Error::custom("untagged and internally tagged enums do not support enum input"))
-    }
-}
-
-/// This is the type of the map keys in an internally tagged enum.
-///
-/// Not public API.
-pub enum TagOrContent<E> {
-    Tag,
-    Content(Content<E>),
-}
-
-struct TagOrContentVisitor<E> {
-    name: &'static str,
-    err: PhantomData<E>,
-}
-
-impl<E> TagOrContentVisitor<E> {
-    fn new(name: &'static str) -> Self {
-        TagOrContentVisitor {
-            name: name,
-            err: PhantomData,
-        }
-    }
-}
-
-impl<E> DeserializeSeed for TagOrContentVisitor<E> {
-    type Value = TagOrContent<E>;
-
-    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-        where D: Deserializer
-    {
-        // Internally tagged enums are only supported in self-describing
-        // formats.
-        deserializer.deserialize(self)
-    }
-}
-
-impl<E> Visitor for TagOrContentVisitor<E> {
-    type Value = TagOrContent<E>;
-
-    fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "a type tag `{}` or any other value", self.name)
-    }
-
-    fn visit_bool<F>(self, value: bool) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_bool(value).map(TagOrContent::Content)
-    }
-
-    fn visit_i8<F>(self, value: i8) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_i8(value).map(TagOrContent::Content)
-    }
-
-    fn visit_i16<F>(self, value: i16) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_i16(value).map(TagOrContent::Content)
-    }
-
-    fn visit_i32<F>(self, value: i32) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_i32(value).map(TagOrContent::Content)
-    }
-
-    fn visit_i64<F>(self, value: i64) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_i64(value).map(TagOrContent::Content)
-    }
-
-    fn visit_u8<F>(self, value: u8) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_u8(value).map(TagOrContent::Content)
-    }
-
-    fn visit_u16<F>(self, value: u16) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_u16(value).map(TagOrContent::Content)
-    }
-
-    fn visit_u32<F>(self, value: u32) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_u32(value).map(TagOrContent::Content)
-    }
-
-    fn visit_u64<F>(self, value: u64) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_u64(value).map(TagOrContent::Content)
-    }
-
-    fn visit_f32<F>(self, value: f32) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_f32(value).map(TagOrContent::Content)
-    }
-
-    fn visit_f64<F>(self, value: f64) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_f64(value).map(TagOrContent::Content)
-    }
-
-    fn visit_char<F>(self, value: char) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_char(value).map(TagOrContent::Content)
-    }
-
-    fn visit_str<F>(self, value: &str) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        if value == self.name {
-            Ok(TagOrContent::Tag)
-        } else {
-            ContentVisitor::new().visit_str(value).map(TagOrContent::Content)
-        }
-    }
-
-    fn visit_string<F>(self, value: String) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        if value == self.name {
-            Ok(TagOrContent::Tag)
-        } else {
-            ContentVisitor::new().visit_string(value).map(TagOrContent::Content)
-        }
-    }
-
-    fn visit_bytes<F>(self, value: &[u8]) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        if value == self.name.as_bytes() {
-            Ok(TagOrContent::Tag)
-        } else {
-            ContentVisitor::new().visit_bytes(value).map(TagOrContent::Content)
-        }
-    }
-
-    fn visit_byte_buf<F>(self, value: Vec<u8>) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        if value == self.name.as_bytes() {
-            Ok(TagOrContent::Tag)
-        } else {
-            ContentVisitor::new().visit_byte_buf(value).map(TagOrContent::Content)
-        }
-    }
-
-    fn visit_unit<F>(self) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_unit().map(TagOrContent::Content)
-    }
-
-    fn visit_none<F>(self) -> Result<Self::Value, F>
-        where F: de::Error
-    {
-        ContentVisitor::new().visit_none().map(TagOrContent::Content)
-    }
-
-    fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-        where D: Deserializer
-    {
-        ContentVisitor::new().visit_some(deserializer).map(TagOrContent::Content)
-    }
-
-    fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-        where D: Deserializer
-    {
-        ContentVisitor::new().visit_newtype_struct(deserializer).map(TagOrContent::Content)
-    }
-
-    fn visit_seq<V>(self, visitor: V) -> Result<Self::Value, V::Error>
-        where V: SeqVisitor
-    {
-        ContentVisitor::new().visit_seq(visitor).map(TagOrContent::Content)
-    }
-
-    fn visit_map<V>(self, visitor: V) -> Result<Self::Value, V::Error>
-        where V: MapVisitor
-    {
-        ContentVisitor::new().visit_map(visitor).map(TagOrContent::Content)
-    }
-
-    fn visit_enum<V>(self, visitor: V) -> Result<Self::Value, V::Error>
-        where V: EnumVisitor
-    {
-        ContentVisitor::new().visit_enum(visitor).map(TagOrContent::Content)
-    }
-}
-
-/// Used by generated code to deserialize an internally tagged enum.
-///
-/// Not public API.
-pub struct TaggedContent<T, E> {
-    pub tag: T,
-    pub content: Content<E>,
-}
-
-/// Not public API.
-pub struct TaggedContentVisitor<T, E> {
-    tag_name: &'static str,
-    tag: PhantomData<T>,
-    err: PhantomData<E>,
-}
-
-impl<T, E> TaggedContentVisitor<T, E> {
-    /// Visitor for the content of an internally tagged enum with the given tag
-    /// name.
-    pub fn new(name: &'static str) -> Self {
-        TaggedContentVisitor {
-            tag_name: name,
-            tag: PhantomData,
-            err: PhantomData,
-        }
-    }
-}
-
-impl<T, E> DeserializeSeed for TaggedContentVisitor<T, E>
-    where T: Deserialize
-{
-    type Value = TaggedContent<T, E>;
-
-    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
-        where D: Deserializer
-    {
-        // Internally tagged enums are only supported in self-describing
-        // formats.
-        deserializer.deserialize(self)
-    }
-}
-
-impl<T, E> Visitor for TaggedContentVisitor<T, E>
-    where T: Deserialize
-{
-    type Value = TaggedContent<T, E>;
-
-    fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str("any value")
-    }
-
-    fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
-        where V: MapVisitor
-    {
-        let mut tag = None;
-        let mut vec = Vec::with_capacity(visitor.size_hint().0);
-        while let Some(k) = try!(visitor.visit_key_seed(TagOrContentVisitor::new(self.tag_name))) {
-            match k {
-                TagOrContent::Tag => {
-                    if tag.is_some() {
-                        return Err(de::Error::duplicate_field(self.tag_name));
-                    }
-                    tag = Some(try!(visitor.visit_value()));
-                }
-                TagOrContent::Content(k) => {
-                    let v = try!(visitor.visit_value());
-                    vec.push((k, v));
-                }
-            }
-        }
-        match tag {
-            None => {
-                Err(de::Error::missing_field(self.tag_name))
-            }
-            Some(tag) => {
-                Ok(TaggedContent {
-                    tag: tag,
-                    content: Content::Map(vec),
-                })
-            }
-        }
-    }
-}
-
-/// Used when deserializing an internally tagged enum because the content will
-/// be used exactly once.
-impl<E> Deserializer for Content<E>
-    where E: de::Error
-{
-    type Error = E;
-
-    fn deserialize<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        match self {
-            Content::Bool(v, _) => visitor.visit_bool(v),
-            Content::U8(v) => visitor.visit_u8(v),
-            Content::U16(v) => visitor.visit_u16(v),
-            Content::U32(v) => visitor.visit_u32(v),
-            Content::U64(v) => visitor.visit_u64(v),
-            Content::I8(v) => visitor.visit_i8(v),
-            Content::I16(v) => visitor.visit_i16(v),
-            Content::I32(v) => visitor.visit_i32(v),
-            Content::I64(v) => visitor.visit_i64(v),
-            Content::F32(v) => visitor.visit_f32(v),
-            Content::F64(v) => visitor.visit_f64(v),
-            Content::Char(v) => visitor.visit_char(v),
-            Content::String(v) => visitor.visit_string(v),
-            Content::Unit => visitor.visit_unit(),
-            Content::None => visitor.visit_none(),
-            Content::Some(v) => visitor.visit_some(*v),
-            Content::Newtype(v) => visitor.visit_newtype_struct(*v),
-            Content::Seq(v) => {
-                let seq = v.into_iter();
-                let mut seq_visitor = de::value::SeqDeserializer::new(seq);
-                let value = try!(visitor.visit_seq(&mut seq_visitor));
-                try!(seq_visitor.end());
-                Ok(value)
-            },
-            Content::Map(v) => {
-                let map = v.into_iter();
-                let mut map_visitor = de::value::MapDeserializer::new(map);
-                let value = try!(visitor.visit_map(&mut map_visitor));
-                try!(map_visitor.end());
-                Ok(value)
-            },
-            Content::Bytes(v) => visitor.visit_byte_buf(v),
-        }
-    }
-
-    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        match self {
-            Content::None => visitor.visit_none(),
-            Content::Some(v) => visitor.visit_some(*v),
-            Content::Unit => visitor.visit_unit(),
-            _ => visitor.visit_some(self)
-        }
-    }
-
-    fn deserialize_newtype_struct<V>(self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        visitor.visit_newtype_struct(self)
-    }
-
-    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 tuple_struct struct
-        struct_field tuple enum ignored_any
-    }
-}
-
-impl<E> de::value::ValueDeserializer<E> for Content<E>
-    where E: de::Error
-{
-    type Deserializer = Self;
-
-    fn into_deserializer(self) -> Self {
-        self
-    }
-}
-
-/// Used when deserializing an untagged enum because the content may need to be
-/// used more than once.
-impl<'a, E> Deserializer for &'a Content<E>
-    where E: de::Error
-{
-    type Error = E;
-
-    fn deserialize<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        match *self {
-            Content::Bool(v, _) => visitor.visit_bool(v),
-            Content::U8(v) => visitor.visit_u8(v),
-            Content::U16(v) => visitor.visit_u16(v),
-            Content::U32(v) => visitor.visit_u32(v),
-            Content::U64(v) => visitor.visit_u64(v),
-            Content::I8(v) => visitor.visit_i8(v),
-            Content::I16(v) => visitor.visit_i16(v),
-            Content::I32(v) => visitor.visit_i32(v),
-            Content::I64(v) => visitor.visit_i64(v),
-            Content::F32(v) => visitor.visit_f32(v),
-            Content::F64(v) => visitor.visit_f64(v),
-            Content::Char(v) => visitor.visit_char(v),
-            Content::String(ref v) => visitor.visit_str(v),
-            Content::Unit => visitor.visit_unit(),
-            Content::None => visitor.visit_none(),
-            Content::Some(ref v) => visitor.visit_some(&**v),
-            Content::Newtype(ref v) => visitor.visit_newtype_struct(&**v),
-            Content::Seq(ref v) => {
-                let seq = v.into_iter();
-                let mut seq_visitor = de::value::SeqDeserializer::new(seq);
-                let value = try!(visitor.visit_seq(&mut seq_visitor));
-                try!(seq_visitor.end());
-                Ok(value)
-            },
-            Content::Map(ref v) => {
-                let map = v.into_iter().map(|&(ref k, ref v)| (k, v));
-                let mut map_visitor = de::value::MapDeserializer::new(map);
-                let value = try!(visitor.visit_map(&mut map_visitor));
-                try!(map_visitor.end());
-                Ok(value)
-            },
-            Content::Bytes(ref v) => visitor.visit_bytes(v),
-        }
-    }
-
-    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        match *self {
-            Content::None => visitor.visit_none(),
-            Content::Some(ref v) => visitor.visit_some(&**v),
-            Content::Unit => visitor.visit_unit(),
-            _ => visitor.visit_some(self)
-        }
-    }
-
-    fn deserialize_newtype_struct<V>(self, _name: &str, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        visitor.visit_newtype_struct(self)
-    }
-
-    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 tuple_struct struct
-        struct_field tuple enum ignored_any
-    }
-}
-
-impl<'a, E> de::value::ValueDeserializer<E> for &'a Content<E>
-    where E: de::Error
-{
-    type Deserializer = Self;
-
-    fn into_deserializer(self) -> Self {
-        self
-    }
-}
-
-/// Visitor for deserializing an internally tagged unit variant.
-///
-/// Not public API.
-pub struct InternallyTaggedUnitVisitor<'a> {
-    type_name: &'a str,
-    variant_name: &'a str,
-}
-
-impl<'a> InternallyTaggedUnitVisitor<'a> {
-    /// Not public API.
-    pub fn new(type_name: &'a str, variant_name: &'a str) -> Self {
-        InternallyTaggedUnitVisitor {
-            type_name: type_name,
-            variant_name: variant_name,
-        }
-    }
-}
-
-impl<'a> Visitor for InternallyTaggedUnitVisitor<'a> {
-    type Value = ();
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        write!(formatter, "unit variant {}::{}", self.type_name, self.variant_name)
-    }
-
-    fn visit_map<V>(self, _: V) -> Result<(), V::Error>
-        where V: MapVisitor
-    {
-        Ok(())
-    }
-}
-
-/// Visitor for deserializing an untagged unit variant.
-///
-/// Not public API.
-pub struct UntaggedUnitVisitor<'a> {
-    type_name: &'a str,
-    variant_name: &'a str,
-}
-
-impl<'a> UntaggedUnitVisitor<'a> {
-    /// Not public API.
-    pub fn new(type_name: &'a str, variant_name: &'a str) -> Self {
-        UntaggedUnitVisitor {
-            type_name: type_name,
-            variant_name: variant_name,
-        }
-    }
-}
-
-impl<'a> Visitor for UntaggedUnitVisitor<'a> {
-    type Value = ();
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        write!(formatter, "unit variant {}::{}", self.type_name, self.variant_name)
-    }
-
-    fn visit_unit<E>(self) -> Result<(), E>
-        where E: de::Error
-    {
-        Ok(())
-    }
-}

serde/src/de/from_primitive.rs

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

serde/src/de/ignored_any.rs

@@ -0,0 +1,215 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use lib::*;
+
+use de::{Deserialize, Deserializer, Visitor, SeqAccess, MapAccess, Error};
+
+/// An efficient way of discarding data from a deserializer.
+///
+/// Think of this like `serde_json::Value` in that it can be deserialized from
+/// any type, except that it does not store any information about the data that
+/// gets deserialized.
+///
+/// ```rust
+/// use std::fmt;
+/// use std::marker::PhantomData;
+///
+/// use serde::de::{self, Deserialize, DeserializeSeed, Deserializer, Visitor, SeqAccess, IgnoredAny};
+///
+/// /// A seed that can be used to deserialize only the `n`th element of a sequence
+/// /// while efficiently discarding elements of any type before or after index `n`.
+/// ///
+/// /// For example to deserialize only the element at index 3:
+/// ///
+/// /// ```rust
+/// /// NthElement::new(3).deserialize(deserializer)
+/// /// ```
+/// pub struct NthElement<T> {
+///     n: usize,
+///     marker: PhantomData<T>,
+/// }
+///
+/// impl<T> NthElement<T> {
+///     pub fn new(n: usize) -> Self {
+///         NthElement {
+///             n: n,
+///             marker: PhantomData,
+///         }
+///     }
+/// }
+///
+/// impl<'de, T> Visitor<'de> for NthElement<T>
+///     where T: Deserialize<'de>
+/// {
+///     type Value = T;
+///
+///     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+///         write!(formatter, "a sequence in which we care about element {}", self.n)
+///     }
+///
+///     fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+///         where A: SeqAccess<'de>
+///     {
+///         // Skip over the first `n` elements.
+///         for i in 0..self.n {
+///             // It is an error if the sequence ends before we get to element `n`.
+///             if seq.next_element::<IgnoredAny>()?.is_none() {
+///                 return Err(de::Error::invalid_length(i, &self));
+///             }
+///         }
+///
+///         // Deserialize the one we care about.
+///         let nth = match seq.next_element()? {
+///             Some(nth) => nth,
+///             None => {
+///                 return Err(de::Error::invalid_length(self.n, &self));
+///             }
+///         };
+///
+///         // Skip over any remaining elements in the sequence after `n`.
+///         while let Some(IgnoredAny) = seq.next_element()? {
+///             // ignore
+///         }
+///
+///         Ok(nth)
+///     }
+/// }
+///
+/// impl<'de, T> DeserializeSeed<'de> for NthElement<T>
+///     where T: Deserialize<'de>
+/// {
+///     type Value = T;
+///
+///     fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+///         where D: Deserializer<'de>
+///     {
+///         deserializer.deserialize_seq(self)
+///     }
+/// }
+///
+/// # fn example<'de, D>(deserializer: D) -> Result<(), D::Error>
+/// #     where D: Deserializer<'de>
+/// # {
+/// // Deserialize only the sequence element at index 3 from this deserializer.
+/// // The element at index 3 is required to be a string. Elements before and
+/// // after index 3 are allowed to be of any type.
+/// let s: String = NthElement::new(3).deserialize(deserializer)?;
+/// #     Ok(())
+/// # }
+/// ```
+#[derive(Copy, Clone, Debug, Default)]
+pub struct IgnoredAny;
+
+impl<'de> Visitor<'de> for IgnoredAny {
+    type Value = IgnoredAny;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("anything at all")
+    }
+
+    #[inline]
+    fn visit_bool<E>(self, x: bool) -> Result<Self::Value, E> {
+        let _ = x;
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_i64<E>(self, x: i64) -> Result<Self::Value, E> {
+        let _ = x;
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_u64<E>(self, x: u64) -> Result<Self::Value, E> {
+        let _ = x;
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_f64<E>(self, x: f64) -> Result<Self::Value, E> {
+        let _ = x;
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        let _ = s;
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_none<E>(self) -> Result<Self::Value, E> {
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        IgnoredAny::deserialize(deserializer)
+    }
+
+    #[inline]
+    fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        IgnoredAny::deserialize(deserializer)
+    }
+
+    #[inline]
+    fn visit_unit<E>(self) -> Result<Self::Value, E> {
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: SeqAccess<'de>,
+    {
+        while let Some(IgnoredAny) = try!(seq.next_element()) {
+            // Gobble
+        }
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+    where
+        A: MapAccess<'de>,
+    {
+        while let Some((IgnoredAny, IgnoredAny)) = try!(map.next_entry()) {
+            // Gobble
+        }
+        Ok(IgnoredAny)
+    }
+
+    #[inline]
+    fn visit_bytes<E>(self, bytes: &[u8]) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        let _ = bytes;
+        Ok(IgnoredAny)
+    }
+}
+
+impl<'de> Deserialize<'de> for IgnoredAny {
+    #[inline]
+    fn deserialize<D>(deserializer: D) -> Result<IgnoredAny, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_ignored_any(IgnoredAny)
+    }
+}

serde/src/de/private.rs

@@ -1,47 +0,0 @@
-use core::marker::PhantomData;
-
-use de::{Deserialize, Deserializer, Error, Visitor};
-
-#[cfg(any(feature = "std", feature = "collections"))]
-pub use de::content::{
-    Content,
-    TaggedContentVisitor,
-    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/de/utf8.rs

@@ -0,0 +1,54 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use lib::*;
+
+const TAG_CONT: u8 = 0b1000_0000;
+const TAG_TWO_B: u8 = 0b1100_0000;
+const TAG_THREE_B: u8 = 0b1110_0000;
+const TAG_FOUR_B: u8 = 0b1111_0000;
+const MAX_ONE_B: u32 = 0x80;
+const MAX_TWO_B: u32 = 0x800;
+const MAX_THREE_B: u32 = 0x10000;
+
+#[inline]
+pub fn encode(c: char) -> Encode {
+    let code = c as u32;
+    let mut buf = [0; 4];
+    let pos = if code < MAX_ONE_B {
+        buf[3] = code as u8;
+        3
+    } else if code < MAX_TWO_B {
+        buf[2] = (code >> 6 & 0x1F) as u8 | TAG_TWO_B;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        2
+    } else if code < MAX_THREE_B {
+        buf[1] = (code >> 12 & 0x0F) as u8 | TAG_THREE_B;
+        buf[2] = (code >> 6 & 0x3F) as u8 | TAG_CONT;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        1
+    } else {
+        buf[0] = (code >> 18 & 0x07) as u8 | TAG_FOUR_B;
+        buf[1] = (code >> 12 & 0x3F) as u8 | TAG_CONT;
+        buf[2] = (code >> 6 & 0x3F) as u8 | TAG_CONT;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        0
+    };
+    Encode { buf: buf, pos: pos }
+}
+
+pub struct Encode {
+    buf: [u8; 4],
+    pos: usize,
+}
+
+impl Encode {
+    pub fn as_str(&self) -> &str {
+        str::from_utf8(&self.buf[self.pos..]).unwrap()
+    }
+}

serde/src/error.rs

@@ -1,15 +0,0 @@
-//! A stand-in for `std::error`
-use core::fmt::{Debug, Display};
-
-/// A stand-in for `std::error::Error`, which requires no allocation.
-pub trait Error: Debug + Display {
-    /// A short description of the error.
-    ///
-    /// The description should not contain newlines or sentence-ending
-    /// punctuation, to facilitate embedding in larger user-facing
-    /// strings.
-    fn description(&self) -> &str;
-
-    /// The lower-level cause of this error, if any.
-    fn cause(&self) -> Option<&Error> { None }
-}

serde/src/export.rs

@@ -1,34 +1,41 @@
-#[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:
+// Copyright 2017 Serde Developers
 //
-//     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}")
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub use lib::clone::Clone;
+pub use lib::convert::{From, Into};
+pub use lib::default::Default;
+pub use lib::fmt::{self, Formatter};
+pub use lib::marker::PhantomData;
+pub use lib::option::Option::{self, None, Some};
+pub use lib::result::Result::{self, Ok, Err};
+
+pub use self::string::from_utf8_lossy;
+
+mod string {
+    use lib::*;
+
+    #[cfg(any(feature = "std", feature = "alloc"))]
+    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 = "std", feature = "alloc")))]
+    pub fn from_utf8_lossy(bytes: &[u8]) -> &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

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

serde/src/lib.rs

@@ -1,3 +1,11 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 //! # Serde
 //!
 //! Serde is a framework for ***ser***ializing and ***de***serializing Rust data
@@ -9,99 +17,270 @@
 //! 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
+//! See the Serde website [https://serde.rs/] for additional documentation and
 //! usage examples.
 //!
-//! ### Design
+//! [https://serde.rs/]: https://serde.rs/
+//!
+//! ## 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
+//! Serde's `Serialize` and `Deserialize` traits (or uses Serde's derive
+//! attribute to automatically generate 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.
+//! serialization to perform the same speed as a handwritten serializer for the
+//! specific selection of data structure and data format.
 //!
-//! ### Data formats
+//! ## 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
+//! - [JSON], the ubiquitous JavaScript Object Notation used by many HTTP APIs.
+//! - [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).
+//! - [CBOR], a Concise Binary Object Representation designed for small message
+//!   size without the need for version negotiation.
+//! - [YAML], a popular human-friendly configuration language that ain't markup
+//!   language.
+//! - [MessagePack], an efficient binary format that resembles a compact JSON.
+//! - [TOML], a minimal configuration format used by [Cargo].
+//! - [Pickle], a format common in the Python world.
+//! - [Hjson], a variant of JSON designed to be readable and writable by humans.
+//! - [BSON], the data storage and network transfer format used by MongoDB.
+//! - [URL], the x-www-form-urlencoded format.
+//! - [XML], the flexible machine-friendly W3C standard.
 //!   *(deserialization only)*
+//! - [Envy], a way to deserialize environment variables into Rust structs.
+//!   *(deserialization only)*
+//! - [Redis], deserialize values from Redis when using [redis-rs].
+//!   *(deserialization only)*
+//!
+//! [JSON]: https://github.com/serde-rs/json
+//! [Bincode]: https://github.com/TyOverby/bincode
+//! [CBOR]: https://github.com/pyfisch/cbor
+//! [YAML]: https://github.com/dtolnay/serde-yaml
+//! [MessagePack]: https://github.com/3Hren/msgpack-rust
+//! [TOML]: https://github.com/alexcrichton/toml-rs
+//! [Pickle]: https://github.com/birkenfeld/serde-pickle
+//! [Hjson]: https://github.com/laktak/hjson-rust
+//! [BSON]: https://github.com/zonyitoo/bson-rs
+//! [URL]: https://github.com/nox/serde_urlencoded
+//! [XML]: https://github.com/RReverser/serde-xml-rs
+//! [Envy]: https://github.com/softprops/envy
+//! [Redis]: https://github.com/OneSignal/serde-redis
+//! [Cargo]: http://doc.crates.io/manifest.html
+//! [redis-rs]: https://crates.io/crates/redis
 
-#![doc(html_root_url="https://docs.serde.rs")]
+////////////////////////////////////////////////////////////////////////////////
+
+// Serde types in rustdoc of other crates get linked to here.
+#![doc(html_root_url = "https://docs.rs/serde/1.0.13")]
+
+// Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "unstable", feature(nonzero, inclusive_range, zero_one))]
-#![cfg_attr(feature = "alloc", feature(alloc))]
-#![cfg_attr(feature = "collections", feature(collections))]
-#![cfg_attr(feature = "cargo-clippy", allow(linkedlist, type_complexity, doc_markdown))]
-#![deny(missing_docs)]
 
-#[cfg(feature = "collections")]
-extern crate collections;
+// Unstable functionality only if the user asks for it. For tracking and
+// discussion of these features please refer to this issue:
+//
+//    https://github.com/serde-rs/serde/issues/812
+#![cfg_attr(feature = "unstable", feature(nonzero, specialization))]
+#![cfg_attr(feature = "alloc", feature(alloc))]
+
+#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
+// Whitelisted clippy lints
+#![cfg_attr(feature = "cargo-clippy", allow(
+    cast_lossless,
+    doc_markdown,
+    linkedlist,
+    type_complexity,
+    unreadable_literal,
+    zero_prefixed_literal,
+))]
+// Whitelisted clippy_pedantic lints
+#![cfg_attr(feature = "cargo-clippy", allow(
+// integer and float ser/de requires these sorts of casts
+    cast_possible_truncation,
+    cast_possible_wrap,
+    cast_precision_loss,
+    cast_sign_loss,
+// simplifies some macros
+    invalid_upcast_comparisons,
+// things are often more readable this way
+    option_unwrap_used,
+    result_unwrap_used,
+    shadow_reuse,
+    single_match_else,
+    stutter,
+    use_self,
+// not practical
+    missing_docs_in_private_items,
+// alternative is not stable
+    empty_enum,
+    use_debug,
+))]
+
+// Blacklisted Rust lints.
+#![deny(missing_docs, unused_imports)]
+
+////////////////////////////////////////////////////////////////////////////////
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
-#[cfg(feature = "unstable")]
-extern crate core as actual_core;
+#[cfg(all(feature = "unstable", feature = "std"))]
+extern crate core;
+
+/// A facade around all the types we need from the `std`, `core`, and `alloc`
+/// crates. This avoids elaborate import wrangling having to happen in every
+/// module.
+mod lib {
+    mod core {
+        #[cfg(feature = "std")]
+        pub use std::*;
+        #[cfg(not(feature = "std"))]
+        pub use core::*;
+    }
+
+    pub use self::core::{cmp, iter, mem, ops, slice, str};
+    pub use self::core::{i8, i16, i32, i64, isize};
+    pub use self::core::{u8, u16, u32, u64, usize};
+    pub use self::core::{f32, f64};
+
+    pub use self::core::cell::{Cell, RefCell};
+    pub use self::core::clone::{self, Clone};
+    pub use self::core::convert::{self, From, Into};
+    pub use self::core::default::{self, Default};
+    pub use self::core::fmt::{self, Debug, Display};
+    pub use self::core::marker::{self, PhantomData};
+    pub use self::core::option::{self, Option};
+    pub use self::core::result::{self, Result};
+
+    #[cfg(feature = "std")]
+    pub use std::borrow::{Cow, ToOwned};
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::borrow::{Cow, ToOwned};
+
+    #[cfg(feature = "std")]
+    pub use std::string::String;
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::string::{String, ToString};
+
+    #[cfg(feature = "std")]
+    pub use std::vec::Vec;
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::vec::Vec;
+
+    #[cfg(feature = "std")]
+    pub use std::boxed::Box;
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::boxed::Box;
+
+    #[cfg(all(feature = "rc", feature = "std"))]
+    pub use std::rc::Rc;
+    #[cfg(all(feature = "rc", feature = "alloc", not(feature = "std")))]
+    pub use alloc::rc::Rc;
+
+    #[cfg(all(feature = "rc", feature = "std"))]
+    pub use std::sync::Arc;
+    #[cfg(all(feature = "rc", feature = "alloc", not(feature = "std")))]
+    pub use alloc::arc::Arc;
+
+    #[cfg(feature = "std")]
+    pub use std::collections::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque};
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::{BinaryHeap, BTreeMap, BTreeSet, LinkedList, VecDeque};
+
+    #[cfg(feature = "std")]
+    pub use std::{error, net};
+
+    #[cfg(feature = "std")]
+    pub use std::collections::{HashMap, HashSet};
+    #[cfg(feature = "std")]
+    pub use std::ffi::{CString, CStr, OsString, OsStr};
+    #[cfg(feature = "std")]
+    pub use std::hash::{Hash, BuildHasher};
+    #[cfg(feature = "std")]
+    pub use std::io::Write;
+    #[cfg(feature = "std")]
+    pub use std::path::{Path, PathBuf};
+    #[cfg(feature = "std")]
+    pub use std::time::{Duration, SystemTime, UNIX_EPOCH};
+    #[cfg(feature = "std")]
+    pub use std::sync::{Mutex, RwLock};
 
-#[cfg(feature = "std")]
-mod core {
-    pub use std::{ops, hash, fmt, cmp, marker, mem, i8, i16, i32, i64, u8, u16, u32, u64, isize,
-            usize, f32, f64, char, str, num, slice, iter, cell, default, result, option};
     #[cfg(feature = "unstable")]
-    pub use actual_core::nonzero;
+    pub use core::nonzero::{NonZero, Zeroable};
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
+#[macro_use]
+mod macros;
+
+pub mod ser;
+pub mod de;
+
 #[doc(inline)]
 pub use ser::{Serialize, Serializer};
 #[doc(inline)]
 pub use de::{Deserialize, Deserializer};
 
-#[macro_use]
-mod macros;
-
-pub mod bytes;
-pub mod de;
-#[cfg(feature = "std")]
-#[doc(hidden)]
-pub mod iter;
-pub mod ser;
-#[cfg_attr(feature = "std", doc(hidden))]
-pub mod error;
-mod utils;
-
 // Generated code uses these to support no_std. Not public API.
 #[doc(hidden)]
 pub mod export;
+
+// Helpers used by generated code and doc tests. Not public API.
+#[doc(hidden)]
+pub mod private;
+
+// Re-export #[derive(Serialize, Deserialize)].
+//
+// This is a workaround for https://github.com/rust-lang/cargo/issues/1286.
+// Without this re-export, crates that put Serde derives behind a cfg_attr would
+// need to use some silly feature name that depends on both serde and
+// serde_derive.
+//
+//     [features]
+//     serde-impls = ["serde", "serde_derive"]
+//
+//     [dependencies]
+//     serde = { version = "1.0", optional = true }
+//     serde_derive = { version = "1.0", optional = true }
+//
+//     # Used like this:
+//     # #[cfg(feature = "serde-impls")]
+//     # #[macro_use]
+//     # extern crate serde_derive;
+//     #
+//     # #[cfg_attr(feature = "serde-impls", derive(Serialize, Deserialize))]
+//     # struct S { /* ... */ }
+//
+// The re-exported derives allow crates to use "serde" as the name of their
+// Serde feature which is more intuitive.
+//
+//     [dependencies]
+//     serde = { version = "1.0", optional = true, features = ["derive"] }
+//
+//     # Used like this:
+//     # #[cfg(feature = "serde")]
+//     # #[macro_use]
+//     # extern crate serde;
+//     #
+//     # #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+//     # struct S { /* ... */ }
+//
+// The reason re-exporting is not enabled by default is that disabling it would
+// be annoying for crates that provide handwritten impls or data formats. They
+// would need to disable default features and then explicitly re-enable std.
+#[cfg(feature = "serde_derive")]
+#[allow(unused_imports)]
+#[macro_use]
+extern crate serde_derive;
+#[cfg(feature = "serde_derive")]
+#[doc(hidden)]
+pub use serde_derive::*;

serde/src/macros.rs

@@ -1,122 +1,10 @@
-#[cfg(feature = "std")]
-#[doc(hidden)]
-#[macro_export]
-macro_rules! forward_to_deserialize_method {
-    ($func:ident($($arg:ty),*)) => {
-        #[inline]
-        fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> ::std::result::Result<__V::Value, Self::Error>
-            where __V: $crate::de::Visitor
-        {
-            self.deserialize(visitor)
-        }
-    };
-}
-
-#[cfg(not(feature = "std"))]
-#[doc(hidden)]
-#[macro_export]
-macro_rules! forward_to_deserialize_method {
-    ($func:ident($($arg:ty),*)) => {
-        #[inline]
-        fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> ::core::result::Result<__V::Value, Self::Error>
-            where __V: $crate::de::Visitor
-        {
-            self.deserialize(visitor)
-        }
-    };
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! forward_to_deserialize_helper {
-    (bool) => {
-        forward_to_deserialize_method!{deserialize_bool()}
-    };
-    (u8) => {
-        forward_to_deserialize_method!{deserialize_u8()}
-    };
-    (u16) => {
-        forward_to_deserialize_method!{deserialize_u16()}
-    };
-    (u32) => {
-        forward_to_deserialize_method!{deserialize_u32()}
-    };
-    (u64) => {
-        forward_to_deserialize_method!{deserialize_u64()}
-    };
-    (i8) => {
-        forward_to_deserialize_method!{deserialize_i8()}
-    };
-    (i16) => {
-        forward_to_deserialize_method!{deserialize_i16()}
-    };
-    (i32) => {
-        forward_to_deserialize_method!{deserialize_i32()}
-    };
-    (i64) => {
-        forward_to_deserialize_method!{deserialize_i64()}
-    };
-    (f32) => {
-        forward_to_deserialize_method!{deserialize_f32()}
-    };
-    (f64) => {
-        forward_to_deserialize_method!{deserialize_f64()}
-    };
-    (char) => {
-        forward_to_deserialize_method!{deserialize_char()}
-    };
-    (str) => {
-        forward_to_deserialize_method!{deserialize_str()}
-    };
-    (string) => {
-        forward_to_deserialize_method!{deserialize_string()}
-    };
-    (unit) => {
-        forward_to_deserialize_method!{deserialize_unit()}
-    };
-    (option) => {
-        forward_to_deserialize_method!{deserialize_option()}
-    };
-    (seq) => {
-        forward_to_deserialize_method!{deserialize_seq()}
-    };
-    (seq_fixed_size) => {
-        forward_to_deserialize_method!{deserialize_seq_fixed_size(usize)}
-    };
-    (bytes) => {
-        forward_to_deserialize_method!{deserialize_bytes()}
-    };
-    (byte_buf) => {
-        forward_to_deserialize_method!{deserialize_byte_buf()}
-    };
-    (map) => {
-        forward_to_deserialize_method!{deserialize_map()}
-    };
-    (unit_struct) => {
-        forward_to_deserialize_method!{deserialize_unit_struct(&'static str)}
-    };
-    (newtype_struct) => {
-        forward_to_deserialize_method!{deserialize_newtype_struct(&'static str)}
-    };
-    (tuple_struct) => {
-        forward_to_deserialize_method!{deserialize_tuple_struct(&'static str, usize)}
-    };
-    (struct) => {
-        forward_to_deserialize_method!{deserialize_struct(&'static str, &'static [&'static str])}
-    };
-    (struct_field) => {
-        forward_to_deserialize_method!{deserialize_struct_field()}
-    };
-    (tuple) => {
-        forward_to_deserialize_method!{deserialize_tuple(usize)}
-    };
-    (enum) => {
-        forward_to_deserialize_method!{deserialize_enum(&'static str, &'static [&'static str])}
-    };
-    (ignored_any) => {
-        forward_to_deserialize_method!{deserialize_ignored_any()}
-    };
-}
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
 
 // Super explicit first paragraph because this shows up at the top level and
 // trips up people who are just looking for basic Serialize / Deserialize
@@ -125,66 +13,230 @@ macro_rules! forward_to_deserialize_helper {
 /// Helper macro when implementing the `Deserializer` part of a new data format
 /// for Serde.
 ///
-/// Some `Deserializer` implementations for self-describing formats do not care
-/// what hint the `Visitor` gives them, they just want to blindly call the
-/// `Visitor` method corresponding to the data they can tell is in the input.
-/// This requires repetitive implementations of all the `Deserializer` trait
-/// methods.
+/// 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;
+/// # #[macro_use]
+/// # extern crate serde;
+/// #
 /// # use serde::de::{value, Deserializer, Visitor};
-/// # pub struct MyDeserializer;
-/// # impl Deserializer for MyDeserializer {
+/// #
+/// # struct MyDeserializer;
+/// #
+/// # impl<'de> Deserializer<'de> for MyDeserializer {
 /// #     type Error = value::Error;
-/// #     fn deserialize<V>(self, _: V) -> Result<V::Value, Self::Error>
-/// #         where V: Visitor
-/// #     { unimplemented!() }
+/// #
+/// #     fn deserialize_any<V>(self, _: V) -> Result<V::Value, Self::Error>
+/// #         where V: Visitor<'de>
+/// #     {
+/// #         unimplemented!()
+/// #     }
 /// #
 /// #[inline]
 /// fn deserialize_bool<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-///     where V: Visitor
+///     where V: Visitor<'de>
 /// {
-///     self.deserialize(visitor)
+///     self.deserialize_any(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
+/// #
+/// #     forward_to_deserialize_any! {
+/// #         i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str string bytes
+/// #         byte_buf option unit unit_struct newtype_struct seq tuple
+/// #         tuple_struct map struct enum identifier 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.
+/// The `forward_to_deserialize_any!` macro implements these simple forwarding
+/// methods so that they forward directly to [`Deserializer::deserialize_any`].
+/// You can choose which methods to forward.
 ///
 /// ```rust
-/// # #[macro_use] extern crate serde;
+/// # #[macro_use]
+/// # extern crate serde;
+/// #
 /// # use serde::de::{value, Deserializer, Visitor};
-/// # pub struct MyDeserializer;
-/// impl Deserializer for MyDeserializer {
+/// #
+/// # struct MyDeserializer;
+/// #
+/// impl<'de> Deserializer<'de> for MyDeserializer {
 /// #   type Error = value::Error;
-///     fn deserialize<V>(self, visitor: V) -> Result<V::Value, Self::Error>
-///         where V: Visitor
+/// #
+///     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+///         where V: Visitor<'de>
 ///     {
 ///         /* ... */
 /// #       let _ = visitor;
 /// #       unimplemented!()
 ///     }
 ///
-///     forward_to_deserialize! {
-///         bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit option
-///         seq seq_fixed_size bytes byte_buf map unit_struct newtype_struct
-///         tuple_struct struct struct_field tuple enum ignored_any
+///     forward_to_deserialize_any! {
+///         bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str string bytes
+///         byte_buf option unit unit_struct newtype_struct seq tuple
+///         tuple_struct map struct enum identifier ignored_any
 ///     }
 /// }
+/// #
 /// # fn main() {}
 /// ```
+///
+/// The macro assumes the convention that your `Deserializer` lifetime parameter
+/// is called `'de` and that the `Visitor` type parameters on each method are
+/// called `V`. A different type parameter and a different lifetime can be
+/// specified explicitly if necessary.
+///
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde;
+/// #
+/// # use std::marker::PhantomData;
+/// #
+/// # use serde::de::{value, Deserializer, Visitor};
+/// #
+/// # struct MyDeserializer<V>(PhantomData<V>);
+/// #
+/// # impl<'q, V> Deserializer<'q> for MyDeserializer<V> {
+/// #     type Error = value::Error;
+/// #
+/// #     fn deserialize_any<W>(self, visitor: W) -> Result<W::Value, Self::Error>
+/// #         where W: Visitor<'q>
+/// #     {
+/// #         unimplemented!()
+/// #     }
+/// #
+/// forward_to_deserialize_any! {
+///     <W: Visitor<'q>>
+///     bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str string bytes
+///     byte_buf option unit unit_struct newtype_struct seq tuple tuple_struct
+///     map struct enum identifier ignored_any
+/// }
+/// # }
+/// #
+/// # fn main() {}
+/// ```
+///
+/// [`Deserializer`]: trait.Deserializer.html
+/// [`Visitor`]: de/trait.Visitor.html
+/// [`Deserializer::deserialize_any`]: trait.Deserializer.html#tymethod.deserialize_any
 #[macro_export]
-macro_rules! forward_to_deserialize {
+macro_rules! forward_to_deserialize_any {
+    (<$visitor:ident: Visitor<$lifetime:tt>> $($func:ident)*) => {
+        $(forward_to_deserialize_any_helper!{$func<$lifetime, $visitor>})*
+    };
+    // This case must be after the previous one.
     ($($func:ident)*) => {
-        $(forward_to_deserialize_helper!{$func})*
+        $(forward_to_deserialize_any_helper!{$func<'de, V>})*
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_any_method {
+    ($func:ident<$l:tt, $v:ident>($($arg:ident : $ty:ty),*)) => {
+        #[inline]
+        fn $func<$v>(self, $($arg: $ty,)* visitor: $v) -> $crate::export::Result<$v::Value, Self::Error>
+        where
+            $v: $crate::de::Visitor<$l>,
+        {
+            $(
+                let _ = $arg;
+            )*
+            self.deserialize_any(visitor)
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_any_helper {
+    (bool<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_bool<$l, $v>()}
+    };
+    (i8<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_i8<$l, $v>()}
+    };
+    (i16<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_i16<$l, $v>()}
+    };
+    (i32<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_i32<$l, $v>()}
+    };
+    (i64<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_i64<$l, $v>()}
+    };
+    (u8<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_u8<$l, $v>()}
+    };
+    (u16<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_u16<$l, $v>()}
+    };
+    (u32<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_u32<$l, $v>()}
+    };
+    (u64<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_u64<$l, $v>()}
+    };
+    (f32<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_f32<$l, $v>()}
+    };
+    (f64<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_f64<$l, $v>()}
+    };
+    (char<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_char<$l, $v>()}
+    };
+    (str<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_str<$l, $v>()}
+    };
+    (string<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_string<$l, $v>()}
+    };
+    (bytes<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_bytes<$l, $v>()}
+    };
+    (byte_buf<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_byte_buf<$l, $v>()}
+    };
+    (option<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_option<$l, $v>()}
+    };
+    (unit<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_unit<$l, $v>()}
+    };
+    (unit_struct<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_unit_struct<$l, $v>(name: &'static str)}
+    };
+    (newtype_struct<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_newtype_struct<$l, $v>(name: &'static str)}
+    };
+    (seq<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_seq<$l, $v>()}
+    };
+    (tuple<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_tuple<$l, $v>(len: usize)}
+    };
+    (tuple_struct<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_tuple_struct<$l, $v>(name: &'static str, len: usize)}
+    };
+    (map<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_map<$l, $v>()}
+    };
+    (struct<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_struct<$l, $v>(name: &'static str, fields: &'static [&'static str])}
+    };
+    (enum<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_enum<$l, $v>(name: &'static str, variants: &'static [&'static str])}
+    };
+    (identifier<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_identifier<$l, $v>()}
+    };
+    (ignored_any<$l:tt, $v:ident>) => {
+        forward_to_deserialize_any_method!{deserialize_ignored_any<$l, $v>()}
     };
 }

serde/src/private/macros.rs

@@ -0,0 +1,148 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __private_serialize {
+    () => {
+        trait Serialize {
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where
+                S: $crate::Serializer;
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __private_deserialize {
+    () => {
+        trait Deserialize<'de>: Sized {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: $crate::Deserializer<'de>;
+        }
+    };
+}
+
+/// Used only by Serde doc tests. Not public API.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __serialize_unimplemented {
+    ($($func:ident)*) => {
+        $(
+            __serialize_unimplemented_helper!($func);
+        )*
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __serialize_unimplemented_method {
+    ($func:ident $(<$t:ident>)* ($($arg:ty),*) -> $ret:ident) => {
+        fn $func $(<$t: ?Sized + $crate::Serialize>)* (self $(, _: $arg)*) -> $crate::export::Result<Self::$ret, Self::Error> {
+            unimplemented!()
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __serialize_unimplemented_helper {
+    (bool) => {
+        __serialize_unimplemented_method!(serialize_bool(bool) -> Ok);
+    };
+    (i8) => {
+        __serialize_unimplemented_method!(serialize_i8(i8) -> Ok);
+    };
+    (i16) => {
+        __serialize_unimplemented_method!(serialize_i16(i16) -> Ok);
+    };
+    (i32) => {
+        __serialize_unimplemented_method!(serialize_i32(i32) -> Ok);
+    };
+    (i64) => {
+        __serialize_unimplemented_method!(serialize_i64(i64) -> Ok);
+    };
+    (u8) => {
+        __serialize_unimplemented_method!(serialize_u8(u8) -> Ok);
+    };
+    (u16) => {
+        __serialize_unimplemented_method!(serialize_u16(u16) -> Ok);
+    };
+    (u32) => {
+        __serialize_unimplemented_method!(serialize_u32(u32) -> Ok);
+    };
+    (u64) => {
+        __serialize_unimplemented_method!(serialize_u64(u64) -> Ok);
+    };
+    (f32) => {
+        __serialize_unimplemented_method!(serialize_f32(f32) -> Ok);
+    };
+    (f64) => {
+        __serialize_unimplemented_method!(serialize_f64(f64) -> Ok);
+    };
+    (char) => {
+        __serialize_unimplemented_method!(serialize_char(char) -> Ok);
+    };
+    (str) => {
+        __serialize_unimplemented_method!(serialize_str(&str) -> Ok);
+    };
+    (bytes) => {
+        __serialize_unimplemented_method!(serialize_bytes(&[u8]) -> Ok);
+    };
+    (none) => {
+        __serialize_unimplemented_method!(serialize_none() -> Ok);
+    };
+    (some) => {
+        __serialize_unimplemented_method!(serialize_some<T>(&T) -> Ok);
+    };
+    (unit) => {
+        __serialize_unimplemented_method!(serialize_unit() -> Ok);
+    };
+    (unit_struct) => {
+        __serialize_unimplemented_method!(serialize_unit_struct(&str) -> Ok);
+    };
+    (unit_variant) => {
+        __serialize_unimplemented_method!(serialize_unit_variant(&str, u32, &str) -> Ok);
+    };
+    (newtype_struct) => {
+        __serialize_unimplemented_method!(serialize_newtype_struct<T>(&str, &T) -> Ok);
+    };
+    (newtype_variant) => {
+        __serialize_unimplemented_method!(serialize_newtype_variant<T>(&str, u32, &str, &T) -> Ok);
+    };
+    (seq) => {
+        type SerializeSeq = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_seq(Option<usize>) -> SerializeSeq);
+    };
+    (tuple) => {
+        type SerializeTuple = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple(usize) -> SerializeTuple);
+    };
+    (tuple_struct) => {
+        type SerializeTupleStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple_struct(&str, usize) -> SerializeTupleStruct);
+    };
+    (tuple_variant) => {
+        type SerializeTupleVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple_variant(&str, u32, &str, usize) -> SerializeTupleVariant);
+    };
+    (map) => {
+        type SerializeMap = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_map(Option<usize>) -> SerializeMap);
+    };
+    (struct) => {
+        type SerializeStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_struct(&str, usize) -> SerializeStruct);
+    };
+    (struct_variant) => {
+        type SerializeStructVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_struct_variant(&str, u32, &str, usize) -> SerializeStructVariant);
+    };
+}

serde/src/private/mod.rs

@@ -0,0 +1,12 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+mod macros;
+
+pub mod ser;
+pub mod de;

serde/src/ser/impossible.rs

@@ -1,28 +1,35 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 //! This module contains `Impossible` serializer and its implementations.
 
-use core::marker::PhantomData;
+use lib::*;
 
-use ser::{
-    self,
-    Serialize,
-    SerializeSeq,
-    SerializeTuple,
-    SerializeTupleStruct,
-    SerializeTupleVariant,
-    SerializeMap,
-    SerializeStruct,
-    SerializeStructVariant,
-};
+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`.
+/// corresponding to the [`Serializer`] compound types: [`SerializeSeq`],
+/// [`SerializeTuple`], [`SerializeTupleStruct`], [`SerializeTupleVariant`],
+/// [`SerializeMap`], [`SerializeStruct`], and [`SerializeStructVariant`].
 ///
-/// ```rust,ignore
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde;
+/// #
+/// # use serde::ser::{Serializer, Impossible};
+/// # use serde::private::ser::Error;
+/// #
+/// # struct MySerializer;
+/// #
 /// impl Serializer for MySerializer {
 ///     type Ok = ();
 ///     type Error = Error;
@@ -36,142 +43,185 @@ use ser::{
 ///                      -> Result<Self::SerializeSeq, Error> {
 ///         // Given Impossible cannot be instantiated, the only
 ///         // thing we can do here is to return an error.
+/// #         stringify! {
 ///         Err(...)
+/// #         };
+/// #         unimplemented!()
 ///     }
 ///
 ///     /* other Serializer methods */
+/// #     __serialize_unimplemented! {
+/// #         bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str bytes none some
+/// #         unit unit_struct unit_variant newtype_struct newtype_variant
+/// #         tuple tuple_struct tuple_variant map struct struct_variant
+/// #     }
 /// }
+/// #
+/// # fn main() {}
 /// ```
-pub struct Impossible<Ok, E> {
+///
+/// [`Serializer`]: trait.Serializer.html
+/// [`SerializeSeq`]: trait.SerializeSeq.html
+/// [`SerializeTuple`]: trait.SerializeTuple.html
+/// [`SerializeTupleStruct`]: trait.SerializeTupleStruct.html
+/// [`SerializeTupleVariant`]: trait.SerializeTupleVariant.html
+/// [`SerializeMap`]: trait.SerializeMap.html
+/// [`SerializeStruct`]: trait.SerializeStruct.html
+/// [`SerializeStructVariant`]: trait.SerializeStructVariant.html
+pub struct Impossible<Ok, Error> {
     void: Void,
-    _marker: PhantomData<(Ok, E)>,
+    ok: PhantomData<Ok>,
+    error: PhantomData<Error>,
 }
 
 enum Void {}
 
-impl<Ok, E> SerializeSeq for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeSeq for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_element<T: ?Sized + Serialize>(&mut self,
-                                                _value: &T)
-                                                -> Result<(), E> {
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeTuple for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeTuple for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_element<T: ?Sized + Serialize>(&mut self,
-                                                _value: &T)
-                                                -> Result<(), E> {
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeTupleStruct for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeTupleStruct for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeTupleVariant for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeTupleVariant for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeMap for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeMap for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_key<T: ?Sized + Serialize>(&mut self,
-                                                 _key: &T)
-                                            -> Result<(), E> {
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = key;
         match self.void {}
     }
 
-    fn serialize_value<T: ?Sized + Serialize>(&mut self,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeStruct for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeStruct for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                                   _key: &'static str,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = key;
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeStructVariant for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeStructVariant for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                                   _key: &'static str,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = key;
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }

serde/src/ser/private.rs

@@ -1,235 +0,0 @@
-use core::fmt::{self, Display};
-
-use ser::{self, Serialize, Serializer, SerializeMap, SerializeStruct};
-
-/// 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,
-    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"),
-            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 = S::SerializeSeq;
-    type SerializeTuple = S::SerializeTuple;
-    type SerializeTupleStruct = S::SerializeTupleStruct;
-    type SerializeTupleVariant = S::SerializeTupleVariant;
-    type SerializeMap = S::SerializeMap;
-    type SerializeStruct = S::SerializeStruct;
-    type SerializeStructVariant = S::SerializeStructVariant;
-
-    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, _: &'static str) -> Result<Self::Ok, Self::Error> {
-        Err(self.bad_type(Unsupported::Enum))
-    }
-
-    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, _: &'static str, _: &T) -> Result<Self::Ok, Self::Error>
-        where T: Serialize
-    {
-        Err(self.bad_type(Unsupported::Enum))
-    }
-
-    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))
-    }
-
-    fn serialize_tuple_variant(self, _: &'static str, _: usize, _: &'static str, _: usize) -> Result<Self::SerializeTupleVariant, Self::Error> {
-        Err(self.bad_type(Unsupported::Enum))
-    }
-
-    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)
-    }
-
-    fn serialize_struct_variant(self, _: &'static str, _: usize, _: &'static str, _: usize) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Err(self.bad_type(Unsupported::Enum))
-    }
-}

serde/src/utils.rs

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

serde_codegen_internals/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "serde_codegen_internals"
-version = "0.13.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-license = "MIT/Apache-2.0"
-description = "AST representation used by Serde codegen. Unstable."
-homepage = "https://serde.rs"
-repository = "https://github.com/serde-rs/serde"
-documentation = "https://docs.serde.rs/serde_codegen_internals/"
-keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
-
-[dependencies]
-syn = "0.11"
-
-[badges]
-travis-ci = { repository = "serde-rs/serde" }

serde_codegen_internals/src/ast.rs

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

serde_codegen_internals/src/attr.rs

@@ -1,628 +0,0 @@
-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
-// `attr::Field::from_ast`. Each returns an instance of the corresponding
-// struct. Note that none of them return a Result. Unrecognized, malformed, or
-// duplicated attributes result in a span_err but otherwise are ignored. The
-// user will see errors simultaneously for all bad attributes in the crate
-// rather than just the first.
-
-struct Attr<'c, T> {
-    cx: &'c Ctxt,
-    name: &'static str,
-    value: Option<T>,
-}
-
-impl<'c, T> Attr<'c, T> {
-    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
-        Attr {
-            cx: cx,
-            name: name,
-            value: None,
-        }
-    }
-
-    fn set(&mut self, value: T) {
-        if self.value.is_some() {
-            self.cx.error(format!("duplicate serde attribute `{}`", self.name));
-        } else {
-            self.value = Some(value);
-        }
-    }
-
-    fn set_opt(&mut self, value: Option<T>) {
-        if let Some(value) = value {
-            self.set(value);
-        }
-    }
-
-    fn set_if_none(&mut self, value: T) {
-        if self.value.is_none() {
-            self.value = Some(value);
-        }
-    }
-
-    fn get(self) -> Option<T> {
-        self.value
-    }
-}
-
-struct BoolAttr<'c>(Attr<'c, ()>);
-
-impl<'c> BoolAttr<'c> {
-    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
-        BoolAttr(Attr::none(cx, name))
-    }
-
-    fn set_true(&mut self) {
-        self.0.set(());
-    }
-
-    fn get(&self) -> bool {
-        self.0.value.is_some()
-    }
-}
-
-#[derive(Debug)]
-pub struct Name {
-    serialize: String,
-    deserialize: String,
-}
-
-impl Name {
-    /// Return the container name for the container when serializing.
-    pub fn serialize_name(&self) -> String {
-        self.serialize.clone()
-    }
-
-    /// Return the container name for the container when deserializing.
-    pub fn deserialize_name(&self) -> String {
-        self.deserialize.clone()
-    }
-}
-
-/// Represents container (e.g. struct) attribute information
-#[derive(Debug)]
-pub struct Item {
-    name: Name,
-    deny_unknown_fields: bool,
-    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(String),
-
-    /// `#[serde(untagged)]`
-    ///
-    /// ```json
-    /// {"key1": "value1", "key2": "value2"}
-    /// ```
-    None,
-}
-
-impl Item {
-    /// Extract out the `#[serde(...)]` attributes from an item.
-    pub fn from_ast(cx: &Ctxt, item: &syn::MacroInput) -> Self {
-        let mut ser_name = Attr::none(cx, "rename");
-        let mut de_name = Attr::none(cx, "rename");
-        let mut deny_unknown_fields = BoolAttr::none(cx, "deny_unknown_fields");
-        let mut 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");
-
-        for meta_items in item.attrs.iter().filter_map(get_serde_meta_items) {
-            for meta_item in meta_items {
-                match meta_item {
-                    // Parse `#[serde(rename="foo")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "rename" => {
-                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
-                            ser_name.set(s.clone());
-                            de_name.set(s);
-                        }
-                    }
-
-                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    MetaItem(List(ref name, ref meta_items)) if name == "rename" => {
-                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
-                            ser_name.set_opt(ser);
-                            de_name.set_opt(de);
-                        }
-                    }
-
-                    // Parse `#[serde(deny_unknown_fields)]`
-                    MetaItem(Word(ref name)) if name == "deny_unknown_fields" => {
-                        deny_unknown_fields.set_true();
-                    }
-
-                    // Parse `#[serde(bound="D: Serialize")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "bound" => {
-                        if let Ok(where_predicates) = parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
-                            ser_bound.set(where_predicates.clone());
-                            de_bound.set(where_predicates);
-                        }
-                    }
-
-                    // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
-                    MetaItem(List(ref name, ref meta_items)) if name == "bound" => {
-                        if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
-                            ser_bound.set_opt(ser);
-                            de_bound.set_opt(de);
-                        }
-                    }
-
-                    // Parse `#[serde(untagged)]`
-                    MetaItem(Word(ref name)) if name == "untagged" => {
-                        match item.body {
-                            syn::Body::Enum(_) => {
-                                untagged.set_true();
-                            }
-                            syn::Body::Struct(_) => {
-                                cx.error("#[serde(untagged)] can only be used on enums")
-                            }
-                        }
-                    }
-
-                    // Parse `#[serde(tag = "type")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "tag" => {
-                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
-                            match item.body {
-                                syn::Body::Enum(_) => {
-                                    internal_tag.set(s);
-                                }
-                                syn::Body::Struct(_) => {
-                                    cx.error("#[serde(tag = \"...\")] can only be used on enums")
-                                }
-                            }
-                        }
-                    }
-
-                    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()) {
-            (false, None) => EnumTag::External,
-            (true, None) => EnumTag::None,
-            (false, Some(tag)) => {
-                // 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)
-            }
-            (true, Some(_)) => {
-                cx.error("enum cannot be both untagged and internally tagged");
-                EnumTag::External // doesn't matter, will error
-            }
-        };
-
-        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(),
-            ser_bound: ser_bound.get(),
-            de_bound: de_bound.get(),
-            tag: tag,
-        }
-    }
-
-    pub fn name(&self) -> &Name {
-        &self.name
-    }
-
-    pub fn deny_unknown_fields(&self) -> bool {
-        self.deny_unknown_fields
-    }
-
-    pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
-        self.ser_bound.as_ref().map(|vec| &vec[..])
-    }
-
-    pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
-        self.de_bound.as_ref().map(|vec| &vec[..])
-    }
-
-    pub fn tag(&self) -> &EnumTag {
-        &self.tag
-    }
-}
-
-/// 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")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "rename" => {
-                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
-                            ser_name.set(s.clone());
-                            de_name.set(s);
-                        }
-                    }
-
-                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    MetaItem(List(ref name, ref meta_items)) if name == "rename" => {
-                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
-                            ser_name.set_opt(ser);
-                            de_name.set_opt(de);
-                        }
-                    }
-                    // Parse `#[serde(skip_deserializing)]`
-                    MetaItem(Word(ref name)) if name == "skip_deserializing" => {
-                        skip_deserializing.set_true();
-                    }
-                    // Parse `#[serde(skip_serializing)]`
-                    MetaItem(Word(ref name)) if name == "skip_serializing" => {
-                        skip_serializing.set_true();
-                    }
-
-                    MetaItem(ref meta_item) => {
-                        cx.error(format!("unknown serde variant attribute `{}`",
-                                         meta_item.name()));
-                    }
-
-                    Literal(_) => {
-                        cx.error("unexpected literal in serde variant attribute");
-                    }
-                }
-            }
-        }
-
-        Variant {
-            name: Name {
-                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
-#[derive(Debug)]
-pub struct Field {
-    name: Name,
-    skip_serializing: bool,
-    skip_deserializing: bool,
-    skip_serializing_if: Option<syn::Path>,
-    default: FieldDefault,
-    serialize_with: Option<syn::Path>,
-    deserialize_with: Option<syn::Path>,
-    ser_bound: Option<Vec<syn::WherePredicate>>,
-    de_bound: Option<Vec<syn::WherePredicate>>,
-}
-
-/// Represents the default to use for a field when deserializing.
-#[derive(Debug, PartialEq)]
-pub enum FieldDefault {
-    /// Field must always be specified because it does not have a default.
-    None,
-    /// The default is given by `std::default::Default::default()`.
-    Default,
-    /// The default is given by this function.
-    Path(syn::Path),
-}
-
-impl Field {
-    /// Extract out the `#[serde(...)]` attributes from a struct field.
-    pub fn from_ast(cx: &Ctxt,
-                    index: usize,
-                    field: &syn::Field) -> Self {
-        let mut ser_name = Attr::none(cx, "rename");
-        let mut de_name = Attr::none(cx, "rename");
-        let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
-        let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing");
-        let mut skip_serializing_if = Attr::none(cx, "skip_serializing_if");
-        let mut default = Attr::none(cx, "default");
-        let mut serialize_with = Attr::none(cx, "serialize_with");
-        let mut deserialize_with = Attr::none(cx, "deserialize_with");
-        let mut ser_bound = Attr::none(cx, "bound");
-        let mut de_bound = Attr::none(cx, "bound");
-
-        let ident = match field.ident {
-            Some(ref ident) => ident.to_string(),
-            None => index.to_string(),
-        };
-
-        for meta_items in field.attrs.iter().filter_map(get_serde_meta_items) {
-            for meta_item in meta_items {
-                match meta_item {
-                    // Parse `#[serde(rename="foo")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "rename" => {
-                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
-                            ser_name.set(s.clone());
-                            de_name.set(s);
-                        }
-                    }
-
-                    // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    MetaItem(List(ref name, ref meta_items)) if name == "rename" => {
-                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
-                            ser_name.set_opt(ser);
-                            de_name.set_opt(de);
-                        }
-                    }
-
-                    // Parse `#[serde(default)]`
-                    MetaItem(Word(ref name)) if name == "default" => {
-                        default.set(FieldDefault::Default);
-                    }
-
-                    // Parse `#[serde(default="...")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "default" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
-                            default.set(FieldDefault::Path(path));
-                        }
-                    }
-
-                    // Parse `#[serde(skip_serializing)]`
-                    MetaItem(Word(ref name)) if name == "skip_serializing" => {
-                        skip_serializing.set_true();
-                    }
-
-                    // Parse `#[serde(skip_deserializing)]`
-                    MetaItem(Word(ref name)) if name == "skip_deserializing" => {
-                        skip_deserializing.set_true();
-                    }
-
-                    // Parse `#[serde(skip_serializing_if="...")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "skip_serializing_if" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
-                            skip_serializing_if.set(path);
-                        }
-                    }
-
-                    // Parse `#[serde(serialize_with="...")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "serialize_with" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
-                            serialize_with.set(path);
-                        }
-                    }
-
-                    // Parse `#[serde(deserialize_with="...")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "deserialize_with" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
-                            deserialize_with.set(path);
-                        }
-                    }
-
-                    // Parse `#[serde(bound="D: Serialize")]`
-                    MetaItem(NameValue(ref name, ref lit)) if name == "bound" => {
-                        if let Ok(where_predicates) = parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
-                            ser_bound.set(where_predicates.clone());
-                            de_bound.set(where_predicates);
-                        }
-                    }
-
-                    // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
-                    MetaItem(List(ref name, ref meta_items)) if name == "bound" => {
-                        if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
-                            ser_bound.set_opt(ser);
-                            de_bound.set_opt(de);
-                        }
-                    }
-
-                    MetaItem(ref meta_item) => {
-                        cx.error(format!("unknown serde field attribute `{}`",
-                                         meta_item.name()));
-                    }
-
-                    Literal(_) => {
-                        cx.error("unexpected literal in serde field attribute");
-                    }
-                }
-            }
-        }
-
-        // Is skip_deserializing, initialize the field to Default::default()
-        // unless a different default is specified by `#[serde(default="...")]`
-        if skip_deserializing.0.value.is_some() {
-            default.set_if_none(FieldDefault::Default);
-        }
-
-        Field {
-            name: Name {
-                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),
-            serialize_with: serialize_with.get(),
-            deserialize_with: deserialize_with.get(),
-            ser_bound: ser_bound.get(),
-            de_bound: de_bound.get(),
-        }
-    }
-
-    pub fn name(&self) -> &Name {
-        &self.name
-    }
-
-    pub fn skip_serializing(&self) -> bool {
-        self.skip_serializing
-    }
-
-    pub fn skip_deserializing(&self) -> bool {
-        self.skip_deserializing
-    }
-
-    pub fn skip_serializing_if(&self) -> Option<&syn::Path> {
-        self.skip_serializing_if.as_ref()
-    }
-
-    pub fn default(&self) -> &FieldDefault {
-        &self.default
-    }
-
-    pub fn serialize_with(&self) -> Option<&syn::Path> {
-        self.serialize_with.as_ref()
-    }
-
-    pub fn deserialize_with(&self) -> Option<&syn::Path> {
-        self.deserialize_with.as_ref()
-    }
-
-    pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
-        self.ser_bound.as_ref().map(|vec| &vec[..])
-    }
-
-    pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
-        self.de_bound.as_ref().map(|vec| &vec[..])
-    }
-}
-
-type SerAndDe<T> = (Option<T>, Option<T>);
-
-fn get_ser_and_de<T, F>(
-    cx: &Ctxt,
-    attr_name: &'static str,
-    items: &[syn::NestedMetaItem],
-    f: F
-) -> Result<SerAndDe<T>, ()>
-    where F: Fn(&Ctxt, &str, &str, &syn::Lit) -> Result<T, ()>,
-{
-    let mut ser_item = Attr::none(cx, attr_name);
-    let mut de_item = Attr::none(cx, attr_name);
-
-    for item in items {
-        match *item {
-            MetaItem(NameValue(ref name, ref lit)) if name == "serialize" => {
-                if let Ok(v) = f(cx, attr_name, name.as_ref(), lit) {
-                    ser_item.set(v);
-                }
-            }
-
-            MetaItem(NameValue(ref name, ref lit)) if name == "deserialize" => {
-                if let Ok(v) = f(cx, attr_name, name.as_ref(), lit) {
-                    de_item.set(v);
-                }
-            }
-
-            _ => {
-                cx.error(format!("malformed {0} attribute, expected `{0}(serialize = ..., deserialize = ...)`",
-                                 attr_name));
-                return Err(());
-            }
-        }
-    }
-
-    Ok((ser_item.get(), de_item.get()))
-}
-
-fn get_renames(
-    cx: &Ctxt,
-    items: &[syn::NestedMetaItem],
-) -> Result<SerAndDe<String>, ()> {
-    get_ser_and_de(cx, "rename", items, get_string_from_lit)
-}
-
-fn get_where_predicates(
-    cx: &Ctxt,
-    items: &[syn::NestedMetaItem],
-) -> Result<SerAndDe<Vec<syn::WherePredicate>>, ()> {
-    get_ser_and_de(cx, "bound", items, parse_lit_into_where)
-}
-
-pub fn get_serde_meta_items(attr: &syn::Attribute) -> Option<Vec<syn::NestedMetaItem>> {
-    match attr.value {
-        List(ref name, ref items) if name == "serde" => {
-            Some(items.iter().cloned().collect())
-        }
-        _ => None
-    }
-}
-
-fn get_string_from_lit(cx: &Ctxt, attr_name: &str, meta_item_name: &str, lit: &syn::Lit) -> Result<String, ()> {
-    if let syn::Lit::Str(ref s, _) = *lit {
-        Ok(s.clone())
-    } else {
-        cx.error(format!("expected serde {} attribute to be a string: `{} = \"...\"`",
-                         attr_name, meta_item_name));
-        Err(())
-    }
-}
-
-fn parse_lit_into_path(cx: &Ctxt, attr_name: &str, lit: &syn::Lit) -> Result<syn::Path, ()> {
-    let string = try!(get_string_from_lit(cx, attr_name, attr_name, lit));
-    syn::parse_path(&string).map_err(|err| cx.error(err))
-}
-
-fn parse_lit_into_where(cx: &Ctxt, attr_name: &str, meta_item_name: &str, lit: &syn::Lit) -> Result<Vec<syn::WherePredicate>, ()> {
-    let string = try!(get_string_from_lit(cx, attr_name, meta_item_name, lit));
-    if string.is_empty() {
-        return Ok(Vec::new());
-    }
-
-    let where_string = format!("where {}", string);
-
-    syn::parse_where_clause(&where_string).map(|wh| wh.predicates).map_err(|err| cx.error(err))
-}

serde_codegen_internals/src/lib.rs

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

serde_derive/Cargo.toml

@@ -1,17 +1,15 @@
 [package]
 name = "serde_derive"
-version = "0.9.6"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+version = "1.0.13" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@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"]
-
-[features]
-unstable = []
+keywords = ["serde", "serialization", "no_std"]
+readme = "README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [badges]
 travis-ci = { repository = "serde-rs/serde" }
@@ -22,5 +20,5 @@ proc-macro = true
 
 [dependencies]
 quote = "0.3.8"
-serde_codegen_internals = { version = "=0.13.0", default-features = false, path = "../serde_codegen_internals" }
-syn = { version = "0.11", features = ["aster", "visit"] }
+serde_derive_internals = { version = "=0.16.0", default-features = false, path = "../serde_derive_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

@@ -1,21 +1,42 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use std::collections::HashSet;
 
-use syn::{self, aster, visit};
+use syn::{self, visit};
 
-use internals::ast::Item;
+use internals::ast::{Body, Container};
 use internals::attr;
 
+macro_rules! path {
+    ($($path:tt)+) => {
+        syn::parse_path(stringify!($($path)+)).unwrap()
+    };
+}
+
 // 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()
+        ty_params: generics
+            .ty_params
+            .iter()
+            .map(
+                |ty_param| {
+                    syn::TyParam {
+                        default: None,
+                        ..ty_param.clone()
+                    }
+                },
+            )
+            .collect(),
+        ..generics.clone()
     }
 }
 
@@ -23,24 +44,30 @@ pub fn with_where_predicates(
     generics: &syn::Generics,
     predicates: &[syn::WherePredicate],
 ) -> syn::Generics {
-    aster::from_generics(generics.clone())
-        .with_predicates(predicates.to_vec())
-        .build()
+    let mut generics = generics.clone();
+    generics
+        .where_clause
+        .predicates
+        .extend_from_slice(predicates);
+    generics
 }
 
 pub fn with_where_predicates_from_fields<F>(
-    item: &Item,
+    cont: &Container,
     generics: &syn::Generics,
     from_field: F,
 ) -> syn::Generics
-    where F: Fn(&attr::Field) -> Option<&[syn::WherePredicate]>,
+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()
+    let predicates = cont.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
@@ -55,12 +82,13 @@ pub fn with_where_predicates_from_fields<F>(
 //         c: C,
 //     }
 pub fn with_bound<F>(
-    item: &Item,
+    cont: &Container,
     generics: &syn::Generics,
     filter: F,
     bound: &syn::Path,
 ) -> syn::Generics
-    where F: Fn(&attr::Field) -> bool,
+where
+    F: Fn(&attr::Field, Option<&attr::Variant>) -> bool,
 {
     struct FindTyParams {
         // Set of all generic type parameters on the current struct (A, B, C in
@@ -90,32 +118,149 @@ pub fn with_bound<F>(
         }
     }
 
-    let all_ty_params: HashSet<_> = generics.ty_params.iter()
+    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);
+    match cont.body {
+        Body::Enum(ref variants) => {
+            for variant in variants.iter() {
+                let relevant_fields = variant
+                    .fields
+                    .iter()
+                    .filter(|field| filter(&field.attrs, Some(&variant.attrs)));
+                for field in relevant_fields {
+                    visit::walk_ty(&mut visitor, field.ty);
+                }
+            }
+        }
+        Body::Struct(_, ref fields) => {
+            for field in fields.iter().filter(|field| filter(&field.attrs, None)) {
+                visit::walk_ty(&mut visitor, field.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()
+    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(
+    cont: &Container,
+    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(cont),
+                    // 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(cont: &Container) -> syn::Ty {
+    syn::Ty::Path(
+        None,
+        syn::Path {
+            global: false,
+            segments: vec![
+                syn::PathSegment {
+                    ident: cont.ident.clone(),
+                    parameters: syn::PathParameters::AngleBracketed(
+                        syn::AngleBracketedParameterData {
+                            lifetimes: cont.generics
+                                .lifetimes
+                                .iter()
+                                .map(|def| def.lifetime.clone())
+                                .collect(),
+                            types: cont.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,75 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use 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,3 +1,23 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! This crate provides Serde's two derive macros.
+//!
+//! ```rust,ignore
+//! #[derive(Serialize, Deserialize)]
+//! ```
+//!
+//! Please refer to [https://serde.rs/derive.html] for how to set this up.
+//!
+//! [https://serde.rs/derive.html]: https://serde.rs/derive.html
+
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.13")]
+
 #![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
 #![cfg_attr(feature = "cargo-clippy", allow(used_underscore_binding))]
 
@@ -8,14 +28,18 @@ extern crate syn;
 #[macro_use]
 extern crate quote;
 
-extern crate serde_codegen_internals as internals;
+extern crate serde_derive_internals as internals;
 
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
+#[macro_use]
 mod bound;
-mod de;
+#[macro_use]
+mod fragment;
+
 mod ser;
+mod de;
 
 #[proc_macro_derive(Serialize, attributes(serde))]
 pub fn derive_serialize(input: TokenStream) -> TokenStream {

serde_derive_internals/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "serde_derive_internals"
+version = "0.16.0" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "AST representation used by Serde derive macros. Unstable."
+homepage = "https://serde.rs"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://docs.serde.rs/serde_derive_internals/"
+keywords = ["serde", "serialization"]
+readme = "README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[dependencies]
+syn = { version = "0.11.10", default-features = false, features = ["parsing"] }
+synom = "0.11"
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }

serde_derive_internals/LICENSE-APACHE

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

serde_derive_internals/LICENSE-MIT

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

serde_derive_internals/README.md

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

serde_derive_internals/src/ast.rs

@@ -0,0 +1,143 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use syn;
+use attr;
+use check;
+use Ctxt;
+
+pub struct Container<'a> {
+    pub ident: syn::Ident,
+    pub attrs: attr::Container,
+    pub body: Body<'a>,
+    pub generics: &'a syn::Generics,
+}
+
+pub enum Body<'a> {
+    Enum(Vec<Variant<'a>>),
+    Struct(Style, Vec<Field<'a>>),
+}
+
+pub struct Variant<'a> {
+    pub ident: syn::Ident,
+    pub attrs: attr::Variant,
+    pub style: Style,
+    pub fields: Vec<Field<'a>>,
+}
+
+pub struct Field<'a> {
+    pub ident: Option<syn::Ident>,
+    pub attrs: attr::Field,
+    pub ty: &'a syn::Ty,
+}
+
+#[derive(Copy, Clone)]
+pub enum Style {
+    Struct,
+    Tuple,
+    Newtype,
+    Unit,
+}
+
+impl<'a> Container<'a> {
+    pub fn from_ast(cx: &Ctxt, item: &'a syn::DeriveInput) -> Container<'a> {
+        let attrs = attr::Container::from_ast(cx, item);
+
+        let mut body = match item.body {
+            syn::Body::Enum(ref variants) => Body::Enum(enum_from_ast(cx, variants)),
+            syn::Body::Struct(ref variant_data) => {
+                let (style, fields) = struct_from_ast(cx, variant_data);
+                Body::Struct(style, fields)
+            }
+        };
+
+        match body {
+            Body::Enum(ref mut variants) => {
+                for ref mut variant in variants {
+                    variant.attrs.rename_by_rule(attrs.rename_all());
+                    for ref mut field in &mut variant.fields {
+                        field.attrs.rename_by_rule(variant.attrs.rename_all());
+                    }
+                }
+            }
+            Body::Struct(_, ref mut fields) => {
+                for field in fields {
+                    field.attrs.rename_by_rule(attrs.rename_all());
+                }
+            }
+        }
+
+        let item = Container {
+            ident: item.ident.clone(),
+            attrs: attrs,
+            body: body,
+            generics: &item.generics,
+        };
+        check::check(cx, &item);
+        item
+    }
+}
+
+impl<'a> Body<'a> {
+    pub fn all_fields(&'a self) -> Box<Iterator<Item = &'a Field<'a>> + 'a> {
+        match *self {
+            Body::Enum(ref variants) => {
+                Box::new(variants.iter().flat_map(|variant| variant.fields.iter()))
+            }
+            Body::Struct(_, ref fields) => Box::new(fields.iter()),
+        }
+    }
+
+    pub fn has_getter(&self) -> bool {
+        self.all_fields().any(|f| f.attrs.getter().is_some())
+    }
+}
+
+fn enum_from_ast<'a>(cx: &Ctxt, variants: &'a [syn::Variant]) -> Vec<Variant<'a>> {
+    variants
+        .iter()
+        .map(
+            |variant| {
+                let (style, fields) = struct_from_ast(cx, &variant.data);
+                Variant {
+                    ident: variant.ident.clone(),
+                    attrs: attr::Variant::from_ast(cx, variant),
+                    style: style,
+                    fields: fields,
+                }
+            },
+        )
+        .collect()
+}
+
+fn struct_from_ast<'a>(cx: &Ctxt, data: &'a syn::VariantData) -> (Style, Vec<Field<'a>>) {
+    match *data {
+        syn::VariantData::Struct(ref fields) => (Style::Struct, fields_from_ast(cx, fields)),
+        syn::VariantData::Tuple(ref fields) if fields.len() == 1 => {
+            (Style::Newtype, fields_from_ast(cx, fields))
+        }
+        syn::VariantData::Tuple(ref fields) => (Style::Tuple, fields_from_ast(cx, fields)),
+        syn::VariantData::Unit => (Style::Unit, Vec::new()),
+    }
+}
+
+fn fields_from_ast<'a>(cx: &Ctxt, fields: &'a [syn::Field]) -> Vec<Field<'a>> {
+    fields
+        .iter()
+        .enumerate()
+        .map(
+            |(i, field)| {
+                Field {
+                    ident: field.ident.clone(),
+                    attrs: attr::Field::from_ast(cx, i, field),
+                    ty: &field.ty,
+                }
+            },
+        )
+        .collect()
+}

serde_derive_internals/src/case.rs

@@ -0,0 +1,139 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::ascii::AsciiExt;
+use std::str::FromStr;
+
+use self::RenameRule::*;
+
+#[derive(Debug, PartialEq)]
+pub enum RenameRule {
+    /// Don't apply a default rename rule.
+    None,
+    /// Rename direct children to "lowercase" style.
+    LowerCase,
+    /// Rename direct children to "PascalCase" style, as typically used for enum variants.
+    PascalCase,
+    /// Rename direct children to "camelCase" style.
+    CamelCase,
+    /// Rename direct children to "snake_case" style, as commonly used for fields.
+    SnakeCase,
+    /// Rename direct children to "SCREAMING_SNAKE_CASE" style, as commonly used for constants.
+    ScreamingSnakeCase,
+    /// Rename direct children to "kebab-case" style.
+    KebabCase,
+    /// Rename direct children to "SCREAMING-KEBAB-CASE" style.
+    ScreamingKebabCase
+}
+
+impl RenameRule {
+    pub fn apply_to_variant(&self, variant: &str) -> String {
+        match *self {
+            None | PascalCase => variant.to_owned(),
+            LowerCase => variant.to_ascii_lowercase(),
+            CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..],
+            SnakeCase => {
+                let mut snake = String::new();
+                for (i, ch) in variant.char_indices() {
+                    if i > 0 && ch.is_uppercase() {
+                        snake.push('_');
+                    }
+                    snake.push(ch.to_ascii_lowercase());
+                }
+                snake
+            }
+            ScreamingSnakeCase => SnakeCase.apply_to_variant(variant).to_ascii_uppercase(),
+            KebabCase => SnakeCase.apply_to_variant(variant).replace('_', "-"),
+            ScreamingKebabCase => ScreamingSnakeCase.apply_to_variant(variant).replace('_', "-")
+        }
+    }
+
+    pub fn apply_to_field(&self, field: &str) -> String {
+        match *self {
+            None | LowerCase | SnakeCase => field.to_owned(),
+            PascalCase => {
+                let mut pascal = String::new();
+                let mut capitalize = true;
+                for ch in field.chars() {
+                    if ch == '_' {
+                        capitalize = true;
+                    } else if capitalize {
+                        pascal.push(ch.to_ascii_uppercase());
+                        capitalize = false;
+                    } else {
+                        pascal.push(ch);
+                    }
+                }
+                pascal
+            }
+            CamelCase => {
+                let pascal = PascalCase.apply_to_field(field);
+                pascal[..1].to_ascii_lowercase() + &pascal[1..]
+            }
+            ScreamingSnakeCase => field.to_ascii_uppercase(),
+            KebabCase => field.replace('_', "-"),
+            ScreamingKebabCase => ScreamingSnakeCase.apply_to_field(field).replace('_', "-")
+        }
+    }
+}
+
+impl FromStr for RenameRule {
+    type Err = ();
+
+    fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
+        match rename_all_str {
+            "lowercase" => Ok(LowerCase),
+            "PascalCase" => Ok(PascalCase),
+            "camelCase" => Ok(CamelCase),
+            "snake_case" => Ok(SnakeCase),
+            "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
+            "kebab-case" => Ok(KebabCase),
+            "SCREAMING-KEBAB-CASE" => Ok(ScreamingKebabCase),
+            _ => Err(()),
+        }
+    }
+}
+
+#[test]
+fn rename_variants() {
+    for &(original, lower, camel, snake, screaming, kebab, screaming_kebab) in
+        &[
+            ("Outcome", "outcome", "outcome", "outcome", "OUTCOME", "outcome", "OUTCOME"),
+            ("VeryTasty", "verytasty", "veryTasty", "very_tasty", "VERY_TASTY", "very-tasty", "VERY-TASTY"),
+            ("A", "a", "a", "a", "A", "a", "A"),
+            ("Z42", "z42", "z42", "z42", "Z42", "z42", "Z42"),
+        ] {
+        assert_eq!(None.apply_to_variant(original), original);
+        assert_eq!(LowerCase.apply_to_variant(original), lower);
+        assert_eq!(PascalCase.apply_to_variant(original), original);
+        assert_eq!(CamelCase.apply_to_variant(original), camel);
+        assert_eq!(SnakeCase.apply_to_variant(original), snake);
+        assert_eq!(ScreamingSnakeCase.apply_to_variant(original), screaming);
+        assert_eq!(KebabCase.apply_to_variant(original), kebab);
+        assert_eq!(ScreamingKebabCase.apply_to_variant(original), screaming_kebab);
+    }
+}
+
+#[test]
+fn rename_fields() {
+    for &(original, pascal, camel, screaming, kebab, screaming_kebab) in
+        &[
+            ("outcome", "Outcome", "outcome", "OUTCOME", "outcome", "OUTCOME"),
+            ("very_tasty", "VeryTasty", "veryTasty", "VERY_TASTY", "very-tasty", "VERY-TASTY"),
+            ("a", "A", "a", "A", "a", "A"),
+            ("z42", "Z42", "z42", "Z42", "z42", "Z42"),
+        ] {
+        assert_eq!(None.apply_to_field(original), original);
+        assert_eq!(PascalCase.apply_to_field(original), pascal);
+        assert_eq!(CamelCase.apply_to_field(original), camel);
+        assert_eq!(SnakeCase.apply_to_field(original), original);
+        assert_eq!(ScreamingSnakeCase.apply_to_field(original), screaming);
+        assert_eq!(KebabCase.apply_to_field(original), kebab);
+        assert_eq!(ScreamingKebabCase.apply_to_field(original), screaming_kebab);
+    }
+}

serde_derive_internals/src/check.rs

@@ -0,0 +1,152 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use ast::{Body, Container, Style};
+use attr::Identifier;
+use Ctxt;
+
+/// Cross-cutting checks that require looking at more than a single attrs
+/// object. Simpler checks should happen when parsing and building the attrs.
+pub fn check(cx: &Ctxt, cont: &Container) {
+    check_getter(cx, cont);
+    check_identifier(cx, cont);
+    check_variant_skip_attrs(cx, cont);
+}
+
+/// Getters are only allowed inside structs (not enums) with the `remote`
+/// attribute.
+fn check_getter(cx: &Ctxt, cont: &Container) {
+    match cont.body {
+        Body::Enum(_) => {
+            if cont.body.has_getter() {
+                cx.error("#[serde(getter = \"...\")] is not allowed in an enum");
+            }
+        }
+        Body::Struct(_, _) => {
+            if cont.body.has_getter() && cont.attrs.remote().is_none() {
+                cx.error(
+                    "#[serde(getter = \"...\")] can only be used in structs \
+                          that have #[serde(remote = \"...\")]",
+                );
+            }
+        }
+    }
+}
+
+/// The `other` attribute must be used at most once and it must be the last
+/// variant of an enum that has the `field_identifier` attribute.
+///
+/// Inside a `variant_identifier` all variants must be unit variants. Inside a
+/// `field_identifier` all but possibly one variant must be unit variants. The
+/// last variant may be a newtype variant which is an implicit "other" case.
+fn check_identifier(cx: &Ctxt, cont: &Container) {
+    let variants = match cont.body {
+        Body::Enum(ref variants) => variants,
+        Body::Struct(_, _) => {
+            return;
+        }
+    };
+
+    for (i, variant) in variants.iter().enumerate() {
+        match (variant.style, cont.attrs.identifier(), variant.attrs.other()) {
+            // The `other` attribute may only be used in a field_identifier.
+            (_, Identifier::Variant, true) |
+            (_, Identifier::No, true) => {
+                cx.error("#[serde(other)] may only be used inside a field_identifier");
+            }
+
+            // Variant with `other` attribute must be the last one.
+            (Style::Unit, Identifier::Field, true) => {
+                if i < variants.len() - 1 {
+                    cx.error("#[serde(other)] must be the last variant");
+                }
+            }
+
+            // Variant with `other` attribute must be a unit variant.
+            (_, Identifier::Field, true) => {
+                cx.error("#[serde(other)] must be on a unit variant");
+            }
+
+            // Any sort of variant is allowed if this is not an identifier.
+            (_, Identifier::No, false) => {}
+
+            // Unit variant without `other` attribute is always fine.
+            (Style::Unit, _, false) => {}
+
+            // The last field is allowed to be a newtype catch-all.
+            (Style::Newtype, Identifier::Field, false) => {
+                if i < variants.len() - 1 {
+                    cx.error(format!("`{}` must be the last variant", variant.ident));
+                }
+            }
+
+            (_, Identifier::Field, false) => {
+                cx.error("field_identifier may only contain unit variants");
+            }
+
+            (_, Identifier::Variant, false) => {
+                cx.error("variant_identifier may only contain unit variants");
+            }
+        }
+    }
+}
+
+/// Skip-(de)serializing attributes are not allowed on variants marked
+/// (de)serialize_with.
+fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
+    let variants = match cont.body {
+        Body::Enum(ref variants) => variants,
+        Body::Struct(_, _) => {
+            return;
+        }
+    };
+
+    for variant in variants.iter() {
+        if variant.attrs.serialize_with().is_some() {
+            if variant.attrs.skip_serializing() {
+                cx.error(format!("variant `{}` cannot have both #[serde(serialize_with)] and \
+                                  #[serde(skip_serializing)]", variant.ident));
+            }
+
+            for (i, field) in variant.fields.iter().enumerate() {
+                let ident = field.ident.as_ref().map_or_else(|| format!("{}", i),
+                                                             |ident| format!("`{}`", ident));
+
+                if field.attrs.skip_serializing() {
+                    cx.error(format!("variant `{}` cannot have both #[serde(serialize_with)] and \
+                                      a field {} marked with #[serde(skip_serializing)]",
+                                     variant.ident, ident));
+                }
+
+                if field.attrs.skip_serializing_if().is_some() {
+                    cx.error(format!("variant `{}` cannot have both #[serde(serialize_with)] and \
+                                      a field {} marked with #[serde(skip_serializing_if)]",
+                                     variant.ident, ident));
+                }
+            }
+        }
+
+        if variant.attrs.deserialize_with().is_some() {
+            if variant.attrs.skip_deserializing() {
+                cx.error(format!("variant `{}` cannot have both #[serde(deserialize_with)] and \
+                                  #[serde(skip_deserializing)]", variant.ident));
+            }
+
+            for (i, field) in variant.fields.iter().enumerate() {
+                if field.attrs.skip_deserializing() {
+                    let ident = field.ident.as_ref().map_or_else(|| format!("{}", i),
+                                                                 |ident| format!("`{}`", ident));
+
+                    cx.error(format!("variant `{}` cannot have both #[serde(deserialize_with)] \
+                                      and a field {} marked with #[serde(skip_deserializing)]",
+                                     variant.ident, ident));
+                }
+            }
+        }
+    }
+}

serde_derive_internals/src/ctxt.rs

@@ -1,3 +1,11 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use std::fmt::Display;
 use std::cell::RefCell;
 
@@ -8,13 +16,15 @@ 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) {
-        self.errors.borrow_mut().as_mut().unwrap().push(msg.to_string());
+        self.errors
+            .borrow_mut()
+            .as_mut()
+            .unwrap()
+            .push(msg.to_string());
     }
 
     pub fn check(self) -> Result<(), String> {

serde_derive_internals/src/lib.rs

@@ -0,0 +1,22 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.16.0")]
+
+extern crate syn;
+#[macro_use]
+extern crate synom;
+
+pub mod ast;
+pub mod attr;
+
+mod ctxt;
+pub use ctxt::Ctxt;
+
+mod case;
+mod check;

serde_test/Cargo.toml

@@ -1,18 +1,22 @@
 [package]
 name = "serde_test"
-version = "0.9.6"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+version = "1.0.13" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@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.9", path = "../serde" }
+serde = { version = "1.0", path = "../serde" }
+
+[dev-dependencies]
+serde = { version = "1.0", path = "../serde", features = ["rc"] }
+serde_derive = { version = "1.0", path = "../serde_derive" }
 
 [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

@@ -1,54 +1,241 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use serde::{Serialize, Deserialize};
 
 use de::Deserializer;
-use error::Error;
 use ser::Serializer;
 use token::Token;
 
 use std::fmt::Debug;
 
-pub fn assert_tokens<T>(value: &T, tokens: &[Token<'static>])
-    where T: Serialize + Deserialize + PartialEq + Debug,
+/// Runs both `assert_ser_tokens` and `assert_de_tokens`.
+///
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde_derive;
+/// #
+/// # extern crate serde;
+/// # extern crate serde_test;
+/// #
+/// # use serde_test::{assert_tokens, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// let s = S { a: 0, b: 0 };
+/// assert_tokens(&s, &[
+///     Token::Struct { name: "S", len: 2 },
+///     Token::Str("a"),
+///     Token::U8(0),
+///     Token::Str("b"),
+///     Token::U8(0),
+///     Token::StructEnd,
+/// ]);
+/// # }
+/// ```
+pub fn assert_tokens<'de, T>(value: &T, tokens: &'de [Token])
+where
+    T: Serialize + Deserialize<'de> + PartialEq + Debug,
 {
     assert_ser_tokens(value, tokens);
     assert_de_tokens(value, tokens);
 }
 
+/// Asserts that `value` serializes to the given `tokens`.
+///
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde_derive;
+/// #
+/// # extern crate serde;
+/// # extern crate serde_test;
+/// #
+/// # use serde_test::{assert_ser_tokens, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// let s = S { a: 0, b: 0 };
+/// assert_ser_tokens(&s, &[
+///     Token::Struct { name: "S", len: 2 },
+///     Token::Str("a"),
+///     Token::U8(0),
+///     Token::Str("b"),
+///     Token::U8(0),
+///     Token::StructEnd,
+/// ]);
+/// # }
+/// ```
 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(()));
-    assert_eq!(ser.next_token(), None);
+    let mut ser = Serializer::new(tokens);
+    match value.serialize(&mut ser) {
+        Ok(_) => {}
+        Err(err) => panic!("value failed to serialize: {}", err),
+    }
+
+    if ser.remaining() > 0 {
+        panic!("{} remaining tokens", ser.remaining());
+    }
 }
 
-/// Expect an error serializing `T`.
-pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: Error)
-    where T: Serialize + PartialEq + Debug,
+/// Asserts that `value` serializes to the given `tokens`, and then yields `error`.
+///
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde_derive;
+/// #
+/// # extern crate serde_test;
+/// #
+/// # fn main() {
+/// use std::sync::{Arc, Mutex};
+/// use std::thread;
+///
+/// use serde_test::{assert_ser_tokens_error, Token};
+///
+/// #[derive(Serialize)]
+/// struct Example {
+///     lock: Arc<Mutex<u32>>,
+/// }
+///
+/// let example = Example { lock: Arc::new(Mutex::new(0)) };
+/// let lock = example.lock.clone();
+///
+/// let _ = thread::spawn(move || {
+///     // This thread will acquire the mutex first, unwrapping the result
+///     // of `lock` because the lock has not been poisoned.
+///     let _guard = lock.lock().unwrap();
+///
+///     // This panic while holding the lock (`_guard` is in scope) will
+///     // poison the mutex.
+///     panic!()
+/// }).join();
+///
+/// let expected = &[
+///     Token::Struct { name: "Example", len: 1 },
+///     Token::Str("lock"),
+/// ];
+/// let error = "lock poison error while serializing";
+/// assert_ser_tokens_error(&example, expected, error);
+/// # }
+/// ```
+pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: &str)
+where
+    T: Serialize,
 {
-    let mut ser = Serializer::new(tokens.iter());
-    let v: Result<(), Error> = Serialize::serialize(value, &mut ser);
-    assert_eq!(v.as_ref(), Err(&error));
-    assert_eq!(ser.next_token(), None);
+    let mut ser = Serializer::new(tokens);
+    match value.serialize(&mut ser) {
+        Ok(_) => panic!("value serialized successfully"),
+        Err(e) => assert_eq!(e, *error),
+    }
+
+    if ser.remaining() > 0 {
+        panic!("{} remaining tokens", ser.remaining());
+    }
 }
 
-pub fn assert_de_tokens<T>(value: &T, tokens: &[Token<'static>])
-    where T: Deserialize + PartialEq + Debug,
+/// Asserts that the given `tokens` deserialize into `value`.
+///
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde_derive;
+/// #
+/// # extern crate serde;
+/// # extern crate serde_test;
+/// #
+/// # use serde_test::{assert_de_tokens, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// let s = S { a: 0, b: 0 };
+/// assert_de_tokens(&s, &[
+///     Token::Struct { name: "S", len: 2 },
+///     Token::Str("a"),
+///     Token::U8(0),
+///     Token::Str("b"),
+///     Token::U8(0),
+///     Token::StructEnd,
+/// ]);
+/// # }
+/// ```
+pub fn assert_de_tokens<'de, T>(value: &T, tokens: &'de [Token])
+where
+    T: Deserialize<'de> + PartialEq + Debug,
 {
-    let mut de = Deserializer::new(tokens.to_vec().into_iter());
-    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
-    assert_eq!(v.as_ref(), Ok(value));
-    assert_eq!(de.next_token(), None);
+    let mut de = Deserializer::new(tokens);
+    match T::deserialize(&mut de) {
+        Ok(v) => assert_eq!(v, *value),
+        Err(e) => panic!("tokens failed to deserialize: {}", e),
+    }
+
+    if de.remaining() > 0 {
+        panic!("{} remaining tokens", de.remaining());
+    }
 }
 
-/// 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,
+/// Asserts that the given `tokens` yield `error` when deserializing.
+///
+/// ```rust
+/// # #[macro_use]
+/// # extern crate serde_derive;
+/// #
+/// # extern crate serde;
+/// # extern crate serde_test;
+/// #
+/// # use serde_test::{assert_de_tokens_error, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// #[serde(deny_unknown_fields)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// assert_de_tokens_error::<S>(
+///     &[
+///         Token::Struct { name: "S", len: 1 },
+///         Token::Str("x"),
+///     ],
+///     "unknown field `x`, expected `a` or `b`",
+/// );
+/// # }
+/// ```
+pub fn assert_de_tokens_error<'de, T>(tokens: &'de [Token], error: &str)
+where
+    T: Deserialize<'de>,
 {
-    let mut de = Deserializer::new(tokens.to_vec().into_iter());
-    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
-    assert_eq!(v, Err(error));
+    let mut de = Deserializer::new(tokens);
+    match T::deserialize(&mut de) {
+        Ok(_) => panic!("tokens deserialized successfully"),
+        Err(e) => assert_eq!(e, *error),
+    }
+
     // There may be one token left if a peek caused the error
-    de.next_token();
-    assert_eq!(de.next_token(), None);
+    de.next_token_opt();
+
+    if de.remaining() > 0 {
+        panic!("{} remaining tokens", de.remaining());
+    }
 }

serde_test/src/error.rs

@@ -1,48 +1,47 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use std::error;
 use std::fmt::{self, Display};
 
 use serde::{ser, de};
 
-use token::Token;
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum Error {
-    Message(String),
-    InvalidName(&'static str),
-    UnexpectedToken(Token<'static>),
-    EndOfTokens,
+#[derive(Clone, Debug)]
+pub struct Error {
+    msg: String,
 }
 
 impl ser::Error for Error {
     fn custom<T: Display>(msg: T) -> Error {
-        Error::Message(msg.to_string())
+        Error { msg: msg.to_string() }
     }
 }
 
 impl de::Error for Error {
     fn custom<T: Display>(msg: T) -> Error {
-        Error::Message(msg.to_string())
+        Error { msg: msg.to_string() }
     }
 }
 
 impl fmt::Display for Error {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Error::Message(ref msg) => formatter.write_str(msg),
-            Error::InvalidName(name) => write!(formatter, "invalid name `{}`", name),
-            Error::UnexpectedToken(_) => formatter.write_str("unexpected token"),
-            Error::EndOfTokens => formatter.write_str("end of tokens"),
-        }
+        formatter.write_str(&self.msg)
     }
 }
 
 impl error::Error for Error {
     fn description(&self) -> &str {
-        match *self {
-            Error::Message(ref msg) => msg,
-            Error::InvalidName(_) => "invalid name",
-            Error::UnexpectedToken(_) => "unexpected token",
-            Error::EndOfTokens => "end of tokens",
-        }
+        &self.msg
+    }
+}
+
+impl PartialEq<str> for Error {
+    fn eq(&self, other: &str) -> bool {
+        self.msg == other
     }
 }

serde_test/src/lib.rs

@@ -1,23 +1,176 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! This crate provides a convenient concise way to write unit tests for
+//! implementations of [`Serialize`] and [`Deserialize`].
+//!
+//! [`Serialize`]: https://docs.serde.rs/serde/ser/trait.Serialize.html
+//! [`Deserialize`]: https://docs.serde.rs/serde/de/trait.Deserialize.html
+//!
+//! The `Serialize` impl for a value can be characterized by the sequence of
+//! [`Serializer`] calls that are made in the course of serializing the value,
+//! so `serde_test` provides a [`Token`] abstraction which corresponds roughly
+//! to `Serializer` method calls. There is an [`assert_ser_tokens`] function to
+//! test that a value serializes to a particular sequence of method calls, an
+//! [`assert_de_tokens`] function to test that a value can be deserialized from
+//! a particular sequence of method calls, and an [`assert_tokens`] function to
+//! test both directions. There are also functions to test expected failure
+//! conditions.
+//!
+//! [`Serializer`]: https://docs.serde.rs/serde/ser/trait.Serializer.html
+//! [`Token`]: https://docs.serde.rs/serde_test/enum.Token.html
+//! [`assert_ser_tokens`]: https://docs.serde.rs/serde_test/fn.assert_ser_tokens.html
+//! [`assert_de_tokens`]: https://docs.serde.rs/serde_test/fn.assert_de_tokens.html
+//! [`assert_tokens`]: https://docs.serde.rs/serde_test/fn.assert_tokens.html
+//!
+//! Here is an example from the [`linked-hash-map`] crate.
+//!
+//! [`linked-hash-map`]: https://github.com/contain-rs/linked-hash-map
+//!
+//! ```rust
+//! # extern crate serde;
+//! #
+//! # macro_rules! ignore {
+//! #     ($($tt:tt)+) => {}
+//! # }
+//! #
+//! # ignore! {
+//! extern crate linked_hash_map;
+//! use linked_hash_map::LinkedHashMap;
+//! # }
+//!
+//! extern crate serde_test;
+//! use serde_test::{Token, assert_tokens};
+//!
+//! # use std::fmt;
+//! # use std::marker::PhantomData;
+//! #
+//! # use serde::ser::{Serialize, Serializer, SerializeMap};
+//! # use serde::de::{Deserialize, Deserializer, Visitor, MapAccess};
+//! #
+//! # // Dumb immitation of LinkedHashMap.
+//! # #[derive(PartialEq, Debug)]
+//! # struct LinkedHashMap<K, V>(Vec<(K, V)>);
+//! #
+//! # impl<K, V> LinkedHashMap<K, V> {
+//! #     fn new() -> Self {
+//! #         LinkedHashMap(Vec::new())
+//! #     }
+//! #
+//! #     fn insert(&mut self, k: K, v: V) {
+//! #         self.0.push((k, v));
+//! #     }
+//! # }
+//! #
+//! # impl<K, V> Serialize for LinkedHashMap<K, V>
+//! #     where K: Serialize,
+//! #           V: Serialize
+//! # {
+//! #     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+//! #         where S: Serializer
+//! #     {
+//! #         let mut map = serializer.serialize_map(Some(self.0.len()))?;
+//! #         for &(ref k, ref v) in &self.0 {
+//! #             map.serialize_entry(k, v)?;
+//! #         }
+//! #         map.end()
+//! #     }
+//! # }
+//! #
+//! # struct LinkedHashMapVisitor<K, V>(PhantomData<(K, V)>);
+//! #
+//! # impl<'de, K, V> Visitor<'de> for LinkedHashMapVisitor<K, V>
+//! #     where K: Deserialize<'de>,
+//! #           V: Deserialize<'de>
+//! # {
+//! #     type Value = LinkedHashMap<K, V>;
+//! #
+//! #     fn expecting(&self, _: &mut fmt::Formatter) -> fmt::Result {
+//! #         unimplemented!()
+//! #     }
+//! #
+//! #     fn visit_map<M>(self, mut access: M) -> Result<Self::Value, M::Error>
+//! #         where M: MapAccess<'de>
+//! #     {
+//! #         let mut map = LinkedHashMap::new();
+//! #         while let Some((key, value)) = access.next_entry()? {
+//! #             map.insert(key, value);
+//! #         }
+//! #         Ok(map)
+//! #     }
+//! # }
+//! #
+//! # impl<'de, K, V> Deserialize<'de> for LinkedHashMap<K, V>
+//! #     where K: Deserialize<'de>,
+//! #           V: Deserialize<'de>
+//! # {
+//! #     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+//! #         where D: Deserializer<'de>
+//! #     {
+//! #         deserializer.deserialize_map(LinkedHashMapVisitor(PhantomData))
+//! #     }
+//! # }
+//! #
+//! #[test]
+//! # fn not_a_test_ser_de_empty() {}
+//! fn test_ser_de_empty() {
+//!     let map = LinkedHashMap::<char, u32>::new();
+//!
+//!     assert_tokens(&map, &[
+//!         Token::Map { len: Some(0) },
+//!         Token::MapEnd,
+//!     ]);
+//! }
+//!
+//! #[test]
+//! # fn not_a_test_ser_de() {}
+//! fn test_ser_de() {
+//!     let mut map = LinkedHashMap::new();
+//!     map.insert('b', 20);
+//!     map.insert('a', 10);
+//!     map.insert('c', 30);
+//!
+//!     assert_tokens(&map, &[
+//!         Token::Map { len: Some(3) },
+//!         Token::Char('b'),
+//!         Token::I32(20),
+//!
+//!         Token::Char('a'),
+//!         Token::I32(10),
+//!
+//!         Token::Char('c'),
+//!         Token::I32(30),
+//!         Token::MapEnd,
+//!     ]);
+//! }
+//! #
+//! # fn main() {
+//! #     test_ser_de_empty();
+//! #     test_ser_de();
+//! # }
+//! ```
+
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.13")]
+
 #[macro_use]
 extern crate serde;
 
-mod assert;
-pub use assert::{
-    assert_tokens,
-    assert_ser_tokens,
-    assert_ser_tokens_error,
-    assert_de_tokens,
-    assert_de_tokens_error,
-};
-
 mod ser;
-pub use ser::Serializer;
-
 mod de;
-pub use de::Deserializer;
+mod error;
 
 mod token;
-pub use token::Token;
+mod assert;
 
-mod error;
-pub use error::Error;
+pub use token::Token;
+pub use assert::{assert_tokens, assert_ser_tokens, assert_ser_tokens_error, assert_de_tokens,
+                 assert_de_tokens_error};
+
+// Not public API.
+#[doc(hidden)]
+pub use de::Deserializer;

serde_test/src/ser.rs

@@ -1,346 +1,434 @@
-use std::marker::PhantomData;
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
 
 use serde::{ser, Serialize};
 
 use error::Error;
 use token::Token;
 
-pub struct Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
-    tokens: I,
-    phantom: PhantomData<&'a Token<'a>>,
+/// A `Serializer` that ensures that a value serializes to a given list of tokens.
+#[derive(Debug)]
+pub struct Serializer<'a> {
+    tokens: &'a [Token],
 }
 
-impl<'a, I> Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
-    pub fn new(tokens: I) -> Serializer<'a, I> {
-        Serializer {
-            tokens: tokens,
-            phantom: PhantomData,
+impl<'a> Serializer<'a> {
+    /// Creates the serializer.
+    pub fn new(tokens: &'a [Token]) -> Self {
+        Serializer { tokens: tokens }
+    }
+
+    /// Pulls the next token off of the serializer, ignoring it.
+    fn next_token(&mut self) -> Option<Token> {
+        if let Some((&first, rest)) = self.tokens.split_first() {
+            self.tokens = rest;
+            Some(first)
+        } else {
+            None
         }
     }
 
-    pub fn next_token(&mut self) -> Option<&'a Token<'a>> {
-        self.tokens.next()
+    pub fn remaining(&self) -> usize {
+        self.tokens.len()
     }
 }
 
-impl<'s, 'a, I> ser::Serializer for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+macro_rules! assert_next_token {
+    ($ser:expr, $expected:ident) => {
+        assert_next_token!($ser, $expected, Token::$expected, true);
+    };
+    ($ser:expr, $expected:ident($v:expr)) => {
+        assert_next_token!($ser, $expected, Token::$expected(v), v == $v);
+    };
+    ($ser:expr, $expected:ident { $($k:ident),* }) => {
+        let compare = ($($k,)*);
+        assert_next_token!($ser, $expected, Token::$expected { $($k),* }, ($($k,)*) == compare);
+    };
+    ($ser:expr, $expected:ident, $pat:pat, $guard:expr) => {
+        match $ser.next_token() {
+            Some($pat) if $guard => {}
+            Some(other) => {
+                panic!("expected Token::{} but serialized as {}",
+                       stringify!($expected), other);
+            }
+            None => {
+                panic!("expected Token::{} after end of serialized tokens",
+                       stringify!($expected));
+            }
+        }
+    };
+}
+
+impl<'s, 'a> ser::Serializer for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     type SerializeSeq = Self;
     type SerializeTuple = Self;
     type SerializeTupleStruct = Self;
-    type SerializeTupleVariant = Self;
+    type SerializeTupleVariant = Variant<'s, 'a>;
     type SerializeMap = Self;
     type SerializeStruct = Self;
-    type SerializeStructVariant = Self;
+    type SerializeStructVariant = Variant<'s, 'a>;
 
     fn serialize_bool(self, v: bool) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Bool(v)));
+        assert_next_token!(self, Bool(v));
         Ok(())
     }
 
     fn serialize_i8(self, v: i8) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I8(v)));
+        assert_next_token!(self, I8(v));
         Ok(())
     }
 
     fn serialize_i16(self, v: i16) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I16(v)));
+        assert_next_token!(self, I16(v));
         Ok(())
     }
 
     fn serialize_i32(self, v: i32) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I32(v)));
+        assert_next_token!(self, I32(v));
         Ok(())
     }
 
     fn serialize_i64(self, v: i64) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I64(v)));
+        assert_next_token!(self, I64(v));
         Ok(())
     }
 
     fn serialize_u8(self, v: u8) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U8(v)));
+        assert_next_token!(self, U8(v));
         Ok(())
     }
 
     fn serialize_u16(self, v: u16) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U16(v)));
+        assert_next_token!(self, U16(v));
         Ok(())
     }
 
     fn serialize_u32(self, v: u32) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U32(v)));
+        assert_next_token!(self, U32(v));
         Ok(())
     }
 
     fn serialize_u64(self, v: u64) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U64(v)));
+        assert_next_token!(self, U64(v));
         Ok(())
     }
 
     fn serialize_f32(self, v: f32) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::F32(v)));
+        assert_next_token!(self, F32(v));
         Ok(())
     }
 
     fn serialize_f64(self, v: f64) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::F64(v)));
+        assert_next_token!(self, F64(v));
         Ok(())
     }
 
     fn serialize_char(self, v: char) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Char(v)));
+        assert_next_token!(self, Char(v));
         Ok(())
     }
 
     fn serialize_str(self, v: &str) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Str(v)));
+        match self.tokens.first() {
+            Some(&Token::BorrowedStr(_)) => assert_next_token!(self, BorrowedStr(v)),
+            Some(&Token::String(_)) => assert_next_token!(self, String(v)),
+            _ => assert_next_token!(self, Str(v)),
+        }
         Ok(())
     }
 
-    fn serialize_bytes(self, value: &[u8]) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Bytes(value)));
+    fn serialize_bytes(self, v: &[u8]) -> Result<(), Self::Error> {
+        match self.tokens.first() {
+            Some(&Token::BorrowedBytes(_)) => assert_next_token!(self, BorrowedBytes(v)),
+            Some(&Token::ByteBuf(_)) => assert_next_token!(self, ByteBuf(v)),
+            _ => assert_next_token!(self, Bytes(v)),
+        }
         Ok(())
     }
 
     fn serialize_unit(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Unit));
+        assert_next_token!(self, Unit);
         Ok(())
     }
 
-    fn serialize_unit_struct(self, name: &str) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::UnitStruct(name)));
+    fn serialize_unit_struct(self, name: &'static str) -> Result<(), Error> {
+        assert_next_token!(self, 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)));
+    fn serialize_unit_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+    ) -> Result<(), Error> {
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+            assert_next_token!(self, Unit);
+        } else {
+            assert_next_token!(self, UnitVariant { name, variant });
+        }
         Ok(())
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(self,
-                                           name: &'static str,
-                                           value: &T) -> Result<(), Error>
-        where T: Serialize,
+    fn serialize_newtype_struct<T: ?Sized>(self, name: &'static str, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::StructNewType(name)));
+        assert_next_token!(self, NewtypeStruct { name });
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(self,
-                                            name: &str,
-                                            _variant_index: usize,
-                                            variant: &str,
-                                            value: &T) -> Result<(), Error>
-        where T: Serialize,
+    fn serialize_newtype_variant<T: ?Sized>(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        value: &T,
+    ) -> Result<(), Error>
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumNewType(name, variant)));
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+        } else {
+            assert_next_token!(self, NewtypeVariant { name, variant });
+        }
         value.serialize(self)
     }
 
     fn serialize_none(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Option(false)));
+        assert_next_token!(self, None);
         Ok(())
     }
 
     fn serialize_some<T: ?Sized>(self, value: &T) -> Result<(), Error>
-        where T: Serialize,
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::Option(true)));
+        assert_next_token!(self, Some);
         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)));
+        assert_next_token!(self, Seq { len });
         Ok(self)
     }
 
     fn serialize_tuple(self, len: usize) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleStart(len)));
+        assert_next_token!(self, Tuple { 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)));
+        assert_next_token!(self, TupleStruct { name, len });
         Ok(self)
     }
 
-    fn serialize_tuple_variant(self,
-                               name: &str,
-                               _variant_index: usize,
-                               variant: &str,
-                               len: usize) -> Result<Self, Error>
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqStart(name, variant, len)));
-        Ok(self)
+    fn serialize_tuple_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeTupleVariant, Error> {
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+            let len = Some(len);
+            assert_next_token!(self, Seq { len });
+            Ok(Variant { ser: self, end: Token::SeqEnd })
+        } else {
+            assert_next_token!(self, TupleVariant { name, variant, len });
+            Ok(Variant { ser: self, end: Token::TupleVariantEnd })
+        }
     }
 
     fn serialize_map(self, len: Option<usize>) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::MapStart(len)));
+        assert_next_token!(self, Map { len });
         Ok(self)
     }
 
-    fn serialize_struct(self, name: &str, len: usize) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::StructStart(name, len)));
+    fn serialize_struct(self, name: &'static str, len: usize) -> Result<Self, Error> {
+        assert_next_token!(self, Struct { name, len });
         Ok(self)
     }
 
-    fn serialize_struct_variant(self,
-                                name: &str,
-                                _variant_index: usize,
-                                variant: &str,
-                                len: usize) -> Result<Self, Error>
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumMapStart(name, variant, len)));
-        Ok(self)
+    fn serialize_struct_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeStructVariant, Error> {
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+            let len = Some(len);
+            assert_next_token!(self, Map { len });
+            Ok(Variant { ser: self, end: Token::MapEnd })
+        } else {
+            assert_next_token!(self, StructVariant { name, variant, len });
+            Ok(Variant { ser: self, end: Token::StructVariantEnd })
+        }
     }
 }
 
-impl<'s, 'a, I> ser::SerializeSeq for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+pub struct Variant<'s, 'a: 's> {
+    ser: &'s mut Serializer<'a>,
+    end: Token,
+}
+
+impl<'s, 'a> ser::SerializeSeq for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    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));
+        assert_next_token!(self, SeqEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeTuple for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeTuple for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleSep));
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleEnd));
+        assert_next_token!(self, TupleEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeTupleStruct for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeTupleStruct for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    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));
+        assert_next_token!(self, TupleStructEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeTupleVariant for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeTupleVariant for Variant<'s, 'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqSep));
-        value.serialize(&mut **self)
+        value.serialize(&mut *self.ser)
     }
 
     fn end(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqEnd));
+        match self.end {
+            Token::TupleVariantEnd => assert_next_token!(self.ser, TupleVariantEnd),
+            Token::SeqEnd => assert_next_token!(self.ser, SeqEnd),
+            _ => unreachable!(),
+        }
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeMap for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeMap for &'s mut Serializer<'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));
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
         key.serialize(&mut **self)
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error> where T: Serialize {
+    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));
+        assert_next_token!(self, MapEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeStruct for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeStruct for &'s mut Serializer<'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));
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
         try!(key.serialize(&mut **self));
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::StructEnd));
+        assert_next_token!(self, StructEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeStructVariant for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeStructVariant for Variant<'s, '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 serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        try!(key.serialize(&mut *self.ser));
+        value.serialize(&mut *self.ser)
     }
 
     fn end(self) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumMapEnd));
+        match self.end {
+            Token::StructVariantEnd => assert_next_token!(self.ser, StructVariantEnd),
+            Token::MapEnd => assert_next_token!(self.ser, MapEnd),
+            _ => unreachable!(),
+        }
         Ok(())
     }
 }

serde_test/src/token.rs

@@ -1,59 +1,558 @@
-#[derive(Clone, PartialEq, Debug)]
-pub enum Token<'a> {
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::fmt::{self, Debug, Display};
+
+#[derive(Copy, Clone, PartialEq, Debug)]
+pub enum Token {
+    /// A serialized `bool`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&true, &[Token::Bool(true)]);
+    /// ```
     Bool(bool),
+
+    /// A serialized `i8`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0i8, &[Token::I8(0)]);
+    /// ```
     I8(i8),
+
+    /// A serialized `i16`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0i16, &[Token::I16(0)]);
+    /// ```
     I16(i16),
+
+    /// A serialized `i32`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0i32, &[Token::I32(0)]);
+    /// ```
     I32(i32),
+
+    /// A serialized `i64`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0i64, &[Token::I64(0)]);
+    /// ```
     I64(i64),
+
+    /// A serialized `u8`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0u8, &[Token::U8(0)]);
+    /// ```
     U8(u8),
+
+    /// A serialized `u16`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0u16, &[Token::U16(0)]);
+    /// ```
     U16(u16),
+
+    /// A serialized `u32`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0u32, &[Token::U32(0)]);
+    /// ```
     U32(u32),
+
+    /// A serialized `u64`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0u64, &[Token::U64(0)]);
+    /// ```
     U64(u64),
+
+    /// A serialized `f32`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0f32, &[Token::F32(0.0)]);
+    /// ```
     F32(f32),
+
+    /// A serialized `f64`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&0f64, &[Token::F64(0.0)]);
+    /// ```
     F64(f64),
+
+    /// A serialized `char`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&'\n', &[Token::Char('\n')]);
+    /// ```
     Char(char),
-    Str(&'a str),
-    String(String),
-    Bytes(&'a [u8]),
-    ByteBuf(Vec<u8>),
 
-    Option(bool),
+    /// A serialized `str`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let s = String::from("transient");
+    /// assert_tokens(&s, &[Token::Str("transient")]);
+    /// ```
+    Str(&'static str),
 
+    /// A borrowed `str`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let s: &str = "borrowed";
+    /// assert_tokens(&s, &[Token::BorrowedStr("borrowed")]);
+    /// ```
+    BorrowedStr(&'static str),
+
+    /// A serialized `String`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let s = String::from("owned");
+    /// assert_tokens(&s, &[Token::String("owned")]);
+    /// ```
+    String(&'static str),
+
+    /// A serialized `[u8]`
+    Bytes(&'static [u8]),
+
+    /// A borrowed `[u8]`.
+    BorrowedBytes(&'static [u8]),
+
+    /// A serialized `ByteBuf`
+    ByteBuf(&'static [u8]),
+
+    /// A serialized `Option<T>` containing none.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let opt = None::<char>;
+    /// assert_tokens(&opt, &[Token::None]);
+    /// ```
+    None,
+
+    /// The header to a serialized `Option<T>` containing some value.
+    ///
+    /// The tokens of the value follow after this header.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let opt = Some('c');
+    /// assert_tokens(&opt, &[
+    ///     Token::Some,
+    ///     Token::Char('c'),
+    /// ]);
+    /// ```
+    Some,
+
+    /// A serialized `()`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// assert_tokens(&(), &[Token::Unit]);
+    /// ```
     Unit,
-    UnitStruct(&'a str),
 
-    StructNewType(&'a str),
+    /// A serialized unit struct of the given name.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// struct X;
+    ///
+    /// assert_tokens(&X, &[Token::UnitStruct { name: "X" }]);
+    /// # }
+    /// ```
+    UnitStruct { name: &'static str },
 
-    EnumStart(&'a str),
-    EnumUnit(&'a str, &'a str),
-    EnumNewType(&'a str, &'a str),
+    /// A unit variant of an enum.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// enum E {
+    ///     A,
+    /// }
+    ///
+    /// let a = E::A;
+    /// assert_tokens(&a, &[Token::UnitVariant { name: "E", variant: "A" }]);
+    /// # }
+    /// ```
+    UnitVariant { name: &'static str, variant: &'static str },
 
-    SeqStart(Option<usize>),
-    SeqArrayStart(usize),
-    SeqSep,
+    /// The header to a serialized newtype struct of the given name.
+    ///
+    /// After this header is the value contained in the newtype struct.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// struct N(String);
+    ///
+    /// let n = N("newtype".to_owned());
+    /// assert_tokens(&n, &[
+    ///     Token::NewtypeStruct { name: "N" },
+    ///     Token::String("newtype"),
+    /// ]);
+    /// # }
+    /// ```
+    NewtypeStruct { name: &'static str },
+
+    /// The header to a newtype variant of an enum.
+    ///
+    /// After this header is the value contained in the newtype variant.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// enum E {
+    ///     B(u8),
+    /// }
+    ///
+    /// let b = E::B(0);
+    /// assert_tokens(&b, &[
+    ///     Token::NewtypeVariant { name: "E", variant: "B" },
+    ///     Token::U8(0),
+    /// ]);
+    /// # }
+    /// ```
+    NewtypeVariant { name: &'static str, variant: &'static str },
+
+    /// The header to a sequence.
+    ///
+    /// After this header are the elements of the sequence, followed by
+    /// `SeqEnd`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let vec = vec!['a', 'b', 'c'];
+    /// assert_tokens(&vec, &[
+    ///     Token::Seq { len: Some(3) },
+    ///     Token::Char('a'),
+    ///     Token::Char('b'),
+    ///     Token::Char('c'),
+    ///     Token::SeqEnd,
+    /// ]);
+    /// ```
+    Seq { len: Option<usize> },
+
+    /// An indicator of the end of a sequence.
     SeqEnd,
 
-    TupleStart(usize),
-    TupleSep,
+    /// The header to a tuple.
+    ///
+    /// After this header are the elements of the tuple, followed by `TupleEnd`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// let tuple = ('a', 100);
+    /// assert_tokens(&tuple, &[
+    ///     Token::Tuple { len: 2 },
+    ///     Token::Char('a'),
+    ///     Token::I32(100),
+    ///     Token::TupleEnd,
+    /// ]);
+    /// ```
+    Tuple { len: usize },
+
+    /// An indicator of the end of a tuple.
     TupleEnd,
 
-    TupleStructStart(&'a str, usize),
-    TupleStructSep,
+    /// The header to a tuple struct.
+    ///
+    /// After this header are the fields of the tuple struct, followed by
+    /// `TupleStructEnd`.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// struct T(u8, u8);
+    ///
+    /// let t = T(0, 0);
+    /// assert_tokens(&t, &[
+    ///     Token::TupleStruct { name: "T", len: 2 },
+    ///     Token::U8(0),
+    ///     Token::U8(0),
+    ///     Token::TupleStructEnd,
+    /// ]);
+    /// # }
+    /// ```
+    TupleStruct { name: &'static str, len: usize },
+
+    /// An indicator of the end of a tuple struct.
     TupleStructEnd,
 
-    MapStart(Option<usize>),
-    MapSep,
+    /// The header to a tuple variant of an enum.
+    ///
+    /// After this header are the fields of the tuple variant, followed by
+    /// `TupleVariantEnd`.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// enum E {
+    ///     C(u8, u8),
+    /// }
+    ///
+    /// let c = E::C(0, 0);
+    /// assert_tokens(&c, &[
+    ///     Token::TupleVariant { name: "E", variant: "C", len: 2 },
+    ///     Token::U8(0),
+    ///     Token::U8(0),
+    ///     Token::TupleVariantEnd,
+    /// ]);
+    /// # }
+    /// ```
+    TupleVariant { name: &'static str, variant: &'static str, len: usize },
+
+    /// An indicator of the end of a tuple variant.
+    TupleVariantEnd,
+
+    /// The header to a map.
+    ///
+    /// After this header are the entries of the map, followed by `MapEnd`.
+    ///
+    /// ```rust
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// use std::collections::BTreeMap;
+    ///
+    /// let mut map = BTreeMap::new();
+    /// map.insert('A', 65);
+    /// map.insert('Z', 90);
+    ///
+    /// assert_tokens(&map, &[
+    ///     Token::Map { len: Some(2) },
+    ///     Token::Char('A'),
+    ///     Token::I32(65),
+    ///     Token::Char('Z'),
+    ///     Token::I32(90),
+    ///     Token::MapEnd,
+    /// ]);
+    /// ```
+    Map { len: Option<usize> },
+
+    /// An indicator of the end of a map.
     MapEnd,
 
-    StructStart(&'a str, usize),
-    StructSep,
+    /// The header of a struct.
+    ///
+    /// After this header are the fields of the struct, followed by `StructEnd`.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// struct S {
+    ///     a: u8,
+    ///     b: u8,
+    /// }
+    ///
+    /// let s = S { a: 0, b: 0 };
+    /// assert_tokens(&s, &[
+    ///     Token::Struct { name: "S", len: 2 },
+    ///     Token::Str("a"),
+    ///     Token::U8(0),
+    ///     Token::Str("b"),
+    ///     Token::U8(0),
+    ///     Token::StructEnd,
+    /// ]);
+    /// # }
+    /// ```
+    Struct { name: &'static str, len: usize },
+
+    /// An indicator of the end of a struct.
     StructEnd,
 
-    EnumSeqStart(&'a str, &'a str, usize),
-    EnumSeqSep,
-    EnumSeqEnd,
+    /// The header of a struct variant of an enum.
+    ///
+    /// After this header are the fields of the struct variant, followed by
+    /// `StructVariantEnd`.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// enum E {
+    ///     D { d: u8 },
+    /// }
+    ///
+    /// let d = E::D { d: 0 };
+    /// assert_tokens(&d, &[
+    ///     Token::StructVariant { name: "E", variant: "D", len: 1 },
+    ///     Token::Str("d"),
+    ///     Token::U8(0),
+    ///     Token::StructVariantEnd,
+    /// ]);
+    /// # }
+    /// ```
+    StructVariant { name: &'static str, variant: &'static str, len: usize },
 
-    EnumMapStart(&'a str, &'a str, usize),
-    EnumMapSep,
-    EnumMapEnd,
+    /// An indicator of the end of a struct variant.
+    StructVariantEnd,
+
+    /// The header to an enum of the given name.
+    ///
+    /// ```rust
+    /// # #[macro_use]
+    /// # extern crate serde_derive;
+    /// #
+    /// # extern crate serde;
+    /// # extern crate serde_test;
+    /// #
+    /// # use serde_test::{assert_tokens, Token};
+    /// #
+    /// # fn main() {
+    /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    /// enum E {
+    ///     A,
+    ///     B(u8),
+    ///     C(u8, u8),
+    ///     D { d: u8 },
+    /// }
+    ///
+    /// let a = E::A;
+    /// assert_tokens(&a, &[
+    ///     Token::Enum { name: "E" },
+    ///     Token::Str("A"),
+    ///     Token::Unit,
+    /// ]);
+    ///
+    /// let b = E::B(0);
+    /// assert_tokens(&b, &[
+    ///     Token::Enum { name: "E" },
+    ///     Token::Str("B"),
+    ///     Token::U8(0),
+    /// ]);
+    ///
+    /// let c = E::C(0, 0);
+    /// assert_tokens(&c, &[
+    ///     Token::Enum { name: "E" },
+    ///     Token::Str("C"),
+    ///     Token::Seq { len: Some(2) },
+    ///     Token::U8(0),
+    ///     Token::U8(0),
+    ///     Token::SeqEnd,
+    /// ]);
+    ///
+    /// let d = E::D { d: 0 };
+    /// assert_tokens(&d, &[
+    ///     Token::Enum { name: "E" },
+    ///     Token::Str("D"),
+    ///     Token::Map { len: Some(1) },
+    ///     Token::Str("d"),
+    ///     Token::U8(0),
+    ///     Token::MapEnd,
+    /// ]);
+    /// # }
+    /// ```
+    Enum { name: &'static str },
+}
+
+impl Display for Token {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        Debug::fmt(self, formatter)
+    }
 }

test_suite/Cargo.toml

@@ -1,32 +1,18 @@
 [package]
 name = "serde_test_suite"
 version = "0.0.0"
-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"]
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 publish = false
 
 [features]
-unstable-testing = [
-    "compiletest_rs",
-    "serde/unstable-testing",
-]
+unstable = ["serde/unstable", "compiletest_rs"]
 
 [dev-dependencies]
 fnv = "1.0"
 rustc-serialize = "0.3.16"
-serde = { path = "../serde" }
+serde = { path = "../serde", features = ["rc"] }
 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/no_std/Cargo.toml

@@ -4,5 +4,8 @@ version = "0.0.0"
 publish = false
 
 [dependencies]
+libc = { version = "0.2", default-features = false }
 serde = { path = "../../serde", default-features = false }
 serde_derive = { path = "../../serde_derive" }
+
+[workspace]

test_suite/no_std/src/main.rs

@@ -1,7 +1,8 @@
-#![feature(lang_items, start, libc)]
+#![feature(lang_items, start, compiler_builtins_lib)]
 #![no_std]
 
 extern crate libc;
+extern crate compiler_builtins;
 
 #[start]
 fn start(_argc: isize, _argv: *const *const u8) -> isize {

test_suite/tests/compile-fail/borrow/bad_lifetimes.rs

@@ -0,0 +1,18 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+struct Test<'a> {
+    #[serde(borrow = "zzz")] //~^^ HELP: failed to parse borrowed lifetimes: "zzz"
+    s: &'a str,
+}
+
+fn main() {}

test_suite/tests/compile-fail/borrow/duplicate_lifetime.rs

@@ -0,0 +1,18 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+struct Test<'a> {
+    #[serde(borrow = "'a + 'a")] //~^^ HELP: duplicate borrowed lifetime `'a`
+    s: &'a str,
+}
+
+fn main() {}

test_suite/tests/compile-fail/borrow/empty_lifetimes.rs

@@ -0,0 +1,18 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+struct Test<'a> {
+    #[serde(borrow = "")] //~^^ HELP: at least one lifetime must be borrowed
+    s: &'a str,
+}
+
+fn main() {}

test_suite/tests/compile-fail/borrow/no_lifetimes.rs

@@ -0,0 +1,18 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+struct Test {
+    #[serde(borrow)] //~^^ HELP: field `s` has no lifetimes to borrow
+    s: String,
+}
+
+fn main() {}

test_suite/tests/compile-fail/borrow/wrong_lifetime.rs

@@ -0,0 +1,18 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+struct Test<'a> {
+    #[serde(borrow = "'b")] //~^^ HELP: field `s` does not have lifetime 'b
+    s: &'a str,
+}
+
+fn main() {}

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

@@ -0,0 +1,16 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[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,16 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[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,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[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,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[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,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[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,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[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,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[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,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[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,18 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[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

@@ -1,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(tag = "type")] //~^ HELP: #[serde(tag = "...")] cannot be used with tuple variants
 enum E {
     Tuple(u8, u8),

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

@@ -1,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(tag = "type")] //~^ HELP: #[serde(tag = "...")] can only be used on enums
 struct S;
 

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

@@ -1,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(untagged)]
 #[serde(tag = "type")] //~^^ HELP: enum cannot be both untagged and internally tagged
 enum E {

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

@@ -1,7 +1,15 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[macro_use]
 extern crate serde_derive;
 
-#[derive(Serialize)] //~ ERROR: custom derive attribute panicked
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
 #[serde(untagged)] //~^ HELP: #[serde(untagged)] can only be used on enums
 struct S;
 

test_suite/tests/compile-fail/identifier/both.rs

@@ -0,0 +1,19 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier, variant_identifier)] //~^ HELP: `field_identifier` and `variant_identifier` cannot both be set
+enum F {
+    A,
+    B,
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/field_struct.rs

@@ -0,0 +1,16 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier)]
+struct S; //~^^ HELP: `field_identifier` can only be used on an enum
+
+fn main() {}

test_suite/tests/compile-fail/identifier/field_tuple.rs

@@ -0,0 +1,19 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier)]
+enum F {
+    A,
+    B(u8, u8), //~^^^^ HELP: field_identifier may only contain unit variants
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/newtype_not_last.rs

@@ -0,0 +1,20 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier)]
+enum F {
+    A,
+    Other(String), //~^^^^ HELP: `Other` must be the last variant
+    B,
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/not_identifier.rs

@@ -0,0 +1,19 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+enum F {
+    A,
+    #[serde(other)] //~^^^ HELP: #[serde(other)] may only be used inside a field_identifier
+    B,
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/not_unit.rs

@@ -0,0 +1,20 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier)]
+enum F {
+    A,
+    #[serde(other)] //~^^^^ HELP: #[serde(other)] must be on a unit variant
+    Other(u8, u8),
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/other_not_last.rs

@@ -0,0 +1,21 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier)]
+enum F {
+    A,
+    #[serde(other)] //~^^^^ HELP: #[serde(other)] must be the last variant
+    Other,
+    B,
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/serialize.rs

@@ -0,0 +1,19 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(field_identifier)] //~^ HELP: field identifiers cannot be serialized
+enum F {
+    A,
+    B,
+}
+
+fn main() {}

test_suite/tests/compile-fail/identifier/variant_struct.rs

@@ -0,0 +1,16 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(variant_identifier)]
+struct S; //~^^ HELP: `variant_identifier` can only be used on an enum
+
+fn main() {}

test_suite/tests/compile-fail/identifier/variant_tuple.rs

@@ -0,0 +1,19 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Deserialize)] //~ ERROR: proc-macro derive panicked
+#[serde(variant_identifier)]
+enum F {
+    A,
+    B(u8, u8), //~^^^^ HELP: variant_identifier may only contain unit variants
+}
+
+fn main() {}

test_suite/tests/compile-fail/remote/bad_getter.rs

@@ -0,0 +1,25 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+mod remote {
+    pub struct S {
+        a: u8,
+    }
+}
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(remote = "remote::S")]
+struct S {
+    #[serde(getter = "~~~")] //~^^^ HELP: failed to parse path: "~~~"
+    a: u8,
+}
+
+fn main() {}

test_suite/tests/compile-fail/remote/bad_remote.rs

@@ -0,0 +1,24 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+mod remote {
+    pub struct S {
+        a: u8,
+    }
+}
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(remote = "~~~")] //~^ HELP: failed to parse path: "~~~"
+struct S {
+    a: u8,
+}
+
+fn main() {}

test_suite/tests/compile-fail/remote/enum_getter.rs

@@ -0,0 +1,27 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+mod remote {
+    pub enum E {
+        A { a: u8 }
+    }
+}
+
+#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
+#[serde(remote = "remote::E")]
+pub enum E {
+    A {
+        #[serde(getter = "get_a")] //~^^^^ HELP: #[serde(getter = "...")] is not allowed in an enum
+        a: u8,
+    }
+}
+
+fn main() {}

test_suite/tests/compile-fail/remote/missing_field.rs

@@ -0,0 +1,25 @@
+// Copyright 2017 Serde Developers
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[macro_use]
+extern crate serde_derive;
+
+mod remote {
+    pub struct S {
+        pub a: u8,
+        pub b: u8,
+    }
+}
+
+#[derive(Serialize, Deserialize)] //~ ERROR: missing field `b` in initializer of `remote::S`
+#[serde(remote = "remote::S")]
+struct S {
+    a: u8, //~^^^ ERROR: missing field `b` in initializer of `remote::S`
+}
+
+fn main() {}