also publish build.rs

use a thread in the build script of serde_codegen to allow env vars to control the stack size

.cargo/config

@@ -1,7 +0,0 @@
-paths = [
-  "serde",
-  "serde_codegen",
-  "serde_codegen_internals",
-  "serde_macros",
-  "serde_test",
-]

.travis.yml

@@ -18,18 +18,18 @@ before_script:
 script:
 - (cd serde && travis-cargo build)
 - (cd serde && travis-cargo --skip nightly test)
-- (cd serde && travis-cargo --only nightly test -- --features nightly-testing)
+- (cd serde && travis-cargo --only nightly test -- --features unstable-testing)
 - (cd serde && travis-cargo build -- --no-default-features)
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc)
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
 - (cd testing && travis-cargo --skip nightly test)
-- (cd testing && travis-cargo --only nightly test -- --features nightly-testing)
-- (cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing)
+- (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
+- (cd serde_macros && travis-cargo --only nightly test -- --features unstable-testing)
 - (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
-- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features nightly)
+- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
 - (cd serde && travis-cargo --only stable doc)
 after_success:
-- (cd serde && travis-cargo --only stable doc-upload)
+- (cd serde && travis-cargo --only stable doc-upload --branch docs)
 - (cd testing && travis-cargo --only stable coveralls --no-sudo)
 env:
   global:

README.md

@@ -29,7 +29,7 @@ version = "0.1.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 
 [dependencies]
-serde_json = "*"
+serde_json = "0.8"
 ```
 
 Next, the `src/main.rs` file itself:
@@ -68,8 +68,8 @@ fn main() {
         .insert("array", ArrayBuilder::new()
                 .push(1)
                 .push(2)
-                .unwrap())
-        .unwrap();
+                .build())
+        .build();
 
     let serialized = serde_json::to_string(&value).unwrap();
     println!("serialized value: {:?}", serialized);
@@ -81,7 +81,7 @@ fn main() {
 
 This produces the following output when run:
 
-```
+```sh
 % cargo run
 serialized vec: "[1,2]"
 deserialized vec: [1, 2]
@@ -115,15 +115,15 @@ authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 build = "build.rs"
 
 [build-dependencies]
-serde_codegen = "*"
+serde_codegen = "0.8"
 
 [dependencies]
-serde = "*"
-serde_json = "*"
+serde = "0.8"
+serde_json = "0.8"
 ```
 
 Next, we define our source file, `src/main.rs.in`. Note this is a different
-extension than usual becaues we need to do code generation:
+extension than usual because we need to do code generation:
 
 ```rust,ignore
 #[derive(Serialize, Deserialize, Debug)]
@@ -175,7 +175,7 @@ pub fn main() {
 
 All this produces this when run:
 
-```
+```sh
 % cargo run
 {"x":1,"y":2}
 Point { x: 1, y: 2 }
@@ -199,9 +199,9 @@ version = "0.1.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 
 [dependencies]
-serde = "*"
-serde_json = "*"
-serde_macros = "*"
+serde = "0.8"
+serde_json = "0.8"
+serde_macros = "0.8"
 ```
 
 Note that it doesn't need a build script. Now the `src/main.rs`, which enables
@@ -232,7 +232,7 @@ fn main() {
 
 This also produces the same output:
 
-```
+```sh
 % cargo run
 {"x":1,"y":2}
 Point { x: 1, y: 2 }
@@ -256,12 +256,12 @@ default = ["serde_codegen"]
 nightly = ["serde_macros"]
 
 [build-dependencies]
-serde_codegen = { version = "*", optional = true }
+serde_codegen = { version = "0.8", optional = true }
 
 [dependencies]
-serde = "*"
-serde_json = "*"
-serde_macros = { version = "*", optional = true }
+serde = "0.8"
+serde_json = "0.8"
+serde_macros = { version = "0.8", optional = true }
 ```
 
 `build.rs`:
@@ -314,14 +314,14 @@ The `src/main.rs.in` is the same as before.
 
 Then to run with stable:
 
-```
+```sh
 % cargo build
 ...
 ```
 
 Or with nightly:
 
-```
+```sh
 % cargo build --features nightly --no-default-features
 ...
 ```
@@ -356,11 +356,8 @@ impl serde::Serialize for i32 {
 ```
 
 As you can see it's pretty simple. More complex types like `BTreeMap` need to
-pass a
-[MapVisitor](http://serde-rs.github.io/serde/serde/serde/ser/trait.MapVisitor.html)
-to the 
-[Serializer](http://serde-rs.github.io/serde/serde/serde/ser/trait.Serializer.html)
-in order to walk through the type:
+use a multi-step process (init, elements, end) in order to walk through the
+type:
 
 ```rust,ignore
 impl<K, V> Serialize for BTreeMap<K, V>
@@ -371,55 +368,17 @@ impl<K, V> Serialize for BTreeMap<K, V>
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        serializer.serialize_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
-    }
-}
-
-pub struct MapIteratorVisitor<Iter> {
-    iter: Iter,
-    len: Option<usize>,
-}
-
-impl<K, V, Iter> MapIteratorVisitor<Iter>
-    where Iter: Iterator<Item=(K, V)>
-{
-    #[inline]
-    pub fn new(iter: Iter, len: Option<usize>) -> MapIteratorVisitor<Iter> {
-        MapIteratorVisitor {
-            iter: iter,
-            len: len,
+        let mut state = try!(serializer.serialize_map(Some(self.len())));
+        for (k, v) in self {
+            try!(serializer.serialize_map_elt(&mut state, k, v));
         }
-    }
-}
-
-impl<K, V, I> MapVisitor for MapIteratorVisitor<I>
-    where K: Serialize,
-          V: Serialize,
-          I: Iterator<Item=(K, V)>,
-{
-    #[inline]
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: Serializer,
-    {
-        match self.iter.next() {
-            Some((key, value)) => {
-                let value = try!(serializer.serialize_map_elt(key, value));
-                Ok(Some(value))
-            }
-            None => Ok(None)
-        }
-    }
-
-    #[inline]
-    fn len(&self) -> Option<usize> {
-        self.len
+        serializer.serialize_map_end(state)
     }
 }
 ```
 
 Serializing structs follow this same pattern. In fact, structs are represented
-as a named map. Its visitor uses a simple state machine to iterate through all
-the fields:
+as a named map, with a known length.
 
 ```rust
 extern crate serde;
@@ -434,35 +393,10 @@ impl serde::Serialize for Point {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: serde::Serializer
     {
-        serializer.serialize_struct("Point", PointMapVisitor {
-            value: self,
-            state: 0,
-        })
-    }
-}
-
-struct PointMapVisitor<'a> {
-    value: &'a Point,
-    state: u8,
-}
-
-impl<'a> serde::ser::MapVisitor for PointMapVisitor<'a> {
-    fn visit<S>(&mut self, serializer: &mut S) -> Result<Option<()>, S::Error>
-        where S: serde::Serializer
-    {
-        match self.state {
-            0 => {
-                self.state += 1;
-                Ok(Some(try!(serializer.serialize_struct_elt("x", &self.value.x))))
-            }
-            1 => {
-                self.state += 1;
-                Ok(Some(try!(serializer.serialize_struct_elt("y", &self.value.y))))
-            }
-            _ => {
-                Ok(None)
-            }
-        }
+        let mut state = try!(serializer.serialize_struct("Point", 2));
+        try!(serializer.serialize_struct_elt(&mut state, "x", &self.x));
+        try!(serializer.serialize_struct_elt(&mut state, "y", &self.y));
+        serializer.serialize_struct_end(state)
     }
 }
 
@@ -519,7 +453,7 @@ impl serde::de::Visitor for I32Visitor {
 Since it's possible for this type to get passed an unexpected type, we need a
 way to error out. This is done by way of the
 [Error](http://serde-rs.github.io/serde/serde/serde/de/trait.Error.html) trait,
-which allows a 
+which allows a
 [Deserialize](http://serde-rs.github.io/serde/serde/serde/de/trait.Deserialize.html)
 to generate an error for a few common error conditions. Here's how it could be used:
 
@@ -538,7 +472,7 @@ to generate an error for a few common error conditions. Here's how it could be u
 
 Maps follow a similar pattern as before, and use a
 [MapVisitor](http://serde-rs.github.io/serde/serde/serde/de/trait.MapVisitor.html)
-to walk through the values generated by the 
+to walk through the values generated by the
 [Deserializer](http://serde-rs.github.io/serde/serde/serde/de/trait.Deserializer.html).
 
 ```rust,ignore
@@ -812,12 +746,6 @@ features, and use `default-features = false` in your `Cargo.toml`:
 If you only use `default-features = false`, you will receive a stock `no_std`
 serde with no support for any of the collection types.
 
-Upgrading from Serde 0.6
-========================
-
-* `#[serde(skip_serializing_if_none)]` was replaced with `#[serde(skip_serializing_if="Option::is_none")]`.
-* `#[serde(skip_serializing_if_empty)]` was replaced with `#[serde(skip_serializing_if="Vec::is_empty")]`.
-
 Serialization Formats Using Serde
 =================================
 
@@ -825,6 +753,7 @@ Serialization Formats Using Serde
 | ------      | ----                                                 |
 | Bincode     | [bincode](https://crates.io/crates/bincode)          |
 | env vars    | [envy](https://crates.io/crates/envy)                |
+| Hjson       | [serde\_hjson](https://crates.io/crates/serde-hjson) |
 | JSON        | [serde\_json](https://crates.io/crates/serde_json)   |
 | MessagePack | [rmp](https://crates.io/crates/rmp)                  |
 | XML         | [serde\_xml](https://github.com/serde-rs/xml)        |

examples/serde-syntex-example/Cargo.toml

@@ -6,12 +6,12 @@ build = "build.rs"
 
 [features]
 default = ["serde_codegen"]
-nightly = ["serde_macros"]
+unstable = ["serde_macros"]
 
 [build-dependencies]
-serde_codegen = { version = "^0.7", optional = true }
+serde_codegen = { version = "^0.8", optional = true }
 
 [dependencies]
-serde = "^0.7"
-serde_json = "^0.7"
-serde_macros = { version = "^0.7", optional = true }
+serde = "^0.8"
+serde_json = "^0.8"
+serde_macros = { version = "^0.8", optional = true }

examples/serde-syntex-example/README.md

@@ -16,5 +16,5 @@ Point { x: 1, y: 2 }
 On nightly, it can use a plugin with:
 
 ```
-% rustup run nightly cargo run --features nightly --no-default-features
+% rustup run nightly cargo run --features unstable --no-default-features
 ```

serde/Cargo.toml

@@ -1,8 +1,6 @@
 [package]
 name = "serde"
-# DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH
-# USE THE 0.7.x BRANCH
-version = "0.8.0-rc1"
+version = "0.8.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
@@ -16,10 +14,10 @@ include = ["Cargo.toml", "src/**/*.rs"]
 default = ["std"]
 
 std = []
-nightly = []
-alloc = ["nightly"]
+unstable = []
+alloc = ["unstable"]
 collections = ["alloc"]
-nightly-testing = ["clippy", "nightly", "std"]
+unstable-testing = ["clippy", "unstable", "std"]
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }

serde/src/de/impls.rs

@@ -2,7 +2,7 @@
 
 #[cfg(feature = "std")]
 use std::borrow::Cow;
-#[cfg(all(feature = "nightly", feature = "collections", not(feature = "std")))]
+#[cfg(all(feature = "unstable", feature = "collections", not(feature = "std")))]
 use collections::borrow::Cow;
 
 #[cfg(all(feature = "collections", not(feature = "std")))]
@@ -27,9 +27,9 @@ use std::collections::{
     VecDeque,
 };
 
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 use collections::enum_set::{CLike, EnumSet};
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 use collections::borrow::ToOwned;
 
 use core::hash::{Hash, BuildHasher};
@@ -42,21 +42,24 @@ use core::str;
 
 #[cfg(feature = "std")]
 use std::rc::Rc;
-#[cfg(all(feature = "nightly", feature = "alloc", not(feature = "std")))]
+#[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))]
 use alloc::rc::Rc;
 
 #[cfg(feature = "std")]
 use std::sync::Arc;
-#[cfg(all(feature = "nightly", feature = "alloc", not(feature = "std")))]
+#[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))]
 use alloc::arc::Arc;
 
-#[cfg(all(feature = "nightly", feature = "alloc", not(feature = "std")))]
+#[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))]
 use alloc::boxed::Box;
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "std")]
+use std::time::Duration;
+
+#[cfg(feature = "unstable")]
 use core::nonzero::{NonZero, Zeroable};
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 use core::num::Zero;
 
 use de::{
@@ -356,7 +359,7 @@ pub struct PhantomDataVisitor<T> {
     marker: PhantomData<T>,
 }
 
-impl<T> Visitor for PhantomDataVisitor<T> where T: Deserialize {
+impl<T> Visitor for PhantomDataVisitor<T> {
     type Value = PhantomData<T>;
 
     #[inline]
@@ -367,7 +370,7 @@ impl<T> Visitor for PhantomDataVisitor<T> where T: Deserialize {
     }
 }
 
-impl<T> Deserialize for PhantomData<T> where T: Deserialize {
+impl<T> Deserialize for PhantomData<T> {
     fn deserialize<D>(deserializer: &mut D) -> Result<PhantomData<T>, D::Error>
         where D: Deserializer,
     {
@@ -461,7 +464,7 @@ seq_impl!(
     BTreeSet::new(),
     BTreeSet::insert);
 
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 seq_impl!(
     EnumSet<T>,
     EnumSetVisitor<T: Deserialize + CLike>,
@@ -593,7 +596,7 @@ macro_rules! array_impls {
                 fn deserialize<D>(deserializer: &mut D) -> Result<[T; $len], D::Error>
                     where D: Deserializer,
                 {
-                    deserializer.deserialize_fixed_size_array($len, $visitor::new())
+                    deserializer.deserialize_seq_fixed_size($len, $visitor::new())
                 }
             }
         )+
@@ -806,7 +809,7 @@ map_impl!(
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#[cfg(all(feature = "nightly", feature = "std"))]
+#[cfg(all(feature = "unstable", feature = "std"))]
 impl Deserialize for net::IpAddr {
     fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
         where D: Deserializer,
@@ -939,6 +942,16 @@ impl<T: Deserialize> Deserialize for Box<[T]> {
     }
 }
 
+#[cfg(any(feature = "std", feature = "collections"))]
+impl Deserialize for Box<str> {
+    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+        where D: Deserializer
+    {
+        let s = try!(String::deserialize(deserializer));
+        Ok(s.into_boxed_str())
+    }
+}
+
 #[cfg(any(feature = "std", feature = "alloc"))]
 impl<T: Deserialize> Deserialize for Arc<T> {
     fn deserialize<D>(deserializer: &mut D) -> Result<Arc<T>, D::Error>
@@ -972,7 +985,136 @@ impl<'a, T: ?Sized> Deserialize for Cow<'a, T> where T: ToOwned, T::Owned: Deser
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#[cfg(feature = "nightly")]
+// This is a cleaned-up version of the impl generated by:
+//
+//     #[derive(Deserialize)]
+//     #[serde(deny_unknown_fields)]
+//     struct Duration {
+//         secs: u64,
+//         nanos: u32,
+//     }
+#[cfg(feature = "std")]
+impl Deserialize for Duration {
+    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+        where D: Deserializer,
+    {
+        enum Field { Secs, Nanos };
+
+        impl Deserialize for Field {
+            fn deserialize<D>(deserializer: &mut D) -> Result<Field, D::Error>
+                where D: Deserializer,
+            {
+                struct FieldVisitor;
+
+                impl Visitor for FieldVisitor {
+                    type Value = Field;
+
+                    fn visit_usize<E>(&mut self, value: usize) -> Result<Field, E>
+                        where E: Error,
+                    {
+                        match value {
+                            0usize => Ok(Field::Secs),
+                            1usize => Ok(Field::Nanos),
+                            _ => Err(Error::invalid_value("expected a field")),
+                        }
+                    }
+
+                    fn visit_str<E>(&mut self, value: &str) -> Result<Field, E>
+                        where E: Error,
+                    {
+                        match value {
+                            "secs" => Ok(Field::Secs),
+                            "nanos" => Ok(Field::Nanos),
+                            _ => Err(Error::unknown_field(value)),
+                        }
+                    }
+
+                    fn visit_bytes<E>(&mut self, value: &[u8]) -> Result<Field, E>
+                        where E: Error,
+                    {
+                        match value {
+                            b"secs" => Ok(Field::Secs),
+                            b"nanos" => Ok(Field::Nanos),
+                            _ => {
+                                let value = String::from_utf8_lossy(value);
+                                Err(Error::unknown_field(&value))
+                            }
+                        }
+                    }
+                }
+
+                deserializer.deserialize_struct_field(FieldVisitor)
+            }
+        }
+
+        struct DurationVisitor;
+
+        impl Visitor for DurationVisitor {
+            type Value = Duration;
+
+            fn visit_seq<V>(&mut self, mut visitor: V) -> Result<Duration, V::Error>
+                where V: SeqVisitor,
+            {
+                let secs: u64 = match try!(visitor.visit()) {
+                    Some(value) => value,
+                    None => {
+                        try!(visitor.end());
+                        return Err(Error::invalid_length(0));
+                    }
+                };
+                let nanos: u32 = match try!(visitor.visit()) {
+                    Some(value) => value,
+                    None => {
+                        try!(visitor.end());
+                        return Err(Error::invalid_length(1));
+                    }
+                };
+                try!(visitor.end());
+                Ok(Duration::new(secs, nanos))
+            }
+
+            fn visit_map<V>(&mut self, mut visitor: V) -> Result<Duration, V::Error>
+                where V: MapVisitor,
+            {
+                let mut secs: Option<u64> = None;
+                let mut nanos: Option<u32> = None;
+                while let Some(key) = try!(visitor.visit_key::<Field>()) {
+                    match key {
+                        Field::Secs => {
+                            if secs.is_some() {
+                                return Err(<V::Error as Error>::duplicate_field("secs"));
+                            }
+                            secs = Some(try!(visitor.visit_value()));
+                        }
+                        Field::Nanos => {
+                            if nanos.is_some() {
+                                return Err(<V::Error as Error>::duplicate_field("nanos"));
+                            }
+                            nanos = Some(try!(visitor.visit_value()));
+                        }
+                    }
+                }
+                try!(visitor.end());
+                let secs = match secs {
+                    Some(secs) => secs,
+                    None => try!(visitor.missing_field("secs")),
+                };
+                let nanos = match nanos {
+                    Some(nanos) => nanos,
+                    None => try!(visitor.missing_field("nanos")),
+                };
+                Ok(Duration::new(secs, nanos))
+            }
+        }
+
+        const FIELDS: &'static [&'static str] = &["secs", "nanos"];
+        deserializer.deserialize_struct("Duration", FIELDS, DurationVisitor)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(feature = "unstable")]
 impl<T> Deserialize for NonZero<T> where T: Deserialize + PartialEq + Zeroable + Zero {
     fn deserialize<D>(deserializer: &mut D) -> Result<NonZero<T>, D::Error> where D: Deserializer {
         let value = try!(Deserialize::deserialize(deserializer));

serde/src/de/mod.rs

@@ -10,6 +10,73 @@ use collections::{String, Vec};
 
 use core::fmt;
 
+///////////////////////////////////////////////////////////////////////////////
+/// Macro helper to not have to re-implement all the defaulted methods.
+/// Every given method ignores all arguments and forwards to `deserialize`.
+/// Note that `deserialize_enum` simply returns an `Error::invalid_type`.
+macro_rules! de_forward_to_deserialize {
+    ($($func:ident),*) => {
+        $(de_forward_to_deserialize!{func: $func})*
+    };
+    (func: deserialize_unit_struct) => {
+        de_forward_to_deserialize!{named: deserialize_unit_struct}
+    };
+    (func: deserialize_newtype_struct) => {
+        de_forward_to_deserialize!{named: deserialize_newtype_struct}
+    };
+    (func: deserialize_tuple) => {
+        de_forward_to_deserialize!{tup_fn: deserialize_tuple}
+    };
+    (func: deserialize_seq_fixed_size) => {
+        de_forward_to_deserialize!{tup_fn: deserialize_seq_fixed_size}
+    };
+    (func: deserialize_tuple_struct) => {
+        #[inline]
+        fn deserialize_tuple_struct<__V>(&mut self, _: &str, _: usize, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (func: deserialize_struct) => {
+        #[inline]
+        fn deserialize_struct<__V>(&mut self, _: &str, _: &[&str], visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (func: deserialize_enum) => {
+        #[inline]
+        fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::EnumVisitor {
+            Err($crate::de::Error::invalid_type($crate::de::Type::Enum))
+        }
+    };
+    (named: $func:ident) => {
+        #[inline]
+        fn $func<__V>(&mut self, _: &str, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (tup_fn: $func: ident) => {
+        #[inline]
+        fn $func<__V>(&mut self, _: usize, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+    (func: $func:ident) => {
+        #[inline]
+        fn $func<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor {
+            self.deserialize(visitor)
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// modules come after macros
+
 pub mod impls;
 pub mod value;
 mod from_primitive;
@@ -243,278 +310,166 @@ pub trait Deserializer {
         where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `bool` value.
-    #[inline]
     fn deserialize_bool<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `usize` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_u64`.
     fn deserialize_usize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_u64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `u8` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_u64`.
     fn deserialize_u8<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_u64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `u16` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_u64`.
     fn deserialize_u16<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_u64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `u32` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_u64`.
     fn deserialize_u32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_u64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `u64` value.
-    #[inline]
     fn deserialize_u64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `isize` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_i64`.
     fn deserialize_isize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_i64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `i8` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_i64`.
     fn deserialize_i8<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_i64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `i16` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_i64`.
     fn deserialize_i16<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_i64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `i32` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_i64`.
     fn deserialize_i32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_i64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `i64` value.
-    #[inline]
     fn deserialize_i64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `f32` value.
-    #[inline]
+    /// A reasonable default is to forward to `deserialize_f64`.
     fn deserialize_f32<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_f64(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `f64` value.
-    #[inline]
     fn deserialize_f64<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `char` value.
-    #[inline]
     fn deserialize_char<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `&str` value.
-    #[inline]
     fn deserialize_str<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `String` value.
-    #[inline]
     fn deserialize_string<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_str(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `unit` value.
-    #[inline]
     fn deserialize_unit<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an `Option` value. This allows
     /// deserializers that encode an optional value as a nullable value to convert the null value
     /// into a `None`, and a regular value as `Some(value)`.
-    #[inline]
     fn deserialize_option<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a sequence value. This allows
     /// deserializers to parse sequences that aren't tagged as sequences.
-    #[inline]
     fn deserialize_seq<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a fixed size array. This allows
     /// deserializers to parse arrays that aren't tagged as arrays.
-    ///
-    /// By default, this deserializes arrays from a sequence.
-    #[inline]
-    fn deserialize_fixed_size_array<V>(&mut self,
-                                       _len: usize,
-                                       visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+    fn deserialize_seq_fixed_size<V>(&mut self,
+                                     len: usize,
+                                     visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a `Vec<u8>`. This allows
     /// deserializers that provide a custom byte vector serialization to properly deserialize the
     /// type.
-    #[inline]
     fn deserialize_bytes<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_seq(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a map of values. This allows
     /// deserializers to parse sequences that aren't tagged as maps.
-    #[inline]
     fn deserialize_map<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a unit struct. This allows
     /// deserializers to a unit struct that aren't tagged as a unit struct.
-    #[inline]
     fn deserialize_unit_struct<V>(&mut self,
-                                  _name: &'static str,
+                                  name: &'static str,
                                   visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_unit(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a newtype struct. This allows
     /// deserializers to a newtype struct that aren't tagged as a newtype struct.
-    #[inline]
+    /// A reasonable default is to simply deserialize the expected value directly.
     fn deserialize_newtype_struct<V>(&mut self,
                                      name: &'static str,
                                      visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_tuple_struct(name, 1, visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a tuple struct. This allows
     /// deserializers to parse sequences that aren't tagged as sequences.
-    #[inline]
     fn deserialize_tuple_struct<V>(&mut self,
-                                   _name: &'static str,
+                                   name: &'static str,
                                    len: usize,
                                    visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_tuple(len, visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a struct. This allows
     /// deserializers to parse sequences that aren't tagged as maps.
-    #[inline]
     fn deserialize_struct<V>(&mut self,
-                             _name: &'static str,
-                             _fields: &'static [&'static str],
+                             name: &'static str,
+                             fields: &'static [&'static str],
                              visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_map(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting some sort of struct field
     /// name.  This allows deserializers to choose between &str, usize, or &[u8] to properly
     /// deserialize a struct field.
-    #[inline]
     fn deserialize_struct_field<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting a tuple value. This allows
     /// deserializers that provide a custom tuple serialization to properly deserialize the type.
-    #[inline]
-    fn deserialize_tuple<V>(&mut self, _len: usize, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor,
-    {
-        self.deserialize_seq(visitor)
-    }
+    fn deserialize_tuple<V>(&mut self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an enum value. This allows
     /// deserializers that provide a custom enumeration serialization to properly deserialize the
     /// type.
-    #[inline]
     fn deserialize_enum<V>(&mut self,
-                           _enum: &'static str,
-                           _variants: &'static [&'static str],
-                           _visitor: V) -> Result<V::Value, Self::Error>
-        where V: EnumVisitor,
-    {
-        Err(Error::invalid_type(Type::Enum))
-    }
+                           name: &'static str,
+                           variants: &'static [&'static str],
+                           visitor: V) -> Result<V::Value, Self::Error>
+        where V: EnumVisitor;
 
     /// This method hints that the `Deserialize` type needs to deserialize a value whose type
     /// doesn't matter because it is ignored.
-    #[inline]
     fn deserialize_ignored_any<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        self.deserialize(visitor)
-    }
+        where V: Visitor;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -525,9 +480,10 @@ pub trait Visitor {
     type Value: Deserialize;
 
     /// `visit_bool` deserializes a `bool` into a `Value`.
-    fn visit_bool<E>(&mut self, _v: bool) -> Result<Self::Value, E>
+    fn visit_bool<E>(&mut self, v: bool) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = v;
         Err(Error::invalid_type(Type::Bool))
     }
 
@@ -560,9 +516,10 @@ pub trait Visitor {
     }
 
     /// `visit_i64` deserializes a `i64` into a `Value`.
-    fn visit_i64<E>(&mut self, _v: i64) -> Result<Self::Value, E>
+    fn visit_i64<E>(&mut self, v: i64) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = v;
         Err(Error::invalid_type(Type::I64))
     }
 
@@ -595,9 +552,10 @@ pub trait Visitor {
     }
 
     /// `visit_u64` deserializes a `u64` into a `Value`.
-    fn visit_u64<E>(&mut self, _v: u64) -> Result<Self::Value, E>
+    fn visit_u64<E>(&mut self, v: u64) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = v;
         Err(Error::invalid_type(Type::U64))
     }
 
@@ -609,9 +567,10 @@ pub trait Visitor {
     }
 
     /// `visit_f64` deserializes a `f64` into a `Value`.
-    fn visit_f64<E>(&mut self, _v: f64) -> Result<Self::Value, E>
+    fn visit_f64<E>(&mut self, v: f64) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = v;
         Err(Error::invalid_type(Type::F64))
     }
 
@@ -624,9 +583,10 @@ pub trait Visitor {
     }
 
     /// `visit_str` deserializes a `&str` into a `Value`.
-    fn visit_str<E>(&mut self, _v: &str) -> Result<Self::Value, E>
+    fn visit_str<E>(&mut self, v: &str) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = v;
         Err(Error::invalid_type(Type::Str))
     }
 
@@ -650,9 +610,10 @@ pub trait Visitor {
 
     /// `visit_unit_struct` deserializes a unit struct into a `Value`.
     #[inline]
-    fn visit_unit_struct<E>(&mut self, _name: &'static str) -> Result<Self::Value, E>
+    fn visit_unit_struct<E>(&mut self, name: &'static str) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = name;
         self.visit_unit()
     }
 
@@ -664,37 +625,42 @@ pub trait Visitor {
     }
 
     /// `visit_some` deserializes a value into a `Value`.
-    fn visit_some<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
+    fn visit_some<D>(&mut self, deserializer: &mut D) -> Result<Self::Value, D::Error>
         where D: Deserializer,
     {
+        let _ = deserializer;
         Err(Error::invalid_type(Type::Option))
     }
 
     /// `visit_newtype_struct` deserializes a value into a `Value`.
-    fn visit_newtype_struct<D>(&mut self, _deserializer: &mut D) -> Result<Self::Value, D::Error>
+    fn visit_newtype_struct<D>(&mut self, deserializer: &mut D) -> Result<Self::Value, D::Error>
         where D: Deserializer,
     {
+        let _ = deserializer;
         Err(Error::invalid_type(Type::NewtypeStruct))
     }
 
     /// `visit_seq` deserializes a `SeqVisitor` into a `Value`.
-    fn visit_seq<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
+    fn visit_seq<V>(&mut self, visitor: V) -> Result<Self::Value, V::Error>
         where V: SeqVisitor,
     {
+        let _ = visitor;
         Err(Error::invalid_type(Type::Seq))
     }
 
     /// `visit_map` deserializes a `MapVisitor` into a `Value`.
-    fn visit_map<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
+    fn visit_map<V>(&mut self, visitor: V) -> Result<Self::Value, V::Error>
         where V: MapVisitor,
     {
+        let _ = visitor;
         Err(Error::invalid_type(Type::Map))
     }
 
     /// `visit_bytes` deserializes a `&[u8]` into a `Value`.
-    fn visit_bytes<E>(&mut self, _v: &[u8]) -> Result<Self::Value, E>
+    fn visit_bytes<E>(&mut self, v: &[u8]) -> Result<Self::Value, E>
         where E: Error,
     {
+        let _ = v;
         Err(Error::invalid_type(Type::Bytes))
     }
 
@@ -870,33 +836,26 @@ pub trait VariantVisitor {
         Err(Error::invalid_type(Type::UnitVariant))
     }
 
-    /// `visit_newtype` is called when deserializing a variant with a single value. By default this
-    /// uses the `visit_tuple` method to deserialize the value.
-    #[inline]
+    /// `visit_newtype` is called when deserializing a variant with a single value.
+    /// A good default is often to use the `visit_tuple` method to deserialize a `(value,)`.
     fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
-        where T: Deserialize,
-    {
-        let (value,) = try!(self.visit_tuple(1, impls::TupleVisitor1::new()));
-        Ok(value)
-    }
+        where T: Deserialize;
 
     /// `visit_tuple` is called when deserializing a tuple-like variant.
+    /// If no tuple variants are expected, yield a
+    /// `Err(serde::de::Error::invalid_type(serde::de::Type::TupleVariant))`
     fn visit_tuple<V>(&mut self,
-                      _len: usize,
-                      _visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        Err(Error::invalid_type(Type::TupleVariant))
-    }
+                      len: usize,
+                      visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 
     /// `visit_struct` is called when deserializing a struct-like variant.
+    /// If no struct variants are expected, yield a
+    /// `Err(serde::de::Error::invalid_type(serde::de::Type::StructVariant))`
     fn visit_struct<V>(&mut self,
-                       _fields: &'static [&'static str],
-                       _visitor: V) -> Result<V::Value, Self::Error>
-        where V: Visitor
-    {
-        Err(Error::invalid_type(Type::StructVariant))
-    }
+                       fields: &'static [&'static str],
+                       visitor: V) -> Result<V::Value, Self::Error>
+        where V: Visitor;
 }
 
 impl<'a, T> VariantVisitor for &'a mut T where T: VariantVisitor {

serde/src/de/value.rs

@@ -25,7 +25,7 @@ use collections::{
     vec,
 };
 
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 use collections::borrow::ToOwned;
 
 use core::hash::Hash;
@@ -174,6 +174,22 @@ impl<E> de::Deserializer for UnitDeserializer<E>
 {
     type Error = E;
 
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct
+    }
+
     fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
         where V: de::Visitor,
     {
@@ -209,6 +225,23 @@ macro_rules! primitive_deserializer {
         {
             type Error = E;
 
+            de_forward_to_deserialize!{
+                deserialize_bool,
+                deserialize_f64, deserialize_f32,
+                deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+                deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+                deserialize_char, deserialize_str, deserialize_string,
+                deserialize_ignored_any,
+                deserialize_bytes,
+                deserialize_unit_struct, deserialize_unit,
+                deserialize_seq, deserialize_seq_fixed_size,
+                deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+                deserialize_tuple,
+                deserialize_enum,
+                deserialize_struct, deserialize_tuple_struct,
+                deserialize_option
+            }
+
             fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
                 where V: de::Visitor,
             {
@@ -273,6 +306,22 @@ impl<'a, E> de::Deserializer for StrDeserializer<'a, E>
     {
         visitor.visit(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 impl<'a, E> de::VariantVisitor for StrDeserializer<'a, E>
@@ -289,6 +338,29 @@ impl<'a, E> de::VariantVisitor for StrDeserializer<'a, E>
     fn visit_unit(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
+
+    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
+        where T: super::Deserialize,
+    {
+        let (value,) = try!(self.visit_tuple(1, super::impls::TupleVisitor1::new()));
+        Ok(value)
+    }
+
+    fn visit_tuple<V>(&mut self,
+                      _len: usize,
+                      _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::TupleVariant))
+    }
+
+    fn visit_struct<V>(&mut self,
+                       _fields: &'static [&'static str],
+                       _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::StructVariant))
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -331,6 +403,22 @@ impl<E> de::Deserializer for StringDeserializer<E>
     {
         visitor.visit(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 #[cfg(any(feature = "std", feature = "collections"))]
@@ -348,6 +436,29 @@ impl<'a, E> de::VariantVisitor for StringDeserializer<E>
     fn visit_unit(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
+
+    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
+        where T: super::Deserialize,
+    {
+        let (value,) = try!(self.visit_tuple(1, super::impls::TupleVisitor1::new()));
+        Ok(value)
+    }
+
+    fn visit_tuple<V>(&mut self,
+                      _len: usize,
+                      _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::TupleVariant))
+    }
+
+    fn visit_struct<V>(&mut self,
+                       _fields: &'static [&'static str],
+                       _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::StructVariant))
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -384,6 +495,23 @@ impl<I, T, E> de::Deserializer for SeqDeserializer<I, E>
     {
         visitor.visit_seq(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 impl<I, T, E> de::SeqVisitor for SeqDeserializer<I, E>
@@ -490,6 +618,23 @@ impl<V_, E> de::Deserializer for SeqVisitorDeserializer<V_, E>
     fn deserialize<V: de::Visitor>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error> {
         visitor.visit_seq(&mut self.visitor)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -537,6 +682,23 @@ impl<I, K, V, E> de::Deserializer for MapDeserializer<I, K, V, E>
     {
         visitor.visit_map(self)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 impl<I, K, V, E> de::MapVisitor for MapDeserializer<I, K, V, E>
@@ -648,6 +810,23 @@ impl<V_, E> de::Deserializer for MapVisitorDeserializer<V_, E>
     fn deserialize<V: de::Visitor>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error> {
         visitor.visit_map(&mut self.visitor)
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -678,6 +857,23 @@ impl<'a, E> de::Deserializer for BytesDeserializer<'a, E>
             None => Err(de::Error::end_of_stream()),
         }
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }
 
 
@@ -712,4 +908,21 @@ impl<E> de::Deserializer for ByteBufDeserializer<E>
             None => Err(de::Error::end_of_stream()),
         }
     }
+
+    de_forward_to_deserialize!{
+        deserialize_bool,
+        deserialize_f64, deserialize_f32,
+        deserialize_u8, deserialize_u16, deserialize_u32, deserialize_u64, deserialize_usize,
+        deserialize_i8, deserialize_i16, deserialize_i32, deserialize_i64, deserialize_isize,
+        deserialize_char, deserialize_str, deserialize_string,
+        deserialize_ignored_any,
+        deserialize_bytes,
+        deserialize_unit_struct, deserialize_unit,
+        deserialize_seq, deserialize_seq_fixed_size,
+        deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
+        deserialize_tuple,
+        deserialize_enum,
+        deserialize_struct, deserialize_tuple_struct,
+        deserialize_option
+    }
 }

serde/src/error.rs

@@ -4,7 +4,7 @@ use core::fmt::{Debug, Display};
 
 
 /// A stand-in for `std::error::Error`, which requires no allocation.
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 pub trait Error: Debug + Display + ::core::marker::Reflect {
     /// A short description of the error.
     ///
@@ -24,7 +24,7 @@ pub trait Error: Debug + Display + ::core::marker::Reflect {
 }
 
 /// A stand-in for `std::error::Error`, which requires no allocation.
-#[cfg(not(feature = "nightly"))]
+#[cfg(not(feature = "unstable"))]
 pub trait Error: Debug + Display {
     /// A short description of the error.
     ///

serde/src/lib.rs

@@ -5,35 +5,35 @@
 //! handshake protocol between serializers and serializees can be completely optimized away,
 //! leaving serde to perform roughly the same speed as a hand written serializer for a specific
 //! type.
-//! 
+//!
 //! For a detailed tutorial on the different ways to use serde please check out the
 //! [github repository](https://github.com/serde-rs/serde)
 
 #![doc(html_root_url="https://serde-rs.github.io/serde/serde")]
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "nightly", feature(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))]
+#![cfg_attr(feature = "unstable", feature(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))]
 #![cfg_attr(feature = "alloc", feature(alloc))]
 #![cfg_attr(feature = "collections", feature(collections, enumset))]
-#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
-#![cfg_attr(feature = "nightly-testing", allow(linkedlist))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", allow(linkedlist))]
 
-#![cfg_attr(any(not(feature = "std"), feature = "nightly"), allow(unused_variables, unused_imports, unused_features, dead_code))]
+#![cfg_attr(any(not(feature = "std"), feature = "unstable"), allow(unused_variables, unused_imports, unused_features, dead_code))]
 
 #![deny(missing_docs)]
 
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 extern crate collections;
 
-#[cfg(all(feature = "nightly", feature = "alloc"))]
+#[cfg(all(feature = "unstable", feature = "alloc"))]
 extern crate alloc;
 
 #[cfg(feature = "std")]
 mod core {
     pub use std::{ops, hash, fmt, cmp, marker, mem, i8, i16, i32, i64, u8, u16, u32, u64, isize,
             usize, f32, f64, char, str, num, slice, iter};
-    #[cfg(feature = "nightly")]
+    #[cfg(feature = "unstable")]
     extern crate core;
-    #[cfg(feature = "nightly")]
+    #[cfg(feature = "unstable")]
     pub use self::core::nonzero;
 }
 

serde/src/ser/impls.rs

@@ -1,4 +1,8 @@
-//! Implementations for all of Rust's builtin types.
+//! Implementations for all of Rust's builtin types. Tuples implement the `Serialize` trait if they
+//! have at most 16 fields. Arrays implement the `Serialize` trait if their length is 32 or less.
+//! You can always forward array serialization to slice serialization, which works for any length.
+//! Long tuples are best replaced by tuple structs, for which you can use `derive(Serialize)`. In
+//! that case the number of fields is irrelevant.
 
 #[cfg(feature = "std")]
 use std::borrow::Cow;
@@ -26,19 +30,19 @@ use collections::{
     Vec,
 };
 
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 use collections::enum_set::{CLike, EnumSet};
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 use collections::borrow::ToOwned;
 
 use core::hash::{Hash, BuildHasher};
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 use core::iter;
 #[cfg(feature = "std")]
 use std::net;
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 use core::num;
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 use core::ops;
 #[cfg(feature = "std")]
 use std::path;
@@ -46,6 +50,8 @@ use std::path;
 use std::rc::Rc;
 #[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::rc::Rc;
+#[cfg(feature = "std")]
+use std::time::Duration;
 
 #[cfg(feature = "std")]
 use std::sync::Arc;
@@ -57,7 +63,7 @@ use alloc::boxed::Box;
 
 use core::marker::PhantomData;
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 use core::nonzero::{NonZero, Zeroable};
 
 use super::{
@@ -153,7 +159,7 @@ impl<T> Serialize for [T]
         where S: Serializer,
     {
         let mut state = try!(serializer.serialize_seq(Some(self.len())));
-        for e in self.iter() {
+        for e in self {
             try!(serializer.serialize_seq_elt(&mut state, e));
         }
         serializer.serialize_seq_end(state)
@@ -170,7 +176,7 @@ macro_rules! array_impls {
                 where S: Serializer,
             {
                 let mut state = try!(serializer.serialize_seq_fixed_size($len));
-                for e in self.iter() {
+                for e in self {
                     try!(serializer.serialize_seq_elt(&mut state, e));
                 }
                 serializer.serialize_seq_end(state)
@@ -244,7 +250,7 @@ impl<T> Serialize for BTreeSet<T>
     serialize_seq!();
 }
 
-#[cfg(all(feature = "nightly", feature = "collections"))]
+#[cfg(all(feature = "unstable", feature = "collections"))]
 impl<T> Serialize for EnumSet<T>
     where T: Serialize + CLike
 {
@@ -276,7 +282,7 @@ impl<T> Serialize for VecDeque<T> where T: Serialize {
     serialize_seq!();
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 impl<A> Serialize for ops::Range<A>
     where A: Serialize + Clone + iter::Step + num::One,
           for<'a> &'a A: ops::Add<&'a A, Output = A>,
@@ -518,7 +524,8 @@ macro_rules! serialize_map {
         {
             let mut state = try!(serializer.serialize_map(Some(self.len())));
             for (k, v) in self {
-                try!(serializer.serialize_map_elt(&mut state, k, v));
+                try!(serializer.serialize_map_key(&mut state, k));
+                try!(serializer.serialize_map_value(&mut state, v));
             }
             serializer.serialize_map_end(state)
         }
@@ -619,7 +626,21 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#[cfg(all(feature = "std", feature = "nightly"))]
+#[cfg(feature = "std")]
+impl Serialize for Duration {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer,
+    {
+        let mut state = try!(serializer.serialize_struct("Duration", 2));
+        try!(serializer.serialize_struct_elt(&mut state, "secs", self.as_secs()));
+        try!(serializer.serialize_struct_elt(&mut state, "nanos", self.subsec_nanos()));
+        serializer.serialize_struct_end(state)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#[cfg(all(feature = "std", feature = "unstable"))]
 impl Serialize for net::IpAddr {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
@@ -704,7 +725,7 @@ impl Serialize for path::PathBuf {
     }
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 impl<T> Serialize for NonZero<T> where T: Serialize + Zeroable {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
         (**self).serialize(serializer)

serde/src/ser/mod.rs

@@ -1,4 +1,14 @@
 //! Generic serialization framework.
+//! # For Developers who want to serialize objects
+//! Implement the `Serialize` trait for the type of objects you want to serialize. Call methods of
+//! the `serializer` object. For which methods to call and how to do so, look at the documentation
+//! of the `Serializer` trait.
+//!
+//! # For Serialization Format Developers
+//! Implement the `Serializer` trait for a structure that contains fields that enable it to write
+//! the serialization result to your target. When a method's argument is an object of type
+//! `Serialize`, you can either forward the serializer object (`self`) or create a new one,
+//! depending on the quirks of your format.
 
 #[cfg(feature = "std")]
 use std::error;
@@ -15,11 +25,11 @@ pub mod impls;
 /// `Error` is a trait that allows a `Serialize` to generically create a
 /// `Serializer` error.
 pub trait Error: Sized + error::Error {
-    /// Raised when there is general error when deserializing a type.
+    /// Raised when there is a general error when serializing a type.
     #[cfg(any(feature = "std", feature = "collections"))]
     fn custom<T: Into<String>>(msg: T) -> Self;
 
-    /// Raised when there is general error when deserializing a type.
+    /// Raised when there is a general error when serializing a type.
     #[cfg(all(not(feature = "std"), not(feature = "collections")))]
     fn custom<T: Into<&'static str>>(msg: T) -> Self;
 
@@ -41,6 +51,26 @@ pub trait Serialize {
 ///////////////////////////////////////////////////////////////////////////////
 
 /// A trait that describes a type that can serialize a stream of values into the underlying format.
+///
+/// # For `Serialize` Developers
+/// Non-aggrergate types like integers and strings can be serialized directly by calling the
+/// appropriate function. For Aggregate types there's an initial `serialize_T` method that yields
+/// a State object that you should not interact with. For each part of the aggregate there's a
+/// `serialize_T_elt` method that allows you to pass values or key/value pairs. The types of the
+/// values or the keys may change between calls, but the serialization format may not necessarily
+/// accept it. The `serialize_T_elt` method also takes a mutable reference to the state object.
+/// Make sure that you always use the same state object and only the state object that was returned
+/// by the `serialize_T` method. Finally, when your object is done, call the `serialize_T_end`
+/// method and pass the state object by value
+///
+/// # For Serialization Format Developers
+/// If your format has different situations where it accepts different types, create a
+/// `Serializer` for each situation. You can create the sub-`Serializer` in one of the aggregate
+/// `serialize_T` methods and return it as a state object. Remember to also set the corresponding
+/// associated type `TState`. In the `serialize_T_elt` methods you will be given a mutable
+/// reference to that state. You do not need to do any additional checks for the correctness of the
+/// state object, as it is expected that the user will not modify it. Due to the generic nature
+/// of the `Serialize` impls, modifying the object is impossible on stable Rust.
 pub trait Serializer {
     /// The error type that can be returned if some error occurs during serialization.
     type Error: Error;
@@ -131,7 +161,8 @@ pub trait Serializer {
     /// Serializes an `f64` value.
     fn serialize_f64(&mut self, v: f64) -> Result<(), Self::Error>;
 
-    /// Serializes a character.
+    /// Serializes a character. If the format does not support characters,
+    /// it is reasonable to serialize it as a single element `str` or a `u32`.
     fn serialize_char(&mut self, v: char) -> Result<(), Self::Error>;
 
     /// Serializes a `&str`.
@@ -140,10 +171,17 @@ pub trait Serializer {
     /// Enables serializers to serialize byte slices more compactly or more
     /// efficiently than other types of slices. If no efficient implementation
     /// is available, a reasonable implementation would be to forward to
-    /// `serialize_seq`.
+    /// `serialize_seq`. If forwarded, the implementation looks usually just like this:
+    /// ```rust
+    /// let mut state = try!(self.serialize_seq(value));
+    /// for b in value {
+    ///     try!(self.serialize_seq_elt(&mut state, b));
+    /// }
+    /// self.serialize_seq_end(state)
+    /// ```
     fn serialize_bytes(&mut self, value: &[u8]) -> Result<(), Self::Error>;
 
-    /// Serializes a `()` value.
+    /// Serializes a `()` value. It's reasonable to just not serialize anything.
     fn serialize_unit(&mut self) -> Result<(), Self::Error>;
 
     /// Serializes a unit struct value. A reasonable implementation would be to
@@ -166,7 +204,7 @@ pub trait Serializer {
     /// Allows a tuple struct with a single element, also known as a newtype
     /// struct, to be more efficiently serialized than a tuple struct with
     /// multiple items. A reasonable implementation would be to forward to
-    /// `serialize_tuple_struct`.
+    /// `serialize_tuple_struct` or to just serialize the inner value without wrapping.
     fn serialize_newtype_struct<T: Serialize>(
         &mut self,
         name: &'static str,
@@ -296,18 +334,25 @@ pub trait Serializer {
     ) -> Result<(), Self::Error>;
 
     /// Begins to serialize a map. This call must be followed by zero or more
-    /// calls to `serialize_map_elt`, then a call to `serialize_map_end`.
+    /// calls to `serialize_map_key` and `serialize_map_value`, then a call to
+    /// `serialize_map_end`.
     fn serialize_map(
         &mut self,
         len: Option<usize>,
     ) -> Result<Self::MapState, Self::Error>;
 
-    /// Serialize a map element. Must have previously called `serialize_map`.
-    fn serialize_map_elt<K: Serialize, V: Serialize>(
+    /// Serialize a map key. Must have previously called `serialize_map`.
+    fn serialize_map_key<T: Serialize>(
         &mut self,
         state: &mut Self::MapState,
-        key: K,
-        value: V,
+        key: T
+    ) -> Result<(), Self::Error>;
+
+    /// Serialize a map value. Must have previously called `serialize_map`.
+    fn serialize_map_value<T: Serialize>(
+        &mut self,
+        state: &mut Self::MapState,
+        value: T
     ) -> Result<(), Self::Error>;
 
     /// Finishes serializing a map.

serde_codegen/Cargo.toml

@@ -1,8 +1,6 @@
 [package]
 name = "serde_codegen"
-# DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH
-# USE THE 0.7.x BRANCH
-version = "0.8.0-rc1"
+version = "0.8.1"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
@@ -14,8 +12,8 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
 
 [features]
 default = ["with-syntex"]
-nightly = ["quasi_macros"]
-nightly-testing = ["clippy"]
+unstable = ["quasi_macros"]
+unstable-testing = ["clippy"]
 with-syntex = [
     "quasi/with-syntex",
     "quasi_codegen",
@@ -26,14 +24,14 @@ with-syntex = [
 ]
 
 [build-dependencies]
-quasi_codegen = { version = "^0.15.0", optional = true }
-syntex = { version = "^0.38.0", optional = true }
+quasi_codegen = { version = "^0.16.0", optional = true }
+syntex = { version = "^0.39.0", optional = true }
 
 [dependencies]
-aster = { version = "^0.21.1", default-features = false }
+aster = { version = "^0.22.0", default-features = false }
 clippy = { version = "^0.*", optional = true }
-quasi = { version = "^0.15.0", default-features = false }
-quasi_macros = { version = "^0.15.0", optional = true }
-serde_codegen_internals = { version = "^0.3.0", default-features = false }
-syntex = { version = "^0.38.0", optional = true }
-syntex_syntax = { version = "^0.38.0", optional = true }
+quasi = { version = "^0.16.0", default-features = false }
+quasi_macros = { version = "^0.16.0", optional = true }
+serde_codegen_internals = { version = "=0.5.0", default-features = false, path = "../serde_codegen_internals" }
+syntex = { version = "^0.39.0", optional = true }
+syntex_syntax = { version = "^0.39.0", optional = true }

serde_codegen/build.rs

@@ -4,14 +4,17 @@ mod inner {
 
     use std::env;
     use std::path::Path;
+    use std::thread::spawn;
 
     pub fn main() {
-        let out_dir = env::var_os("OUT_DIR").unwrap();
+        // put everything into a thread, so users can use `RUST_MIN_STACK` to increase the amount of stack
+        spawn(|| {
+            let out_dir = env::var_os("OUT_DIR").unwrap();
 
-        let src = Path::new("src/lib.rs.in");
-        let dst = Path::new(&out_dir).join("lib.rs");
-
-        quasi_codegen::expand(&src, &dst).unwrap();
+            let src = Path::new("src/lib.rs.in");
+            let dst = Path::new(&out_dir).join("lib.rs");
+            quasi_codegen::expand(&src, &dst).unwrap();
+        }).join().unwrap()
     }
 }
 

serde_codegen/src/bound.rs

@@ -1,7 +1,8 @@
+use std::collections::HashSet;
+
 use aster::AstBuilder;
 
 use syntax::ast;
-use syntax::ptr::P;
 use syntax::visit;
 
 use internals::ast::Item;
@@ -47,6 +48,17 @@ pub fn with_where_predicates_from_fields<F>(
         .build()
 }
 
+// Puts the given bound on any generic type parameters that are used in fields
+// for which filter returns true.
+//
+// For example, the following struct needs the bound `A: Serialize, B: Serialize`.
+//
+//     struct S<'b, A, B: 'b, C> {
+//         a: A,
+//         b: Option<&'b B>
+//         #[serde(skip_serializing)]
+//         c: C,
+//     }
 pub fn with_bound<F>(
     builder: &AstBuilder,
     item: &Item,
@@ -56,95 +68,60 @@ pub fn with_bound<F>(
 ) -> ast::Generics
     where F: Fn(&attr::Field) -> bool,
 {
+    struct FindTyParams {
+        // Set of all generic type parameters on the current struct (A, B, C in
+        // the example). Initialized up front.
+        all_ty_params: HashSet<ast::Name>,
+        // Set of generic type parameters used in fields for which filter
+        // returns true (A and B in the example). Filled in as the visitor sees
+        // them.
+        relevant_ty_params: HashSet<ast::Name>,
+    }
+    impl visit::Visitor for FindTyParams {
+        fn visit_path(&mut self, path: &ast::Path, _id: ast::NodeId) {
+            if let Some(seg) = path.segments.last() {
+                if seg.identifier.name.as_str() == "PhantomData" {
+                    // Hardcoded exception, because PhantomData<T> implements
+                    // Serialize and Deserialize whether or not T implements it.
+                    return;
+                }
+            }
+            if !path.global && path.segments.len() == 1 {
+                let id = path.segments[0].identifier.name;
+                if self.all_ty_params.contains(&id) {
+                    self.relevant_ty_params.insert(id);
+                }
+            }
+            visit::walk_path(self, path);
+        }
+    }
+
+    let all_ty_params: HashSet<_> = generics.ty_params.iter()
+        .map(|ty_param| ty_param.ident.name)
+        .collect();
+
+    let relevant_tys = item.body.all_fields()
+        .filter(|&field| filter(&field.attrs))
+        .map(|field| &field.ty);
+
+    let mut visitor = FindTyParams {
+        all_ty_params: all_ty_params,
+        relevant_ty_params: HashSet::new(),
+    };
+    for ty in relevant_tys {
+        visit::walk_ty(&mut visitor, ty);
+    }
+
     builder.from_generics(generics.clone())
         .with_predicates(
-            item.body.all_fields()
-                .filter(|&field| filter(&field.attrs))
-                .map(|field| &field.ty)
-                .filter(|ty| !contains_recursion(ty, item.ident))
-                .map(|ty| strip_reference(ty))
-                .map(|ty| builder.where_predicate()
-                    // the type that is being bounded e.g. T
-                    .bound().build(ty.clone())
+            generics.ty_params.iter()
+                .map(|ty_param| ty_param.ident.name)
+                .filter(|id| visitor.relevant_ty_params.contains(id))
+                .map(|id| builder.where_predicate()
+                    // the type parameter that is being bounded e.g. T
+                    .bound().build(builder.ty().id(id))
                     // the bound e.g. Serialize
                     .bound().trait_(bound.clone()).build()
                     .build()))
         .build()
 }
-
-// We do not attempt to generate any bounds based on field types that are
-// directly recursive, as in:
-//
-//    struct Test<D> {
-//        next: Box<Test<D>>,
-//    }
-//
-// This does not catch field types that are mutually recursive with some other
-// type. For those, we require bounds to be specified by a `bound` attribute if
-// the inferred ones are not correct.
-//
-//    struct Test<D> {
-//        #[serde(bound="D: Serialize + Deserialize")]
-//        next: Box<Other<D>>,
-//    }
-//    struct Other<D> {
-//        #[serde(bound="D: Serialize + Deserialize")]
-//        next: Box<Test<D>>,
-//    }
-fn contains_recursion(ty: &ast::Ty, ident: ast::Ident) -> bool {
-    struct FindRecursion {
-        ident: ast::Ident,
-        found_recursion: bool,
-    }
-    impl visit::Visitor for FindRecursion {
-        fn visit_path(&mut self, path: &ast::Path, _id: ast::NodeId) {
-            if !path.global
-                    && path.segments.len() == 1
-                    && path.segments[0].identifier == self.ident {
-                self.found_recursion = true;
-            } else {
-                visit::walk_path(self, path);
-            }
-        }
-    }
-
-    let mut visitor = FindRecursion {
-        ident: ident,
-        found_recursion: false,
-    };
-    visit::walk_ty(&mut visitor, ty);
-    visitor.found_recursion
-}
-
-// This is required to handle types that use both a reference and a value of
-// the same type, as in:
-//
-//    enum Test<'a, T> where T: 'a {
-//        Lifetime(&'a T),
-//        NoLifetime(T),
-//    }
-//
-// Preserving references, we would generate an impl like:
-//
-//    impl<'a, T> Serialize for Test<'a, T>
-//        where &'a T: Serialize,
-//              T: Serialize { ... }
-//
-// And taking a reference to one of the elements would fail with:
-//
-//    error: cannot infer an appropriate lifetime for pattern due
-//    to conflicting requirements [E0495]
-//        Test::NoLifetime(ref v) => { ... }
-//                         ^~~~~
-//
-// Instead, we strip references before adding `T: Serialize` bounds in order to
-// generate:
-//
-//    impl<'a, T> Serialize for Test<'a, T>
-//        where T: Serialize { ... }
-fn strip_reference(mut ty: &P<ast::Ty>) -> &P<ast::Ty> {
-    while let ast::TyKind::Rptr(_, ref mut_ty) = ty.node {
-        ty = &mut_ty.ty;
-    }
-    ty
-}

serde_codegen/src/de.rs

@@ -76,10 +76,8 @@ fn deserialize_item(
             #[automatically_derived]
             impl $impl_generics _serde::de::Deserialize for $ty $where_clause {
                 fn deserialize<__D>(deserializer: &mut __D) -> ::std::result::Result<$ty, __D::Error>
-                    where __D: _serde::de::Deserializer,
-                {
-                    $body
-                }
+                    where __D: _serde::de::Deserializer
+                $body
             }
         };
     ).unwrap()
@@ -136,7 +134,7 @@ fn deserialize_body(
     item: &Item,
     impl_generics: &ast::Generics,
     ty: P<ast::Ty>,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     match item.body {
         Body::Enum(ref variants) => {
             deserialize_item_enum(
@@ -192,31 +190,24 @@ fn deserialize_body(
 // Build `__Visitor<A, B, ...>(PhantomData<A>, PhantomData<B>, ...)`
 fn deserialize_visitor(
     builder: &aster::AstBuilder,
-    trait_generics: &ast::Generics,
-    forward_ty_params: Vec<ast::TyParam>,
-    forward_tys: Vec<P<ast::Ty>>
-) -> (P<ast::Item>, P<ast::Ty>, P<ast::Expr>, ast::Generics) {
-    if trait_generics.ty_params.is_empty() && forward_tys.is_empty() {
+    generics: &ast::Generics,
+) -> (P<ast::Item>, P<ast::Ty>, P<ast::Expr>) {
+    if generics.ty_params.is_empty() {
         (
-            builder.item().tuple_struct("__Visitor").build(),
+            builder.item().unit_struct("__Visitor"),
             builder.ty().id("__Visitor"),
             builder.expr().id("__Visitor"),
-            trait_generics.clone(),
         )
     } else {
-        let placeholders : Vec<_> = trait_generics.ty_params.iter()
+        let placeholders : Vec<_> = generics.ty_params.iter()
             .map(|t| builder.ty().id(t.ident))
             .collect();
-        let mut trait_generics = trait_generics.clone();
-        let mut ty_params = forward_ty_params.clone();
-        ty_params.extend(trait_generics.ty_params.into_vec());
-        trait_generics.ty_params = P::from_vec(ty_params);
 
         (
             builder.item().tuple_struct("__Visitor")
-                .generics().with(trait_generics.clone()).build()
+                .generics().with(generics.clone()).build()
                 .with_tys({
-                    let lifetimes = trait_generics.lifetimes.iter()
+                    let lifetimes = generics.lifetimes.iter()
                         .map(|lifetime_def| {
                             builder.ty()
                                 .phantom_data()
@@ -225,7 +216,7 @@ fn deserialize_visitor(
                                 .unit()
                         });
 
-                    let ty_params = trait_generics.ty_params.iter()
+                    let ty_params = generics.ty_params.iter()
                         .map(|ty_param| {
                             builder.ty()
                                 .phantom_data()
@@ -236,48 +227,31 @@ fn deserialize_visitor(
                 })
                 .build(),
             builder.ty().path()
-                .segment("__Visitor").with_generics(trait_generics.clone()).build()
+                .segment("__Visitor").with_generics(generics.clone()).build()
                 .build(),
             builder.expr().call()
                 .path().segment("__Visitor")
-                .with_tys(forward_tys)
                 .with_tys(placeholders)
                 .build().build()
                 .with_args({
-                    let len = trait_generics.lifetimes.len() + trait_generics.ty_params.len();
+                    let len = generics.lifetimes.len() + generics.ty_params.len();
 
                     (0 .. len).map(|_| builder.expr().phantom_data())
                 })
                 .build(),
-            trait_generics,
         )
     }
 }
 
-fn deserializer_ty_param(builder: &aster::AstBuilder) -> ast::TyParam {
-    builder.ty_param("__D")
-        .trait_bound(builder.path()
-                     .segment("_serde").build()
-                     .segment("de").build()
-                     .id("Deserializer")
-                     .build())
-        .build()
-        .build()
-}
-
-fn deserializer_ty_arg(builder: &aster::AstBuilder) -> P<ast::Ty>{
-    builder.ty().id("__D")
-}
-
 fn deserialize_unit_struct(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
     type_ident: Ident,
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let type_name = name_expr(builder, item_attrs.name());
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         struct __Visitor;
 
         impl _serde::de::Visitor for __Visitor {
@@ -300,7 +274,7 @@ fn deserialize_unit_struct(
         }
 
         deserializer.deserialize_unit_struct($type_name, __Visitor)
-    })
+    }).unwrap()
 }
 
 fn deserialize_tuple(
@@ -312,14 +286,12 @@ fn deserialize_tuple(
     ty: P<ast::Ty>,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let where_clause = &impl_generics.where_clause;
 
-    let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = deserialize_visitor(
+    let (visitor_item, visitor_ty, visitor_expr) = deserialize_visitor(
         builder,
         impl_generics,
-        vec![deserializer_ty_param(builder)],
-        vec![deserializer_ty_arg(builder)],
     );
 
     let is_enum = variant_ident.is_some();
@@ -343,7 +315,7 @@ fn deserialize_tuple(
         None
     };
 
-    let visit_seq_expr = deserialize_seq(
+    let visit_seq = deserialize_seq(
         cx,
         builder,
         type_ident,
@@ -366,24 +338,22 @@ fn deserialize_tuple(
             deserializer.deserialize_tuple_struct($type_name, $nfields, $visitor_expr))
     };
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         $visitor_item
 
-        impl $visitor_generics _serde::de::Visitor for $visitor_ty $where_clause {
+        impl $impl_generics _serde::de::Visitor for $visitor_ty $where_clause {
             type Value = $ty;
 
             $visit_newtype_struct
 
             #[inline]
             fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
-                where __V: _serde::de::SeqVisitor,
-            {
-                $visit_seq_expr
-            }
+                where __V: _serde::de::SeqVisitor
+            $visit_seq
         }
 
         $dispatch
-    })
+    }).unwrap()
 }
 
 fn deserialize_seq(
@@ -394,7 +364,7 @@ fn deserialize_seq(
     impl_generics: &ast::Generics,
     fields: &[Field],
     is_struct: bool,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let mut index_in_seq = 0usize;
     let let_values: Vec<_> = fields.iter()
         .enumerate()
@@ -461,13 +431,13 @@ fn deserialize_seq(
             .build()
     };
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         $let_values
 
         try!(visitor.end());
 
         Ok($result)
-    })
+    }).unwrap()
 }
 
 fn deserialize_newtype_struct(
@@ -513,14 +483,12 @@ fn deserialize_struct(
     ty: P<ast::Ty>,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let where_clause = &impl_generics.where_clause;
 
-    let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = deserialize_visitor(
+    let (visitor_item, visitor_ty, visitor_expr) = deserialize_visitor(
         builder,
-        &impl_generics,
-        vec![deserializer_ty_param(builder)],
-        vec![deserializer_ty_arg(builder)],
+        impl_generics,
     );
 
     let type_path = match variant_ident {
@@ -528,7 +496,7 @@ fn deserialize_struct(
         None => builder.path().id(type_ident).build(),
     };
 
-    let visit_seq_expr = deserialize_seq(
+    let visit_seq = deserialize_seq(
         cx,
         builder,
         type_ident,
@@ -538,7 +506,7 @@ fn deserialize_struct(
         true,
     );
 
-    let (field_visitor, fields_stmt, visit_map_expr) = deserialize_struct_visitor(
+    let (field_visitor, fields_stmt, visit_map) = deserialize_struct_visitor(
         cx,
         builder,
         type_ident,
@@ -558,33 +526,29 @@ fn deserialize_struct(
             deserializer.deserialize_struct($type_name, FIELDS, $visitor_expr))
     };
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         $field_visitor
 
         $visitor_item
 
-        impl $visitor_generics _serde::de::Visitor for $visitor_ty $where_clause {
+        impl $impl_generics _serde::de::Visitor for $visitor_ty $where_clause {
             type Value = $ty;
 
             #[inline]
             fn visit_seq<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
-                where __V: _serde::de::SeqVisitor,
-            {
-                $visit_seq_expr
-            }
+                where __V: _serde::de::SeqVisitor
+            $visit_seq
 
             #[inline]
             fn visit_map<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
-                where __V: _serde::de::MapVisitor,
-            {
-                $visit_map_expr
-            }
+                where __V: _serde::de::MapVisitor
+            $visit_map
         }
 
         $fields_stmt
 
         $dispatch
-    })
+    }).unwrap()
 }
 
 fn deserialize_item_enum(
@@ -595,7 +559,7 @@ fn deserialize_item_enum(
     ty: P<ast::Ty>,
     variants: &[Variant],
     item_attrs: &attr::Item
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let where_clause = &impl_generics.where_clause;
 
     let type_name = name_expr(builder, item_attrs.name());
@@ -633,7 +597,7 @@ fn deserialize_item_enum(
             .id("__Field").id(format!("__field{}", i))
             .build();
 
-        let expr = deserialize_variant(
+        let block = deserialize_variant(
             cx,
             builder,
             type_ident,
@@ -643,24 +607,22 @@ fn deserialize_item_enum(
             item_attrs,
         );
 
-        let arm = quote_arm!(cx, $variant_name => { $expr });
+        let arm = quote_arm!(cx, $variant_name => $block);
         variant_arms.push(arm);
     }
     variant_arms.extend(ignored_arm.into_iter());
 
-    let (visitor_item, visitor_ty, visitor_expr, visitor_generics) = deserialize_visitor(
+    let (visitor_item, visitor_ty, visitor_expr) = deserialize_visitor(
         builder,
         impl_generics,
-        vec![deserializer_ty_param(builder)],
-        vec![deserializer_ty_arg(builder)],
     );
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         $variant_visitor
 
         $visitor_item
 
-        impl $visitor_generics _serde::de::EnumVisitor for $visitor_ty $where_clause {
+        impl $impl_generics _serde::de::EnumVisitor for $visitor_ty $where_clause {
             type Value = $ty;
 
             fn visit<__V>(&mut self, mut visitor: __V) -> ::std::result::Result<$ty, __V::Error>
@@ -675,7 +637,7 @@ fn deserialize_item_enum(
         $variants_stmt
 
         deserializer.deserialize_enum($type_name, VARIANTS, $visitor_expr)
-    })
+    }).unwrap()
 }
 
 fn deserialize_variant(
@@ -686,15 +648,15 @@ fn deserialize_variant(
     ty: P<ast::Ty>,
     variant: &Variant,
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let variant_ident = variant.ident;
 
     match variant.style {
         Style::Unit => {
-            quote_expr!(cx, {
+            quote_block!(cx, {
                 try!(visitor.visit_unit());
                 Ok($type_ident::$variant_ident)
-            })
+            }).unwrap()
         }
         Style::Newtype => {
             deserialize_newtype_variant(
@@ -740,7 +702,7 @@ fn deserialize_newtype_variant(
     variant_ident: Ident,
     impl_generics: &ast::Generics,
     field: &Field,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let visit = match field.attrs.deserialize_with() {
         None => {
             let field_ty = &field.ty;
@@ -756,7 +718,9 @@ fn deserialize_newtype_variant(
             })
         }
     };
-    quote_expr!(cx, Ok($type_ident::$variant_ident($visit)))
+    quote_block!(cx, {
+        Ok($type_ident::$variant_ident($visit))
+    }).unwrap()
 }
 
 fn deserialize_field_visitor(
@@ -805,17 +769,15 @@ fn deserialize_field_visitor(
     let fallthrough_index_arm_expr = if !is_variant && !item_attrs.deny_unknown_fields() {
         quote_expr!(cx, Ok(__Field::__ignore))
     } else {
-        quote_expr!(cx, {
-            Err(_serde::de::Error::invalid_value($index_error_msg))
-        })
+        quote_expr!(cx, Err(_serde::de::Error::invalid_value($index_error_msg)))
     };
 
-    let index_body = quote_expr!(cx,
+    let index_body = quote_block!(cx, {
         match value {
             $index_field_arms
             _ => $fallthrough_index_arm_expr
         }
-    );
+    }).unwrap();
 
     // Convert the field names into byte strings.
     let str_field_names: Vec<_> = field_names.iter()
@@ -835,12 +797,12 @@ fn deserialize_field_visitor(
         quote_expr!(cx, Err(_serde::de::Error::$unknown_ident(value)))
     };
 
-    let str_body = quote_expr!(cx,
+    let str_body = quote_block!(cx, {
         match value {
             $str_field_arms
             _ => $fallthrough_str_arm_expr
         }
-    );
+    }).unwrap();
 
     // Convert the field names into byte strings.
     let bytes_field_names: Vec<_> = field_names.iter()
@@ -866,12 +828,12 @@ fn deserialize_field_visitor(
         })
     };
 
-    let bytes_body = quote_expr!(cx,
+    let bytes_body = quote_block!(cx, {
         match value {
             $bytes_field_arms
             _ => $fallthrough_bytes_arm_expr
         }
-    );
+    }).unwrap();
 
     let impl_item = quote_item!(cx,
         impl _serde::de::Deserialize for __Field {
@@ -879,39 +841,25 @@ fn deserialize_field_visitor(
             fn deserialize<__D>(deserializer: &mut __D) -> ::std::result::Result<__Field, __D::Error>
                 where __D: _serde::de::Deserializer,
             {
-                struct __FieldVisitor<__D> {
-                    phantom: ::std::marker::PhantomData<__D>
-                }
+                struct __FieldVisitor;
 
-                impl<__D> _serde::de::Visitor for __FieldVisitor<__D>
-                    where __D: _serde::de::Deserializer
-                {
+                impl _serde::de::Visitor for __FieldVisitor {
                     type Value = __Field;
 
                     fn visit_usize<__E>(&mut self, value: usize) -> ::std::result::Result<__Field, __E>
-                        where __E: _serde::de::Error,
-                    {
-                        $index_body
-                    }
+                        where __E: _serde::de::Error
+                    $index_body
 
                     fn visit_str<__E>(&mut self, value: &str) -> ::std::result::Result<__Field, __E>
-                        where __E: _serde::de::Error,
-                    {
-                        $str_body
-                    }
+                        where __E: _serde::de::Error
+                    $str_body
 
                     fn visit_bytes<__E>(&mut self, value: &[u8]) -> ::std::result::Result<__Field, __E>
-                        where __E: _serde::de::Error,
-                    {
-                        $bytes_body
-                    }
+                        where __E: _serde::de::Error
+                    $bytes_body
                 }
 
-                deserializer.deserialize_struct_field(
-                    __FieldVisitor::<__D>{
-                        phantom: ::std::marker::PhantomData
-                    }
-                )
+                deserializer.deserialize_struct_field(__FieldVisitor)
             }
         }
     ).unwrap();
@@ -927,7 +875,7 @@ fn deserialize_struct_visitor(
     impl_generics: &ast::Generics,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> (Vec<P<ast::Item>>, ast::Stmt, P<ast::Expr>) {
+) -> (Vec<P<ast::Item>>, ast::Stmt, P<ast::Block>) {
     let field_exprs = fields.iter()
         .map(|field| field.attrs.name().deserialize_name())
         .collect();
@@ -940,7 +888,7 @@ fn deserialize_struct_visitor(
         false,
     );
 
-    let visit_map_expr = deserialize_map(
+    let visit_map = deserialize_map(
         cx,
         builder,
         type_ident,
@@ -968,7 +916,7 @@ fn deserialize_struct_visitor(
         const FIELDS: &'static [&'static str] = $fields_expr;
     ).unwrap();
 
-    (field_visitor, fields_stmt, visit_map_expr)
+    (field_visitor, fields_stmt, visit_map)
 }
 
 fn deserialize_map(
@@ -979,7 +927,7 @@ fn deserialize_map(
     impl_generics: &ast::Generics,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     // Create the field names for the fields.
     let fields_names = fields.iter()
         .enumerate()
@@ -1086,7 +1034,7 @@ fn deserialize_map(
         )
         .build();
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         $let_values
 
         while let Some(key) = try!(visitor.visit_key::<__Field>()) {
@@ -1102,7 +1050,7 @@ fn deserialize_map(
         $extract_values
 
         Ok($result)
-    })
+    }).unwrap()
 }
 
 /// This function wraps the expression in `#[serde(deserialize_with="...")]` in

serde_codegen/src/lib.rs

@@ -1,7 +1,7 @@
-#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
-#![cfg_attr(feature = "nightly-testing", feature(plugin))]
-#![cfg_attr(feature = "nightly-testing", allow(too_many_arguments))]
-#![cfg_attr(feature = "nightly-testing", allow(used_underscore_binding))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "clippy", allow(used_underscore_binding))]
 #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
 #![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
 
@@ -40,13 +40,6 @@ pub fn expand<S, D>(src: S, dst: D) -> Result<(), syntex::Error>
     where S: AsRef<Path>,
           D: AsRef<Path>,
 {
-    let mut registry = syntex::Registry::new();
-    register(&mut registry);
-    registry.expand("", src.as_ref(), dst.as_ref())
-}
-
-#[cfg(feature = "with-syntex")]
-pub fn register(reg: &mut syntex::Registry) {
     use syntax::{ast, fold};
 
     /// Strip the serde attributes from the crate.
@@ -73,6 +66,8 @@ pub fn register(reg: &mut syntex::Registry) {
         fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
     }
 
+    let mut reg = syntex::Registry::new();
+
     reg.add_attr("feature(custom_derive)");
     reg.add_attr("feature(custom_attribute)");
 
@@ -80,6 +75,8 @@ pub fn register(reg: &mut syntex::Registry) {
     reg.add_decorator("derive_Deserialize", de::expand_derive_deserialize);
 
     reg.add_post_expansion_pass(strip_attributes);
+
+    reg.expand("", src.as_ref(), dst.as_ref())
 }
 
 #[cfg(not(feature = "with-syntex"))]

serde_codegen/src/ser.rs

@@ -70,10 +70,8 @@ fn serialize_item(
             #[automatically_derived]
             impl $impl_generics _serde::ser::Serialize for $ty $where_clause {
                 fn serialize<__S>(&self, _serializer: &mut __S) -> ::std::result::Result<(), __S::Error>
-                    where __S: _serde::ser::Serializer,
-                {
-                    $body
-                }
+                    where __S: _serde::ser::Serializer
+                $body
             }
         };
     ).unwrap()
@@ -119,7 +117,7 @@ fn serialize_body(
     item: &Item,
     impl_generics: &ast::Generics,
     ty: P<ast::Ty>,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     match item.body {
         Body::Enum(ref variants) => {
             serialize_item_enum(
@@ -179,12 +177,12 @@ fn serialize_unit_struct(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let type_name = name_expr(builder, item_attrs.name());
 
-    quote_expr!(cx,
+    quote_block!(cx, {
         _serializer.serialize_unit_struct($type_name)
-    )
+    }).unwrap()
 }
 
 fn serialize_newtype_struct(
@@ -194,7 +192,7 @@ fn serialize_newtype_struct(
     item_ty: P<ast::Ty>,
     field: &Field,
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let type_name = name_expr(builder, item_attrs.name());
 
     let mut field_expr = quote_expr!(cx, &self.0);
@@ -203,9 +201,9 @@ fn serialize_newtype_struct(
             &item_ty, impl_generics, &field.ty, path, field_expr);
     }
 
-    quote_expr!(cx,
+    quote_block!(cx, {
         _serializer.serialize_newtype_struct($type_name, $field_expr)
-    )
+    }).unwrap()
 }
 
 fn serialize_tuple_struct(
@@ -215,7 +213,7 @@ fn serialize_tuple_struct(
     ty: P<ast::Ty>,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let serialize_stmts = serialize_tuple_struct_visitor(
         cx,
         builder,
@@ -229,11 +227,11 @@ fn serialize_tuple_struct(
     let type_name = name_expr(builder, item_attrs.name());
     let len = serialize_stmts.len();
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         let mut state = try!(_serializer.serialize_tuple_struct($type_name, $len));
         $serialize_stmts
         _serializer.serialize_tuple_struct_end(state)
-    })
+    }).unwrap()
 }
 
 fn serialize_struct(
@@ -243,7 +241,7 @@ fn serialize_struct(
     ty: P<ast::Ty>,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let serialize_fields = serialize_struct_visitor(
         cx,
         builder,
@@ -268,11 +266,11 @@ fn serialize_struct(
          })
         .fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         let mut state = try!(_serializer.serialize_struct($type_name, $len));
         $serialize_fields
         _serializer.serialize_struct_end(state)
-    })
+    }).unwrap()
 }
 
 fn serialize_item_enum(
@@ -283,7 +281,7 @@ fn serialize_item_enum(
     ty: P<ast::Ty>,
     variants: &[Variant],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let arms: Vec<_> =
         variants.iter()
             .enumerate()
@@ -301,11 +299,11 @@ fn serialize_item_enum(
             })
             .collect();
 
-    quote_expr!(cx,
+    quote_block!(cx, {
         match *self {
             $arms
         }
-    )
+    }).unwrap()
 }
 
 fn serialize_variant(
@@ -326,18 +324,17 @@ fn serialize_variant(
     match variant.style {
         Style::Unit => {
             quote_arm!(cx,
-                $type_ident::$variant_ident => {
+                $type_ident::$variant_ident =>
                     _serde::ser::Serializer::serialize_unit_variant(
                         _serializer,
                         $type_name,
                         $variant_index,
                         $variant_name,
-                    )
-                }
+                    ),
             )
         },
         Style::Newtype => {
-            let expr = serialize_newtype_variant(
+            let block = serialize_newtype_variant(
                 cx,
                 builder,
                 type_name,
@@ -349,7 +346,7 @@ fn serialize_variant(
             );
 
             quote_arm!(cx,
-                $type_ident::$variant_ident(ref __simple_value) => { $expr }
+                $type_ident::$variant_ident(ref __simple_value) => $block
             )
         },
         Style::Tuple => {
@@ -365,7 +362,7 @@ fn serialize_variant(
                 )
                 .build();
 
-            let expr = serialize_tuple_variant(
+            let block = serialize_tuple_variant(
                 cx,
                 builder,
                 type_name,
@@ -377,12 +374,12 @@ fn serialize_variant(
             );
 
             quote_arm!(cx,
-                $pat => { $expr }
+                $pat => $block
             )
         }
         Style::Struct => {
             let mut pat = builder.pat().struct_().id(type_ident).id(variant_ident).build();
-            for field in variant.fields.iter() {
+            for field in &variant.fields {
                 let name = match field.ident {
                     Some(name) => name,
                     None => cx.span_bug(field.span, "struct variant has unnamed fields"),
@@ -395,7 +392,7 @@ fn serialize_variant(
             }
             let pat = pat.build();
 
-            let expr = serialize_struct_variant(
+            let block = serialize_struct_variant(
                 cx,
                 builder,
                 variant_index,
@@ -407,7 +404,7 @@ fn serialize_variant(
             );
 
             quote_arm!(cx,
-                $pat => { $expr }
+                $pat => $block
             )
         }
     }
@@ -422,14 +419,14 @@ fn serialize_newtype_variant(
     item_ty: P<ast::Ty>,
     generics: &ast::Generics,
     field: &Field,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let mut field_expr = quote_expr!(cx, __simple_value);
     if let Some(path) = field.attrs.serialize_with() {
         field_expr = wrap_serialize_with(cx, builder,
             &item_ty, generics, &field.ty, path, field_expr);
     }
 
-    quote_expr!(cx,
+    quote_block!(cx, {
         _serde::ser::Serializer::serialize_newtype_variant(
             _serializer,
             $type_name,
@@ -437,7 +434,7 @@ fn serialize_newtype_variant(
             $variant_name,
             $field_expr,
         )
-    )
+    }).unwrap()
 }
 
 fn serialize_tuple_variant(
@@ -449,7 +446,7 @@ fn serialize_tuple_variant(
     generics: &ast::Generics,
     structure_ty: P<ast::Ty>,
     fields: &[Field],
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
     let serialize_stmts = serialize_tuple_struct_visitor(
         cx,
         builder,
@@ -462,11 +459,11 @@ fn serialize_tuple_variant(
 
     let len = serialize_stmts.len();
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         let mut state = try!(_serializer.serialize_tuple_variant($type_name, $variant_index, $variant_name, $len));
         $serialize_stmts
         _serializer.serialize_tuple_variant_end(state)
-    })
+    }).unwrap()
 }
 
 fn serialize_struct_variant(
@@ -478,7 +475,7 @@ fn serialize_struct_variant(
     ty: P<ast::Ty>,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> P<ast::Block> {
 
     let serialize_fields = serialize_struct_visitor(
         cx,
@@ -504,7 +501,7 @@ fn serialize_struct_variant(
          })
         .fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
 
-    quote_expr!(cx, {
+    quote_block!(cx, {
         let mut state = try!(_serializer.serialize_struct_variant(
             $item_name,
             $variant_index,
@@ -513,7 +510,7 @@ fn serialize_struct_variant(
         ));
         $serialize_fields
         _serializer.serialize_struct_variant_end(state)
-    })
+    }).unwrap()
 }
 
 fn serialize_tuple_struct_visitor(

serde_codegen_internals/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_codegen_internals"
-version = "0.3.0"
+version = "0.5.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "AST representation used by Serde codegen. Unstable."
@@ -11,10 +11,10 @@ include = ["Cargo.toml", "src/**/*.rs"]
 
 [features]
 default = ["with-syntex"]
-nightly-testing = ["clippy"]
+unstable-testing = ["clippy"]
 with-syntex = ["syntex_syntax", "syntex_errors"]
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
-syntex_syntax = { version = "^0.38.0", optional = true }
-syntex_errors = { version = "^0.38.0", optional = true }
+syntex_syntax = { version = "^0.39.0", optional = true }
+syntex_errors = { version = "^0.39.0", optional = true }

serde_codegen_internals/src/lib.rs

@@ -1,5 +1,5 @@
-#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
-#![cfg_attr(feature = "nightly-testing", feature(plugin))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", feature(plugin))]
 #![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
 
 #[cfg(feature = "with-syntex")]

serde_macros/Cargo.toml

@@ -1,39 +1,53 @@
 [package]
 name = "serde_macros"
-# DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH
-# USE THE 0.7.x BRANCH
-version = "0.8.0-rc1"
+version = "0.8.1"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
 repository = "https://github.com/serde-rs/serde"
 documentation = "https://github.com/serde-rs/serde"
 keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
+include = ["Cargo.toml", "src/**/*.rs", "build.rs"]
+build = "build.rs"
 
 [lib]
 name = "serde_macros"
 plugin = true
 
 [features]
-nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
+unstable-testing = [
+    "clippy",
+    "skeptic",
+    "serde_json",
+    "serde/unstable-testing",
+    "serde_codegen/unstable-testing"
+]
+
+[build-dependencies]
+skeptic = { version = "^0.6.0", optional = true }
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
-serde_codegen = { version = "^0.8.0-rc1", default-features = false, features = ["nightly"] }
+serde_codegen = { version = "=0.8.1", default-features = false, features = ["unstable"], path = "../serde_codegen" }
+skeptic = { version = "^0.6.0", optional = true }
+serde_json = { version = "0.8.0", optional = true }
 
 [dev-dependencies]
-clippy = "^0.0.78"
+clippy = "^0.*"
 compiletest_rs = "^0.2.0"
 fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = "0.8.0-rc1"
-serde_test = "0.8.0-rc1"
+serde = { version = "0.8.0", path = "../serde" }
+serde_test = { version = "0.8.0", path = "../serde_test" }
 
 [[test]]
 name = "test"
 path = "tests/test.rs"
 
+[[test]]
+name = "skeptic"
+path = "tests/skeptic.rs"
+
 [[bench]]
 name = "bench"
 path = "benches/bench.rs"

serde_macros/build.rs

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

serde_macros/tests/skeptic.rs

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

serde_macros/tests/test.rs

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

serde_test/Cargo.toml

@@ -1,8 +1,6 @@
 [package]
 name = "serde_test"
-# DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH
-# USE THE 0.7.x BRANCH
-version = "0.8.0-rc1"
+version = "0.8.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"
@@ -13,4 +11,4 @@ keywords = ["serde", "serialization"]
 include = ["Cargo.toml", "src/**/*.rs"]
 
 [dependencies]
-serde = "0.8.0-rc1"
+serde = { version = "0.8.0", path = "../serde" }

serde_test/src/de.rs

@@ -110,6 +110,95 @@ impl<I> de::Deserializer for Deserializer<I>
 {
     type Error = Error;
 
+    fn deserialize_seq<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_struct_field<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_map<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_unit<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_bytes<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_ignored_any<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_string<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_str<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_char<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_bool<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_usize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_isize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+
     fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
         where V: Visitor,
     {
@@ -241,7 +330,7 @@ impl<I> de::Deserializer for Deserializer<I>
         }
     }
 
-    fn deserialize_fixed_size_array<V>(&mut self,
+    fn deserialize_seq_fixed_size<V>(&mut self,
                                        len: usize,
                                        visitor: V) -> Result<V::Value, Error>
         where V: Visitor,

serde_test/src/ser.rs

@@ -259,9 +259,12 @@ impl<'a, I> ser::Serializer for Serializer<'a, I>
         Ok(())
     }
 
-    fn serialize_map_elt<K, V>(&mut self, _: &mut (), key: K, value: V) -> Result<(), Self::Error> where K: Serialize, V: Serialize {
+    fn serialize_map_key<T>(&mut self, _: &mut (), key: T) -> Result<(), Self::Error> where T: Serialize {
         assert_eq!(self.tokens.next(), Some(&Token::MapSep));
-        try!(key.serialize(self));
+        key.serialize(self)
+    }
+
+    fn serialize_map_value<T>(&mut self, _: &mut (), value: T) -> Result<(), Self::Error> where T: Serialize {
         value.serialize(self)
     }
 

testing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_testing"
-version = "0.8.0-rc1"
+version = "0.8.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
@@ -11,16 +11,16 @@ keywords = ["serialization"]
 build = "build.rs"
 
 [features]
-nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
+unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
 
 [build-dependencies]
-serde_codegen = { version = "*", features = ["with-syntex"] }
+serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] }
 
 [dev-dependencies]
 fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = "*"
-serde_test = "*"
+serde = { path = "../serde" }
+serde_test = { path = "../serde_test" }
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }

testing/benches/bench.rs

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

testing/tests/test.rs

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

testing/tests/test.rs.in

@@ -1,3 +1,5 @@
+extern crate serde;
+
 #[macro_use]
 mod macros;
 

testing/tests/test_bytes.rs

@@ -1,20 +1,21 @@
 use std::fmt;
 use std::error;
 
-extern crate serde;
-use self::serde::Serialize;
-use self::serde::bytes::{ByteBuf, Bytes};
+use serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::bytes::{ByteBuf, Bytes};
+use serde::ser;
+use serde::de;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #[derive(Debug, PartialEq)]
 struct Error;
 
-impl serde::ser::Error for Error {
+impl ser::Error for Error {
     fn custom<T: Into<String>>(_: T) -> Error { Error }
 }
 
-impl serde::de::Error for Error {
+impl de::Error for Error {
     fn custom<T: Into<String>>(_: T) -> Error { Error }
 
     fn end_of_stream() -> Error { Error }
@@ -50,7 +51,7 @@ impl BytesSerializer {
     }
 }
 
-impl serde::Serializer for BytesSerializer {
+impl Serializer for BytesSerializer {
     type Error = Error;
     type SeqState = ();
     type MapState = ();
@@ -137,19 +138,19 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_some<V>(&mut self, _value: V) -> Result<(), Error>
-        where V: serde::Serialize,
+        where V: Serialize,
     {
         Err(Error)
     }
 
     fn serialize_newtype_struct<V>(&mut self, _: &'static str, _value: V) -> Result<(), Error>
-        where V: serde::Serialize,
+        where V: Serialize,
     {
         Err(Error)
     }
 
     fn serialize_newtype_variant<V>(&mut self, _: &'static str, _: usize, _: &'static str, _value: V) -> Result<(), Error>
-        where V: serde::Serialize,
+        where V: Serialize,
     {
         Err(Error)
     }
@@ -165,7 +166,7 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_seq_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
-        where T: serde::Serialize
+        where T: Serialize
     {
         Err(Error)
     }
@@ -181,7 +182,7 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_tuple_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
-        where T: serde::Serialize
+        where T: Serialize
     {
         Err(Error)
     }
@@ -197,7 +198,7 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_tuple_struct_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
-        where T: serde::Serialize
+        where T: Serialize
     {
         Err(Error)
     }
@@ -213,7 +214,7 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_tuple_variant_elt<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
-        where T: serde::Serialize
+        where T: Serialize
     {
         Err(Error)
     }
@@ -228,9 +229,14 @@ impl serde::Serializer for BytesSerializer {
         Err(Error)
     }
 
-    fn serialize_map_elt<K, V>(&mut self, _: &mut (), _key: K, _value: V) -> Result<(), Error>
-        where K: serde::Serialize,
-              V: serde::Serialize,
+    fn serialize_map_key<T>(&mut self, _: &mut (), _key: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        Err(Error)
+    }
+
+    fn serialize_map_value<T>(&mut self, _: &mut (), _value: T) -> Result<(), Error>
+        where T: Serialize
     {
         Err(Error)
     }
@@ -246,7 +252,7 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_struct_elt<V>(&mut self, _: &mut (), _key: &'static str, _value: V) -> Result<(), Error>
-        where V: serde::Serialize,
+        where V: Serialize,
     {
         Err(Error)
     }
@@ -262,7 +268,7 @@ impl serde::Serializer for BytesSerializer {
     }
 
     fn serialize_struct_variant_elt<V>(&mut self, _: &mut (), _key: &'static str, _value: V) -> Result<(), Error>
-        where V: serde::Serialize,
+        where V: Serialize,
     {
         Err(Error)
     }
@@ -292,20 +298,137 @@ impl BytesDeserializer {
     }
 }
 
-impl serde::Deserializer for BytesDeserializer {
+impl Deserializer for BytesDeserializer {
     type Error = Error;
 
     fn deserialize<V>(&mut self, _visitor: V) -> Result<V::Value, Error>
-        where V: serde::de::Visitor,
+        where V: de::Visitor,
     {
         Err(Error)
     }
 
     fn deserialize_bytes<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: serde::de::Visitor,
+        where V: de::Visitor,
     {
         visitor.visit_byte_buf(self.bytes.take().unwrap())
     }
+
+    fn deserialize_seq<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_struct_field<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_map<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_unit<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_ignored_any<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_string<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_str<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_char<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_i8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u16<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_u8<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f32<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_f64<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_bool<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_usize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_isize<__V>(&mut self, visitor: __V) -> Result<__V::Value, Self::Error>
+        where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_option<__V>(&mut self, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_seq_fixed_size<__V>(&mut self, _: usize, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_unit_struct<__V>(&mut self, _: &str, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_newtype_struct<__V>(&mut self, _: &str, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_tuple_struct<__V>(&mut self, _: &str, _: usize, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_struct<__V>(&mut self, _: &str, _: &[&str], visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_tuple<__V>(&mut self, _: usize, visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::Visitor {
+        self.deserialize(visitor)
+    }
+    fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _visitor: __V)
+     -> Result<__V::Value, Self::Error> where __V: de::EnumVisitor {
+        Err(Error)
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -328,10 +451,10 @@ fn test_bytes_ser_bytes() {
 #[test]
 fn test_byte_buf_de_bytes() {
     let mut de = BytesDeserializer::new(vec![]);
-    let bytes = serde::Deserialize::deserialize(&mut de);
+    let bytes = Deserialize::deserialize(&mut de);
     assert_eq!(bytes, Ok(ByteBuf::new()));
 
     let mut de = BytesDeserializer::new(vec![1, 2, 3]);
-    let bytes = serde::Deserialize::deserialize(&mut de);
+    let bytes = Deserialize::deserialize(&mut de);
     assert_eq!(bytes, Ok(ByteBuf::from(vec![1, 2, 3])));
 }

testing/tests/test_de.rs

@@ -1,9 +1,9 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::net;
 use std::path::PathBuf;
+use std::time::Duration;
 
-extern crate serde;
-use self::serde::Deserialize;
+use serde::Deserialize;
 
 extern crate fnv;
 use self::fnv::FnvHasher;
@@ -746,6 +746,28 @@ declare_tests! {
             Token::SeqEnd,
         ],
     }
+    test_duration {
+        Duration::new(1, 2) => &[
+            Token::StructStart("Duration", 2),
+                Token::StructSep,
+                Token::Str("secs"),
+                Token::U64(1),
+
+                Token::StructSep,
+                Token::Str("nanos"),
+                Token::U32(2),
+            Token::StructEnd,
+        ],
+        Duration::new(1, 2) => &[
+            Token::SeqStart(Some(2)),
+                Token::SeqSep,
+                Token::I64(1),
+
+                Token::SeqSep,
+                Token::I64(2),
+            Token::SeqEnd,
+        ],
+    }
     test_net_ipv4addr {
         "1.2.3.4".parse::<net::Ipv4Addr>().unwrap() => &[Token::Str("1.2.3.4")],
     }
@@ -764,7 +786,7 @@ declare_tests! {
     }
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 #[test]
 fn test_net_ipaddr() {
     assert_de_tokens(

testing/tests/test_gen.rs

@@ -6,119 +6,184 @@ extern crate serde;
 use self::serde::ser::{Serialize, Serializer};
 use self::serde::de::{Deserialize, Deserializer};
 
+use std::marker::PhantomData;
+
 //////////////////////////////////////////////////////////////////////////
 
-#[derive(Serialize, Deserialize)]
-struct With<T> {
-    t: T,
-    #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-    x: X,
-}
-
-#[derive(Serialize, Deserialize)]
-struct WithRef<'a, T: 'a> {
-    #[serde(skip_deserializing)]
-    t: Option<&'a T>,
-    #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-    x: X,
-}
-
-#[derive(Serialize, Deserialize)]
-struct Bounds<T: Serialize + Deserialize> {
-    t: T,
-    option: Option<T>,
-    boxed: Box<T>,
-    option_boxed: Option<Box<T>>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct NoBounds<T> {
-    t: T,
-    option: Option<T>,
-    boxed: Box<T>,
-    option_boxed: Option<Box<T>>,
-}
-
-#[derive(Serialize, Deserialize)]
-enum EnumWith<T> {
-    Unit,
-    Newtype(
-        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-        X),
-    Tuple(
-        T,
-        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-        X),
-    Struct {
+#[test]
+fn test_gen() {
+    #[derive(Serialize, Deserialize)]
+    struct With<T> {
         t: T,
         #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-        x: X },
-}
+        x: X,
+    }
+    assert::<With<i32>>();
 
-#[derive(Serialize)]
-struct MultipleRef<'a, 'b, 'c, T> where T: 'c, 'c: 'b, 'b: 'a {
-    t: T,
-    rrrt: &'a &'b &'c T,
-}
+    #[derive(Serialize, Deserialize)]
+    struct WithRef<'a, T: 'a> {
+        #[serde(skip_deserializing)]
+        t: Option<&'a T>,
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        x: X,
+    }
+    assert::<WithRef<i32>>();
 
-#[derive(Serialize, Deserialize)]
-struct Newtype(
-    #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-    X
-);
+    #[derive(Serialize, Deserialize)]
+    struct PhantomX {
+        x: PhantomData<X>,
+    }
+    assert::<PhantomX>();
 
-#[derive(Serialize, Deserialize)]
-struct Tuple<T>(
-    T,
-    #[serde(serialize_with="ser_x", deserialize_with="de_x")]
-    X,
-);
+    #[derive(Serialize, Deserialize)]
+    struct PhantomT<T> {
+        t: PhantomData<T>,
+    }
+    assert::<PhantomT<X>>();
 
-#[derive(Serialize, Deserialize)]
-enum TreeNode<D> {
-    Split {
-        left: Box<TreeNode<D>>,
-        right: Box<TreeNode<D>>,
-    },
-    Leaf {
+    #[derive(Serialize, Deserialize)]
+    struct Bounds<T: Serialize + Deserialize> {
+        t: T,
+        option: Option<T>,
+        boxed: Box<T>,
+        option_boxed: Option<Box<T>>,
+    }
+    assert::<Bounds<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct NoBounds<T> {
+        t: T,
+        option: Option<T>,
+        boxed: Box<T>,
+        option_boxed: Option<Box<T>>,
+    }
+    assert::<NoBounds<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    enum EnumWith<T> {
+        Unit,
+        Newtype(
+            #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+            X),
+        Tuple(
+            T,
+            #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+            X),
+        Struct {
+            t: T,
+            #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+            x: X },
+    }
+    assert::<EnumWith<i32>>();
+
+    #[derive(Serialize)]
+    struct MultipleRef<'a, 'b, 'c, T> where T: 'c, 'c: 'b, 'b: 'a {
+        t: T,
+        rrrt: &'a &'b &'c T,
+    }
+    assert_ser::<MultipleRef<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct Newtype(
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        X
+    );
+    assert::<Newtype>();
+
+    #[derive(Serialize, Deserialize)]
+    struct Tuple<T>(
+        T,
+        #[serde(serialize_with="ser_x", deserialize_with="de_x")]
+        X,
+    );
+    assert::<Tuple<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    enum TreeNode<D> {
+        Split {
+            left: Box<TreeNode<D>>,
+            right: Box<TreeNode<D>>,
+        },
+        Leaf {
+            data: D,
+        },
+    }
+    assert::<TreeNode<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct ListNode<D> {
         data: D,
-    },
-}
+        next: Box<ListNode<D>>,
+    }
+    assert::<ListNode<i32>>();
 
-#[derive(Serialize, Deserialize)]
-struct ListNode<D> {
-    data: D,
-    next: Box<ListNode<D>>,
-}
+    #[derive(Serialize, Deserialize)]
+    struct RecursiveA {
+        b: Box<RecursiveB>,
+    }
+    assert::<RecursiveA>();
 
-#[derive(Serialize, Deserialize)]
-#[serde(bound="D: SerializeWith + DeserializeWith")]
-struct WithTraits1<D, E> {
-    #[serde(serialize_with="SerializeWith::serialize_with",
-            deserialize_with="DeserializeWith::deserialize_with")]
-    d: D,
-    #[serde(serialize_with="SerializeWith::serialize_with",
-            deserialize_with="DeserializeWith::deserialize_with",
-            bound="E: SerializeWith + DeserializeWith")]
-    e: E,
-}
+    #[derive(Serialize, Deserialize)]
+    enum RecursiveB {
+        A(RecursiveA),
+    }
+    assert::<RecursiveB>();
 
-#[derive(Serialize, Deserialize)]
-#[serde(bound(serialize="D: SerializeWith",
-              deserialize="D: DeserializeWith"))]
-struct WithTraits2<D, E> {
-    #[serde(serialize_with="SerializeWith::serialize_with",
-            deserialize_with="DeserializeWith::deserialize_with")]
-    d: D,
-    #[serde(serialize_with="SerializeWith::serialize_with",
-            bound(serialize="E: SerializeWith"))]
-    #[serde(deserialize_with="DeserializeWith::deserialize_with",
-            bound(deserialize="E: DeserializeWith"))]
-    e: E,
+    #[derive(Serialize, Deserialize)]
+    struct RecursiveGenericA<T> {
+        t: T,
+        b: Box<RecursiveGenericB<T>>,
+    }
+    assert::<RecursiveGenericA<i32>>();
+
+    #[derive(Serialize, Deserialize)]
+    enum RecursiveGenericB<T> {
+        T(T),
+        A(RecursiveGenericA<T>),
+    }
+    assert::<RecursiveGenericB<i32>>();
+
+    #[derive(Serialize)]
+    struct OptionStatic<'a> {
+        a: Option<&'a str>,
+        b: Option<&'static str>,
+    }
+    assert_ser::<OptionStatic>();
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(bound="D: SerializeWith + DeserializeWith")]
+    struct WithTraits1<D, E> {
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                deserialize_with="DeserializeWith::deserialize_with")]
+        d: D,
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                deserialize_with="DeserializeWith::deserialize_with",
+                bound="E: SerializeWith + DeserializeWith")]
+        e: E,
+    }
+    assert::<WithTraits1<X, X>>();
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(bound(serialize="D: SerializeWith",
+                deserialize="D: DeserializeWith"))]
+    struct WithTraits2<D, E> {
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                deserialize_with="DeserializeWith::deserialize_with")]
+        d: D,
+        #[serde(serialize_with="SerializeWith::serialize_with",
+                bound(serialize="E: SerializeWith"))]
+        #[serde(deserialize_with="DeserializeWith::deserialize_with",
+                bound(deserialize="E: DeserializeWith"))]
+        e: E,
+    }
+    assert::<WithTraits2<X, X>>();
 }
 
 //////////////////////////////////////////////////////////////////////////
 
+fn assert<T: Serialize + Deserialize>() {}
+fn assert_ser<T: Serialize>() {}
+
 trait SerializeWith {
     fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> Result<(), S::Error>;
 }
@@ -129,6 +194,23 @@ trait DeserializeWith: Sized {
 
 // Implements neither Serialize nor Deserialize
 struct X;
-fn ser_x<S: Serializer>(_: &X, _: &mut S) -> Result<(), S::Error> { panic!() }
-fn de_x<D: Deserializer>(_: &mut D) -> Result<X, D::Error> { panic!() }
 
+fn ser_x<S: Serializer>(_: &X, _: &mut S) -> Result<(), S::Error> {
+    unimplemented!()
+}
+
+fn de_x<D: Deserializer>(_: &mut D) -> Result<X, D::Error> {
+    unimplemented!()
+}
+
+impl SerializeWith for X {
+    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> Result<(), S::Error> {
+        unimplemented!()
+    }
+}
+
+impl DeserializeWith for X {
+    fn deserialize_with<D: Deserializer>(_: &mut D) -> Result<Self, D::Error> {
+        unimplemented!()
+    }
+}

testing/tests/test_macros.rs

@@ -39,23 +39,19 @@ struct DeNamedMap<A, B, C> {
 }
 
 #[derive(Debug, PartialEq, Serialize)]
-enum SerEnum<'a, B: 'a, C: /* Trait + */ 'a, D> where D: /* Trait + */ 'a {
+enum SerEnum<'a, B: 'a, C: 'a, D> where D: 'a {
     Unit,
     Seq(
         i8,
         B,
         &'a C,
-        //C::Type,
         &'a mut D,
-        //<D as Trait>::Type,
     ),
     Map {
         a: i8,
         b: B,
         c: &'a C,
-        //d: C::Type,
-        e: &'a mut D,
-        //f: <D as Trait>::Type,
+        d: &'a mut D,
     },
 
     // Make sure we can support more than one variant.
@@ -64,38 +60,30 @@ enum SerEnum<'a, B: 'a, C: /* Trait + */ 'a, D> where D: /* Trait + */ 'a {
         i8,
         B,
         &'a C,
-        //C::Type,
         &'a mut D,
-        //<D as Trait>::Type,
     ),
     _Map2 {
         a: i8,
         b: B,
         c: &'a C,
-        //d: C::Type,
-        e: &'a mut D,
-        //f: <D as Trait>::Type,
+        d: &'a mut D,
     },
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-enum DeEnum<B, C: /* Trait */, D> /* where D: Trait */ {
+enum DeEnum<B, C, D> {
     Unit,
     Seq(
         i8,
         B,
         C,
-        //C::Type,
         D,
-        //<D as Trait>::Type,
     ),
     Map {
         a: i8,
         b: B,
         c: C,
-        //d: C::Type,
-        e: D,
-        //f: <D as Trait>::Type,
+        d: D,
     },
 
     // Make sure we can support more than one variant.
@@ -104,17 +92,13 @@ enum DeEnum<B, C: /* Trait */, D> /* where D: Trait */ {
         i8,
         B,
         C,
-        //C::Type,
         D,
-        //<D as Trait>::Type,
     ),
     _Map2 {
         a: i8,
         b: B,
         c: C,
-        //d: C::Type,
-        e: D,
-        //f: <D as Trait>::Type,
+        d: D,
     },
 }
 
@@ -301,18 +285,14 @@ fn test_ser_enum_seq() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let mut e = 5;
-    //let f = 6;
+    let mut d = 4;
 
     assert_ser_tokens(
         &SerEnum::Seq(
             a,
             b,
             &c,
-            //d,
-            &mut e,
-            //f,
+            &mut d,
         ),
         &[
             Token::EnumSeqStart("SerEnum", "Seq", 4),
@@ -327,7 +307,7 @@ fn test_ser_enum_seq() {
             Token::I32(3),
 
             Token::EnumSeqSep,
-            Token::I32(5),
+            Token::I32(4),
 
             Token::EnumSeqEnd,
         ],
@@ -339,18 +319,14 @@ fn test_ser_enum_map() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let mut e = 5;
-    //let f = 6;
+    let mut d = 4;
 
     assert_ser_tokens(
         &SerEnum::Map {
             a: a,
             b: b,
             c: &c,
-            //d: d,
-            e: &mut e,
-            //f: f,
+            d: &mut d,
         },
         &[
             Token::EnumMapStart("SerEnum", "Map", 4),
@@ -368,8 +344,8 @@ fn test_ser_enum_map() {
             Token::I32(3),
 
             Token::EnumMapSep,
-            Token::Str("e"),
-            Token::I32(5),
+            Token::Str("d"),
+            Token::I32(4),
 
             Token::EnumMapEnd,
         ],
@@ -391,18 +367,14 @@ fn test_de_enum_seq() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let e = 5;
-    //let f = 6;
+    let d = 4;
 
     assert_tokens(
         &DeEnum::Seq(
             a,
             b,
             c,
-            //d,
-            e,
-            //f,
+            d,
         ),
         &[
             Token::EnumSeqStart("DeEnum", "Seq", 4),
@@ -417,7 +389,7 @@ fn test_de_enum_seq() {
             Token::I32(3),
 
             Token::EnumSeqSep,
-            Token::I32(5),
+            Token::I32(4),
 
             Token::EnumSeqEnd,
         ],
@@ -429,18 +401,14 @@ fn test_de_enum_map() {
     let a = 1;
     let b = 2;
     let c = 3;
-    //let d = 4;
-    let e = 5;
-    //let f = 6;
+    let d = 4;
 
     assert_tokens(
         &DeEnum::Map {
             a: a,
             b: b,
             c: c,
-            //d: d,
-            e: e,
-            //f: f,
+            d: d,
         },
         &[
             Token::EnumMapStart("DeEnum", "Map", 4),
@@ -458,8 +426,8 @@ fn test_de_enum_map() {
             Token::I32(3),
 
             Token::EnumMapSep,
-            Token::Str("e"),
-            Token::I32(5),
+            Token::Str("d"),
+            Token::I32(4),
 
             Token::EnumMapEnd,
         ],

testing/tests/test_ser.rs

@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use std::net;
 use std::path::{Path, PathBuf};
 use std::str;
+use std::time::Duration;
 
 extern crate serde_test;
 use self::serde_test::{
@@ -324,6 +325,19 @@ declare_ser_tests! {
             Token::SeqEnd,
         ],
     }
+    test_duration {
+        Duration::new(1, 2) => &[
+            Token::StructStart("Duration", 2),
+                Token::StructSep,
+                Token::Str("secs"),
+                Token::U64(1),
+
+                Token::StructSep,
+                Token::Str("nanos"),
+                Token::U32(2),
+            Token::StructEnd,
+        ],
+    }
     test_net_ipv4addr {
         "1.2.3.4".parse::<net::Ipv4Addr>().unwrap() => &[Token::Str("1.2.3.4")],
     }
@@ -347,7 +361,7 @@ declare_ser_tests! {
     }
 }
 
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
 #[test]
 fn test_net_ipaddr() {
     assert_ser_tokens(