Release 0.8.11

Allow the use of `IpAddr` implementations on stable

.cargo/config

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

.travis.yml

@@ -24,14 +24,12 @@ script:
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
 - (cd testing && travis-cargo --skip nightly test)
 - (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
-- (cd serde_macros && travis-cargo --only nightly test -- --features unstable-testing)
-#- (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
-#- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
+- (cd serde_derive && travis-cargo --only nightly test)
+- (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
+- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
 - (cd serde && travis-cargo --only stable doc)
 after_success:
-- (cd serde && travis-cargo --only stable doc-upload)
 - (cd testing && travis-cargo --only stable coveralls --no-sudo)
 env:
   global:
   - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-  - secure: Jcd11Jy0xLyacBUB+oKOaxKBm9iZNInenRDtNBY8GKOtqF5fHUfEjgDf538hwRl5L0FP7DLr8oK0IHmzA7lPjJxlzoKVKV3IM7bRZEYzW5DMonf/lcliuGte7SH0NVFhifM87T8HI2hjGdAb+7+m34siBR7M3AY/XjLInrvUFvY=

README.md

@@ -1,215 +1,24 @@
-Serde Rust Serialization Framework
-==================================
+# Serde   [![Build Status](https://api.travis-ci.org/serde-rs/serde.svg?branch=master)](https://travis-ci.org/serde-rs/serde) [![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde)
 
-[![Build Status](https://api.travis-ci.org/serde-rs/serde.svg?branch=master)](https://travis-ci.org/serde-rs/serde)
-[![Coverage Status](https://coveralls.io/repos/serde-rs/serde/badge.svg?branch=master&service=github)](https://coveralls.io/github/serde-rs/serde?branch=master)
-[![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde)
-[![Clippy Linting Result](https://clippy.bashy.io/github/serde-rs/serde/master/badge.svg)](https://clippy.bashy.io/github/serde-rs/serde/master/log)
+**Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
 
-Serde is a powerful framework that enables serialization libraries to
-generically serialize Rust data structures without the overhead of runtime type
-information. In many situations, the handshake protocol between serializers and
-serializees can be completely optimized away, leaving Serde to perform roughly
-the same speed as a hand written serializer for a specific type.
+---
 
-[Documentation](https://serde-rs.github.io/serde/serde/index.html)
+You may be looking for:
 
-Simple Serde Example
-====================
+- [An overview of Serde](https://serde.rs/)
+- [Data formats supported by Serde](https://serde.rs/#data-formats)
+- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/codegen.html)
+- [Examples](https://serde.rs/examples.html)
+- [API documentation](https://docs.serde.rs/serde/)
 
-Here is a simple example that uses
-[serde_json](https://github.com/serde-rs/json), which uses Serde under the
-covers, to generate and parse JSON. First, lets start off with the `Cargo.toml`
-file:
-
-```toml
-[package]
-name = "serde_example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-
-[dependencies]
-serde_json = "*"
-```
-
-Next, the `src/main.rs` file itself:
-
-```rust,ignore
-extern crate serde_json;
-
-use std::collections::HashMap;
-use serde_json::Value;
-use serde_json::builder::{ArrayBuilder, ObjectBuilder};
-
-fn main() {
-    // Serde has support for many of the builtin Rust types, like arrays..:
-    let v = vec![1, 2];
-    let serialized = serde_json::to_string(&v).unwrap();
-    println!("serialized vec: {:?}", serialized);
-
-    let deserialized: Vec<u32> = serde_json::from_str(&serialized).unwrap();
-    println!("deserialized vec: {:?}", deserialized);
-
-    // ... and maps:
-    let mut map = HashMap::new();
-    map.insert("x".to_string(), 1);
-    map.insert("y".to_string(), 2);
-
-    let serialized = serde_json::to_string(&map).unwrap();
-    println!("serialized map: {:?}", serialized);
-
-    let deserialized: HashMap<String, u32> = serde_json::from_str(&serialized).unwrap();
-    println!("deserialized map: {:?}", deserialized);
-
-    // It also can handle complex objects:
-    let value = ObjectBuilder::new()
-        .insert("int", 1)
-        .insert("string", "a string")
-        .insert("array", ArrayBuilder::new()
-                .push(1)
-                .push(2)
-                .unwrap())
-        .unwrap();
-
-    let serialized = serde_json::to_string(&value).unwrap();
-    println!("serialized value: {:?}", serialized);
-
-    let deserialized: serde_json::Value = serde_json::from_str(&serialized).unwrap();
-    println!("deserialized value: {:?}", deserialized);
-}
-```
-
-This produces the following output when run:
-
-```sh
-% cargo run
-serialized vec: "[1,2]"
-deserialized vec: [1, 2]
-serialized map: "{\"y\":2,\"x\":1}"
-deserialized map: {"y": 2, "x": 1}
-serialized value: "{\"array\":[1,2],\"int\":1,\"string\":\"a string\"}"
-deserialized value: {"array":[1,2],"int":1,"string":"a string"}
-```
-
-Using Serde with Stable Rust and serde\_codegen
-===============================================
-
-The example before used `serde_json::Value` as the in-memory representation of
-the JSON value, but it's also possible for Serde to serialize to and from
-regular Rust types. However, the code to do this can be a bit complicated to
-write. So instead, Serde also has some powerful code generation libraries that
-work with Stable and Nightly Rust that eliminate much of the complexity of hand
-rolling serialization and deserialization for a given type.
-
-First lets see how we would use Stable Rust, which is currently a tad more
-complicated than Nightly Rust due to having to work around compiler plugins
-being unstable.  We will use `serde_codegen` which is based on the code
-generation library [syntex](https://github.com/serde-rs/syntex). First we need
-to setup the `Cargo.toml` that builds the project:
-
-```toml
-[package]
-name = "serde_example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-build = "build.rs"
-
-[build-dependencies]
-serde_codegen = "*"
-
-[dependencies]
-serde = "*"
-serde_json = "*"
-```
-
-Next, we define our source file, `src/main.rs.in`. Note this is a different
-extension than usual because we need to do code generation:
-
-```rust,ignore
-#[derive(Serialize, Deserialize, Debug)]
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-fn main() {
-    let point = Point { x: 1, y: 2 };
-
-    let serialized = serde_json::to_string(&point).unwrap();
-    println!("{}", serialized);
-
-    let deserialized: Point = serde_json::from_str(&serialized).unwrap();
-    println!("{:?}", deserialized);
-}
-```
-
-To finish up the main source code, we define a very simple `src/main.rs` that
-uses the generated code.
-
-`src/main.rs`:
-
-```rust,ignore
-extern crate serde;
-extern crate serde_json;
-
-include!(concat!(env!("OUT_DIR"), "/main.rs"));
-```
-
-The last step is to actually drive the code generation, with the `build.rs` script:
-
-```rust,ignore
-extern crate serde_codegen;
-
-use std::env;
-use std::path::Path;
-
-pub fn main() {
-    let out_dir = env::var_os("OUT_DIR").unwrap();
-
-    let src = Path::new("src/main.rs.in");
-    let dst = Path::new(&out_dir).join("main.rs");
-
-    serde_codegen::expand(&src, &dst).unwrap();
-}
-```
-
-All this produces this when run:
-
-```sh
-% cargo run
-{"x":1,"y":2}
-Point { x: 1, y: 2 }
-```
-
-While this works well with Stable Rust, be aware that the error locations
-currently are reported in the generated file instead of in the source file.
-
-Using Serde with Nightly Rust and serde\_macros
-===============================================
-
-The prior example is a bit more complicated than it needs to be due to compiler
-plugins being unstable. However, if you are already using Nightly Rust, you can
-use `serde_macros`, which has a much simpler interface. First, here is the new
-`Cargo.toml`:
-
-```toml
-[package]
-name = "serde_example_nightly"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-
-[dependencies]
-serde = "*"
-serde_json = "*"
-serde_macros = "*"
-```
-
-Note that it doesn't need a build script. Now the `src/main.rs`, which enables
-the plugin feature, and registers the `serde_macros` plugin:
+## Serde in action
 
 ```rust
-#![feature(custom_derive, plugin)]
-#![plugin(serde_macros)]
+#![feature(rustc_macro)]
+
+#[macro_use]
+extern crate serde_derive;
 
 extern crate serde_json;
 
@@ -222,611 +31,41 @@ struct Point {
 fn main() {
     let point = Point { x: 1, y: 2 };
 
-    let serialized = serde_json::to_string(&point).unwrap();
-    println!("{}", serialized);
-
-    let deserialized: Point = serde_json::from_str(&serialized).unwrap();
-    println!("{:?}", deserialized);
-}
-```
-
-This also produces the same output:
-
-```sh
-% cargo run
-{"x":1,"y":2}
-Point { x: 1, y: 2 }
-```
-
-You may find it easier to develop with Nightly Rust and `serde\_macros`, then
-deploy with Stable Rust and `serde_codegen`. It's possible to combine both
-approaches in one setup:
-
-`Cargo.toml`:
-
-```toml
-[package]
-name = "serde_example"
-version = "0.1.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-build = "build.rs"
-
-[features]
-default = ["serde_codegen"]
-nightly = ["serde_macros"]
-
-[build-dependencies]
-serde_codegen = { version = "*", optional = true }
-
-[dependencies]
-serde = "*"
-serde_json = "*"
-serde_macros = { version = "*", optional = true }
-```
-
-`build.rs`:
-
-```rust,ignore
-#[cfg(not(feature = "serde_macros"))]
-mod inner {
-    extern crate serde_codegen;
-
-    use std::env;
-    use std::path::Path;
-
-    pub fn main() {
-        let out_dir = env::var_os("OUT_DIR").unwrap();
-
-        let src = Path::new("src/main.rs.in");
-        let dst = Path::new(&out_dir).join("main.rs");
-
-        serde_codegen::expand(&src, &dst).unwrap();
-    }
-}
-
-#[cfg(feature = "serde_macros")]
-mod inner {
-    pub fn main() {}
-}
-
-fn main() {
-    inner::main();
-}
-```
-
-`src/main.rs`:
-
-```rust,ignore
-#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))]
-#![cfg_attr(feature = "serde_macros", plugin(serde_macros))]
-
-extern crate serde;
-extern crate serde_json;
-
-#[cfg(feature = "serde_macros")]
-include!("main.rs.in");
-
-#[cfg(not(feature = "serde_macros"))]
-include!(concat!(env!("OUT_DIR"), "/main.rs"));
-```
-
-The `src/main.rs.in` is the same as before.
-
-Then to run with stable:
-
-```sh
-% cargo build
-...
-```
-
-Or with nightly:
-
-```sh
-% cargo build --features nightly --no-default-features
-...
-```
-
-Serialization without Macros
-============================
-
-Under the covers, Serde extensively uses the Visitor pattern to thread state
-between the
-[Serializer](http://serde-rs.github.io/serde/serde/serde/ser/trait.Serializer.html)
-and
-[Serialize](http://serde-rs.github.io/serde/serde/serde/ser/trait.Serialize.html)
-without the two having specific information about each other's concrete type.
-This has many of the same benefits as frameworks that use runtime type
-information without the overhead.  In fact, when compiling with optimizations,
-Rust is able to remove most or all the visitor state, and generate code that's
-nearly as fast as a hand written serializer format for a specific type.
-
-To see it in action, lets look at how a simple type like `i32` is serialized.
-The
-[Serializer](http://serde-rs.github.io/serde/serde/serde/ser/trait.Serializer.html)
-is threaded through the type:
-
-```rust,ignore
-impl serde::Serialize for i32 {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: serde::Serializer,
-    {
-        serializer.serialize_i32(*self)
-    }
-}
-```
-
-As you can see it's pretty simple. More complex types like `BTreeMap` need to
-pass a
-[MapVisitor](http://serde-rs.github.io/serde/serde/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:
-
-```rust,ignore
-impl<K, V> Serialize for BTreeMap<K, V>
-    where K: Serialize + Ord,
-          V: Serialize,
-{
-    #[inline]
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: Serializer,
-    {
-        serializer.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,
-        }
-    }
-}
-
-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
-    }
-}
-```
-
-Serializing structs follow this same pattern. In fact, structs are represented
-as a named map. Its visitor uses a simple state machine to iterate through all
-the fields:
-
-```rust
-extern crate serde;
-extern crate serde_json;
-
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-impl serde::Serialize for Point {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
-        where S: serde::Serializer
-    {
-        serializer.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)
-            }
-        }
-    }
-}
-
-fn main() {
-    let point = Point { x: 1, y: 2 };
+    // Convert the Point to a JSON string.
     let serialized = serde_json::to_string(&point).unwrap();
 
-    println!("{}", serialized);
-}
-```
-
-Deserialization without Macros
-==============================
-
-Deserialization is a little more complicated since there's a bit more error
-handling that needs to occur. Let's start with the simple `i32`
-[Deserialize](http://serde-rs.github.io/serde/serde/serde/de/trait.Deserialize.html)
-implementation. It passes a
-[Visitor](http://serde-rs.github.io/serde/serde/serde/de/trait.Visitor.html) to the
-[Deserializer](http://serde-rs.github.io/serde/serde/serde/de/trait.Deserializer.html).
-The [Visitor](http://serde-rs.github.io/serde/serde/serde/de/trait.Visitor.html)
-can create the `i32` from a variety of different types:
-
-```rust,ignore
-impl Deserialize for i32 {
-    fn deserialize<D>(deserializer: &mut D) -> Result<i32, D::Error>
-        where D: serde::Deserializer,
-    {
-        deserializer.deserialize(I32Visitor)
-    }
-}
-
-struct I32Visitor;
-
-impl serde::de::Visitor for I32Visitor {
-    type Value = i32;
-
-    fn visit_i16<E>(&mut self, value: i16) -> Result<i32, E>
-        where E: Error,
-    {
-        self.visit_i32(value as i32)
-    }
-
-    fn visit_i32<E>(&mut self, value: i32) -> Result<i32, E>
-        where E: Error,
-    {
-        Ok(value)
-    }
-
-    ...
-
-```
-
-Since it's possible for this type to get passed an unexpected type, we need a
-way to error out. This is done by way of the
-[Error](http://serde-rs.github.io/serde/serde/serde/de/trait.Error.html) trait,
-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:
-
-```rust,ignore
-    ...
-
-    fn visit_string<E>(&mut self, _: String) -> Result<i32, E>
-        where E: Error,
-    {
-        Err(serde::de::Error::custom("expect a string"))
-    }
-
-    ...
-
-```
-
-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
-[Deserializer](http://serde-rs.github.io/serde/serde/serde/de/trait.Deserializer.html).
-
-```rust,ignore
-impl<K, V> serde::Deserialize for BTreeMap<K, V>
-    where K: serde::Deserialize + Eq + Ord,
-          V: serde::Deserialize,
-{
-    fn deserialize<D>(deserializer: &mut D) -> Result<BTreeMap<K, V>, D::Error>
-        where D: serde::Deserializer,
-    {
-        deserializer.deserialize(BTreeMapVisitor::new())
-    }
-}
-
-pub struct BTreeMapVisitor<K, V> {
-    marker: PhantomData<BTreeMap<K, V>>,
-}
-
-impl<K, V> BTreeMapVisitor<K, V> {
-    pub fn new() -> Self {
-        BTreeMapVisitor {
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<K, V> serde::de::Visitor for BTreeMapVisitor<K, V>
-    where K: serde::de::Deserialize + Ord,
-          V: serde::de::Deserialize
-{
-    type Value = BTreeMap<K, V>;
-
-    fn visit_unit<E>(&mut self) -> Result<BTreeMap<K, V>, E>
-        where E: Error,
-    {
-        Ok(BTreeMap::new())
-    }
-
-    fn visit_map<V_>(&mut self, mut visitor: V_) -> Result<BTreeMap<K, V>, V_::Error>
-        where V_: MapVisitor,
-    {
-        let mut values = BTreeMap::new();
-
-        while let Some((key, value)) = try!(visitor.visit()) {
-            values.insert(key, value);
-        }
-
-        try!(visitor.end());
-
-        Ok(values)
-    }
-}
-```
-
-Deserializing structs goes a step further in order to support not allocating a
-`String` to hold the field names. This is done by custom field enum that
-deserializes an enum variant from a string. So for our `Point` example from
-before, we need to generate:
-
-```rust
-extern crate serde;
-extern crate serde_json;
-
-#[derive(Debug)]
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-enum PointField {
-    X,
-    Y,
-}
-
-impl serde::Deserialize for PointField {
-    fn deserialize<D>(deserializer: &mut D) -> Result<PointField, D::Error>
-        where D: serde::de::Deserializer
-    {
-        struct PointFieldVisitor;
-
-        impl serde::de::Visitor for PointFieldVisitor {
-            type Value = PointField;
-
-            fn visit_str<E>(&mut self, value: &str) -> Result<PointField, E>
-                where E: serde::de::Error
-            {
-                match value {
-                    "x" => Ok(PointField::X),
-                    "y" => Ok(PointField::Y),
-                    _ => Err(serde::de::Error::custom("expected x or y")),
-                }
-            }
-        }
-
-        deserializer.deserialize(PointFieldVisitor)
-    }
-}
-
-impl serde::Deserialize for Point {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Point, D::Error>
-        where D: serde::de::Deserializer
-    {
-        static FIELDS: &'static [&'static str] = &["x", "y"];
-        deserializer.deserialize_struct("Point", FIELDS, PointVisitor)
-    }
-}
-
-struct PointVisitor;
-
-impl serde::de::Visitor for PointVisitor {
-    type Value = Point;
-
-    fn visit_map<V>(&mut self, mut visitor: V) -> Result<Point, V::Error>
-        where V: serde::de::MapVisitor
-    {
-        let mut x = None;
-        let mut y = None;
-
-        loop {
-            match try!(visitor.visit_key()) {
-                Some(PointField::X) => { x = Some(try!(visitor.visit_value())); }
-                Some(PointField::Y) => { y = Some(try!(visitor.visit_value())); }
-                None => { break; }
-            }
-        }
-
-        let x = match x {
-            Some(x) => x,
-            None => try!(visitor.missing_field("x")),
-        };
-
-        let y = match y {
-            Some(y) => y,
-            None => try!(visitor.missing_field("y")),
-        };
-
-        try!(visitor.end());
-
-        Ok(Point{ x: x, y: y })
-    }
-}
-
-
-fn main() {
-    let serialized = "{\"x\":1,\"y\":2}";
+    // Prints serialized = {"x":1,"y":2}
+    println!("serialized = {}", serialized);
 
+    // Convert the JSON string back to a Point.
     let deserialized: Point = serde_json::from_str(&serialized).unwrap();
 
-    println!("{:?}", deserialized);
+    // Prints deserialized = Point { x: 1, y: 2 }
+    println!("deserialized = {:?}", deserialized);
 }
 ```
 
-Design Considerations and tradeoffs for Serializers and Deserializers
-=====================================================================
+## Getting help
 
-Serde serialization and deserialization implementations are written in such a
-way that they err on being able to represent more values, and also provide
-better error messages when they are passed an incorrect type to deserialize
-from. For example, by default, it is a syntax error to deserialize a `String`
-into an `Option<String>`. This is implemented such that it is possible to
-distinguish between the values `None` and `Some(())`, if the serialization
-format supports option types.
+Serde developers live in the #serde channel on
+[`irc.mozilla.org`](https://wiki.mozilla.org/IRC). The #rust channel is also a
+good resource with generally faster response time but less specific knowledge
+about Serde. If IRC is not your thing, we are happy to respond to [GitHub
+issues](https://github.com/serde-rs/serde/issues/new) as well.
 
-However, many formats do not have option types, and represents optional values
-as either a `null`, or some other value. Serde `Serializer`s and
-`Deserializer`s can opt-in support for this. For serialization, this is pretty
-easy. Simply implement these methods:
+## License
 
-```rust,ignore
-...
+Serde is licensed under either of
 
-    fn visit_none(&mut self) -> Result<(), Self::Error> {
-        self.visit_unit()
-    }
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   http://opensource.org/licenses/MIT)
 
-    fn visit_some<T>(&mut self, value: T) -> Result<(), Self::Error> {
-        value.serialize(self)
-    }
-...
-```
+at your option.
 
-For deserialization, this can be implemented by way of the
-`Deserializer::visit_option` hook, which presumes that there is some ability to peek at what is the
-next value in the serialized token stream. This following example is from
-[serde_tests::TokenDeserializer](https://github.com/serde-rs/serde/blob/master/serde_tests/tests/token.rs#L435-L454),
-where it checks to see if the next value is an `Option`, a `()`, or some other
-value:
+### Contribution
 
-```rust,ignore
-...
-
-    fn visit_option<V>(&mut self, mut visitor: V) -> Result<V::Value, Error>
-        where V: de::Visitor,
-    {
-        match self.tokens.peek() {
-            Some(&Token::Option(false)) => {
-                self.tokens.next();
-                visitor.visit_none()
-            }
-            Some(&Token::Option(true)) => {
-                self.tokens.next();
-                visitor.visit_some(self)
-            }
-            Some(&Token::Unit) => {
-                self.tokens.next();
-                visitor.visit_none()
-            }
-            Some(_) => visitor.visit_some(self),
-            None => Err(Error::EndOfStreamError),
-        }
-    }
-
-...
-```
-
-Annotations
-===========
-
-`serde_codegen` and `serde_macros` support annotations that help to customize
-how types are serialized. Here are the supported annotations:
-
-Container Annotations:
-
-| Annotation                                  | Function                                                                                                                                           |
-| ----------                                  | --------                                                                                                                                           |
-| `#[serde(rename="name")]`                   | Serialize and deserialize this container with the given name                                                                                       |
-| `#[serde(rename(serialize="name1"))]`       | Serialize this container with the given name                                                                                                       |
-| `#[serde(rename(deserialize="name1"))]`     | Deserialize this container with the given name                                                                                                     |
-| `#[serde(deny_unknown_fields)]`             | Always error during serialization when encountering unknown fields. When absent, unknown fields are ignored for self-describing formats like JSON. |
-| `#[serde(bound="T: MyTrait")]`              | Where-clause for the Serialize and Deserialize impls. This replaces any bounds inferred by Serde.                                                  |
-| `#[serde(bound(serialize="T: MyTrait"))]`   | Where-clause for the Serialize impl.                                                                                                               |
-| `#[serde(bound(deserialize="T: MyTrait"))]` | Where-clause for the Deserialize impl.                                                                                                             |
-
-Variant Annotations:
-
-| Annotation                              | Function                                                   |
-| ----------                              | --------                                                   |
-| `#[serde(rename="name")]`               | Serialize and deserialize this variant with the given name |
-| `#[serde(rename(serialize="name1"))]`   | Serialize this variant with the given name                 |
-| `#[serde(rename(deserialize="name1"))]` | Deserialize this variant with the given name               |
-
-Field Annotations:
-
-| Annotation                                  | Function                                                                                                                |
-| ----------                                  | --------                                                                                                                |
-| `#[serde(rename="name")]`                   | Serialize and deserialize this field with the given name                                                                |
-| `#[serde(rename(serialize="name1"))]`       | Serialize this field with the given name                                                                                |
-| `#[serde(rename(deserialize="name1"))]`     | Deserialize this field with the given name                                                                              |
-| `#[serde(default)]`                         | If the value is not specified, use the `Default::default()`                                                             |
-| `#[serde(default="$path")]`                 | Call the path to a function `fn() -> T` to build the value                                                              |
-| `#[serde(skip_serializing)]`                | Do not serialize this value                                                                                             |
-| `#[serde(skip_deserializing)]`              | Always use `Default::default()` or `#[serde(default="$path")]` instead of deserializing this value                      |
-| `#[serde(skip_serializing_if="$path")]`     | Do not serialize this value if this function `fn(&T) -> bool` returns `true`                                            |
-| `#[serde(serialize_with="$path")]`          | Call a function `fn<S>(&T, &mut S) -> Result<(), S::Error> where S: Serializer` to serialize this value of type `T`     |
-| `#[serde(deserialize_with="$path")]`        | Call a function `fn<D>(&mut D) -> Result<T, D::Error> where D: Deserializer` to deserialize this value of type `T`      |
-| `#[serde(bound="T: MyTrait")]`              | Where-clause for the Serialize and Deserialize impls. This replaces any bounds inferred by Serde for the current field. |
-| `#[serde(bound(serialize="T: MyTrait"))]`   | Where-clause for the Serialize impl.                                                                                    |
-| `#[serde(bound(deserialize="T: MyTrait"))]` | Where-clause for the Deserialize impl.                                                                                  |
-
-Using in `no_std` crates
-========================
-
-The core `serde` package defines a number of features to enable usage in a
-variety of freestanding environments. Enable any or none of the following
-features, and use `default-features = false` in your `Cargo.toml`:
-
-- `alloc` (implies `nightly`)
-- `collections` (implies `alloc` and `nightly`)
-- `std` (default)
-
-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
-=================================
-
-| Format      | Name                                                 |
-| ------      | ----                                                 |
-| 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)        |
-| YAML        | [serde\_yaml](https://github.com/dtolnay/serde-yaml) |
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.

examples/serde-syntex-example/Cargo.toml

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

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
 ```

examples/serde-syntex-example/build.rs

@@ -1,4 +1,4 @@
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 mod inner {
     extern crate serde_codegen;
 
@@ -15,7 +15,7 @@ mod inner {
     }
 }
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 mod inner {
     pub fn main() {}
 }

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

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

serde/Cargo.toml

@@ -1,13 +1,12 @@
 [package]
 name = "serde"
-# DO NOT RELEASE ANY MORE 0.7 RELEASES FROM THIS BRANCH
-# USE THE 0.7.x BRANCH
-version = "0.8.0-rc3"
+version = "0.8.11"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde-rs.github.io/serde/serde/"
+documentation = "https://docs.serde.rs/serde/"
 readme = "../README.md"
 keywords = ["serde", "serialization"]
 include = ["Cargo.toml", "src/**/*.rs"]

serde/src/bytes.rs

@@ -19,6 +19,15 @@ pub struct Bytes<'a> {
     bytes: &'a [u8],
 }
 
+impl<'a> Bytes<'a> {
+    /// Wrap an existing `&[u8]`.
+    pub fn new(bytes: &'a [u8]) -> Self {
+        Bytes {
+            bytes: bytes,
+        }
+    }
+}
+
 impl<'a> fmt::Debug for Bytes<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         try!(f.write_str("b\""));
@@ -31,18 +40,14 @@ impl<'a> fmt::Debug for Bytes<'a> {
 
 impl<'a> From<&'a [u8]> for Bytes<'a> {
     fn from(bytes: &'a [u8]) -> Self {
-        Bytes {
-            bytes: bytes,
-        }
+        Bytes::new(bytes)
     }
 }
 
 #[cfg(any(feature = "std", feature = "collections"))]
 impl<'a> From<&'a Vec<u8>> for Bytes<'a> {
     fn from(bytes: &'a Vec<u8>) -> Self {
-        Bytes {
-            bytes: bytes,
-        }
+        Bytes::new(bytes)
     }
 }
 
@@ -90,15 +95,18 @@ mod bytebuf {
     impl ByteBuf {
         /// Construct a new, empty `ByteBuf`.
         pub fn new() -> Self {
-            ByteBuf {
-                bytes: Vec::new(),
-            }
+            ByteBuf::from(Vec::new())
         }
 
         /// Construct a new, empty `ByteBuf` with the specified capacity.
         pub fn with_capacity(cap: usize) -> Self {
+            ByteBuf::from(Vec::with_capacity(cap))
+        }
+
+        /// Wrap existing bytes in a `ByteBuf`.
+        pub fn from<T: Into<Vec<u8>>>(bytes: T) -> Self {
             ByteBuf {
-                bytes: Vec::with_capacity(cap)
+                bytes: bytes.into(),
             }
         }
     }
@@ -121,9 +129,7 @@ mod bytebuf {
 
     impl From<Vec<u8>> for ByteBuf {
         fn from(bytes: Vec<u8>) -> Self {
-            ByteBuf {
-                bytes: bytes,
-            }
+            ByteBuf::from(bytes)
         }
     }
 
@@ -179,9 +185,7 @@ mod bytebuf {
         fn visit_unit<E>(&mut self) -> Result<ByteBuf, E>
             where E: de::Error,
         {
-            Ok(ByteBuf {
-                bytes: Vec::new(),
-            })
+            Ok(ByteBuf::new())
         }
 
         #[inline]
@@ -197,9 +201,7 @@ mod bytebuf {
 
             try!(visitor.end());
 
-            Ok(ByteBuf {
-                bytes: values,
-            })
+            Ok(ByteBuf::from(values))
         }
 
         #[inline]
@@ -213,9 +215,7 @@ mod bytebuf {
         fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<ByteBuf, E>
             where E: de::Error,
         {
-            Ok(ByteBuf {
-                bytes: v,
-            })
+            Ok(ByteBuf::from(v))
         }
     }
 

serde/src/de/impls.rs

@@ -53,6 +53,9 @@ use alloc::arc::Arc;
 #[cfg(all(feature = "unstable", feature = "alloc", not(feature = "std")))]
 use alloc::boxed::Box;
 
+#[cfg(feature = "std")]
+use std::time::Duration;
+
 #[cfg(feature = "unstable")]
 use core::nonzero::{NonZero, Zeroable};
 
@@ -788,7 +791,7 @@ macro_rules! map_impl {
 #[cfg(any(feature = "std", feature = "collections"))]
 map_impl!(
     BTreeMap<K, V>,
-    BTreeMapVisitor<K: Deserialize + Eq + Ord,
+    BTreeMapVisitor<K: Deserialize + Ord,
                     V: Deserialize>,
     visitor,
     BTreeMap::new(),
@@ -806,7 +809,7 @@ map_impl!(
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#[cfg(all(feature = "unstable", feature = "std"))]
+#[cfg(feature = "std")]
 impl Deserialize for net::IpAddr {
     fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
         where D: Deserializer,
@@ -982,6 +985,135 @@ impl<'a, T: ?Sized> Deserialize for Cow<'a, T> where T: ToOwned, T::Owned: Deser
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// 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 {

serde/src/de/mod.rs

@@ -11,71 +11,6 @@ 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;
@@ -400,8 +335,8 @@ pub trait Deserializer {
     /// This method hints that the `Deserialize` type is expecting a fixed size array. This allows
     /// deserializers to parse arrays that aren't tagged as arrays.
     fn deserialize_seq_fixed_size<V>(&mut self,
-                                       _len: usize,
-                                       visitor: V) -> Result<V::Value, Self::Error>
+                                     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
@@ -418,7 +353,7 @@ pub trait Deserializer {
     /// This method hints that the `Deserialize` type is expecting a unit struct. This allows
     /// deserializers to a unit struct that aren't tagged as a unit struct.
     fn deserialize_unit_struct<V>(&mut self,
-                                  _name: &'static str,
+                                  name: &'static str,
                                   visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
 
@@ -433,7 +368,7 @@ pub trait Deserializer {
     /// This method hints that the `Deserialize` type is expecting a tuple struct. This allows
     /// deserializers to parse sequences that aren't tagged as sequences.
     fn deserialize_tuple_struct<V>(&mut self,
-                                   _name: &'static str,
+                                   name: &'static str,
                                    len: usize,
                                    visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
@@ -441,8 +376,8 @@ pub trait Deserializer {
     /// This method hints that the `Deserialize` type is expecting a struct. This allows
     /// deserializers to parse sequences that aren't tagged as maps.
     fn deserialize_struct<V>(&mut self,
-                             _name: &'static str,
-                             _fields: &'static [&'static str],
+                             name: &'static str,
+                             fields: &'static [&'static str],
                              visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
 
@@ -454,16 +389,16 @@ pub trait Deserializer {
 
     /// This method hints that the `Deserialize` type is expecting a tuple value. This allows
     /// deserializers that provide a custom tuple serialization to properly deserialize the type.
-    fn deserialize_tuple<V>(&mut self, _len: usize, visitor: V) -> Result<V::Value, Self::Error>
+    fn deserialize_tuple<V>(&mut self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
 
     /// This method hints that the `Deserialize` type is expecting an enum value. This allows
     /// deserializers that provide a custom enumeration serialization to properly deserialize the
     /// type.
     fn deserialize_enum<V>(&mut self,
-                           _enum: &'static str,
-                           _variants: &'static [&'static str],
-                           _visitor: V) -> Result<V::Value, Self::Error>
+                           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
@@ -480,9 +415,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))
     }
 
@@ -515,9 +451,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))
     }
 
@@ -550,9 +487,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))
     }
 
@@ -564,9 +502,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))
     }
 
@@ -579,9 +518,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))
     }
 
@@ -605,9 +545,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()
     }
 
@@ -619,37 +560,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))
     }
 
@@ -834,16 +780,16 @@ pub trait VariantVisitor {
     /// 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>
+                      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>
+                       fields: &'static [&'static str],
+                       visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
 }
 

serde/src/de/value.rs

@@ -12,6 +12,8 @@ use std::collections::{
     hash_set,
 };
 #[cfg(feature = "std")]
+use std::borrow::Cow;
+#[cfg(feature = "std")]
 use std::vec;
 
 #[cfg(all(feature = "collections", not(feature = "std")))]
@@ -24,6 +26,8 @@ use collections::{
     btree_set,
     vec,
 };
+#[cfg(all(feature = "collections", not(feature = "std")))]
+use collections::borrow::Cow;
 
 #[cfg(all(feature = "unstable", feature = "collections"))]
 use collections::borrow::ToOwned;
@@ -128,7 +132,7 @@ impl fmt::Display for Error {
                 write!(formatter, "Unknown variant: {}", variant)
             }
             Error::UnknownField(ref field) => write!(formatter, "Unknown field: {}", field),
-            Error::MissingField(ref field) => write!(formatter, "Missing field: {}", field),
+            Error::MissingField(field) => write!(formatter, "Missing field: {}", field),
         }
     }
 }
@@ -174,20 +178,10 @@ 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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple enum ignored_any
     }
 
     fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
@@ -225,21 +219,11 @@ 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
+            forward_to_deserialize! {
+                bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str
+                string unit option seq seq_fixed_size bytes map unit_struct
+                newtype_struct tuple_struct struct struct_field tuple enum
+                ignored_any
             }
 
             fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
@@ -307,20 +291,10 @@ 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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple ignored_any
     }
 }
 
@@ -404,20 +378,10 @@ 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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple ignored_any
     }
 }
 
@@ -463,6 +427,95 @@ impl<'a, E> de::VariantVisitor for StringDeserializer<E>
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/// A helper deserializer that deserializes a `String`.
+#[cfg(any(feature = "std", feature = "collections"))]
+pub struct CowStrDeserializer<'a, E>(Option<Cow<'a, str>>, PhantomData<E>);
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<'a, E> ValueDeserializer<E> for Cow<'a, str>
+    where E: de::Error,
+{
+    type Deserializer = CowStrDeserializer<'a, E>;
+
+    fn into_deserializer(self) -> CowStrDeserializer<'a, E> {
+        CowStrDeserializer(Some(self), PhantomData)
+    }
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<'a, E> de::Deserializer for CowStrDeserializer<'a, E>
+    where E: de::Error,
+{
+    type Error = E;
+
+    fn deserialize<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
+        where V: de::Visitor,
+    {
+        match self.0.take() {
+            Some(Cow::Borrowed(string)) => visitor.visit_str(string),
+            Some(Cow::Owned(string)) => visitor.visit_string(string),
+            None => Err(de::Error::end_of_stream()),
+        }
+    }
+
+    fn deserialize_enum<V>(&mut self,
+                     _name: &str,
+                     _variants: &'static [&'static str],
+                     mut visitor: V) -> Result<V::Value, Self::Error>
+        where V: de::EnumVisitor,
+    {
+        visitor.visit(self)
+    }
+
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple ignored_any
+    }
+}
+
+#[cfg(any(feature = "std", feature = "collections"))]
+impl<'a, E> de::VariantVisitor for CowStrDeserializer<'a, E>
+    where E: de::Error,
+{
+    type Error = E;
+
+    fn visit_variant<T>(&mut self) -> Result<T, Self::Error>
+        where T: de::Deserialize,
+    {
+        de::Deserialize::deserialize(self)
+    }
+
+    fn visit_unit(&mut self) -> Result<(), Self::Error> {
+        Ok(())
+    }
+
+    fn visit_newtype<T>(&mut self) -> Result<T, Self::Error>
+        where T: super::Deserialize,
+    {
+        let (value,) = try!(self.visit_tuple(1, super::impls::TupleVisitor1::new()));
+        Ok(value)
+    }
+
+    fn visit_tuple<V>(&mut self,
+                      _len: usize,
+                      _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::TupleVariant))
+    }
+
+    fn visit_struct<V>(&mut self,
+                       _fields: &'static [&'static str],
+                       _visitor: V) -> Result<V::Value, Self::Error>
+        where V: super::Visitor
+    {
+        Err(super::Error::invalid_type(super::Type::StructVariant))
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 /// A helper deserializer that deserializes a sequence.
 pub struct SeqDeserializer<I, E> {
     iter: I,
@@ -496,21 +549,10 @@ 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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple enum ignored_any
     }
 }
 
@@ -619,21 +661,10 @@ impl<V_, E> de::Deserializer for SeqVisitorDeserializer<V_, E>
         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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple enum ignored_any
     }
 }
 
@@ -648,7 +679,7 @@ pub struct MapDeserializer<I, K, V, E>
 {
     iter: I,
     value: Option<V>,
-    len: usize,
+    len: Option<usize>,
     marker: PhantomData<E>,
 }
 
@@ -658,15 +689,35 @@ impl<I, K, V, E> MapDeserializer<I, K, V, E>
           V: ValueDeserializer<E>,
           E: de::Error,
 {
-    /// Construct a new `MapDeserializer<I, K, V>`.
+    /// Construct a new `MapDeserializer<I, K, V, E>` with a specific length.
     pub fn new(iter: I, len: usize) -> Self {
         MapDeserializer {
             iter: iter,
             value: None,
-            len: len,
+            len: Some(len),
             marker: PhantomData,
         }
     }
+
+    /// Construct a new `MapDeserializer<I, K, V, E>` that is not bounded
+    /// by a specific length and that delegates to `iter` for its size hint.
+    pub fn unbounded(iter: I) -> Self {
+        MapDeserializer {
+            iter: iter,
+            value: None,
+            len: None,
+            marker: PhantomData,
+        }
+    }
+
+    fn next(&mut self) -> Option<(K, V)> {
+        self.iter.next().map(|(k, v)| {
+            if let Some(len) = self.len.as_mut() {
+                *len -= 1;
+            }
+            (k, v)
+        })
+    }
 }
 
 impl<I, K, V, E> de::Deserializer for MapDeserializer<I, K, V, E>
@@ -683,21 +734,26 @@ 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
+    fn deserialize_seq<V_>(&mut self, mut visitor: V_) -> Result<V_::Value, Self::Error>
+        where V_: de::Visitor,
+    {
+        visitor.visit_seq(self)
+    }
+
+    fn deserialize_seq_fixed_size<V_>(&mut self, len: usize, mut visitor: V_) -> Result<V_::Value, Self::Error>
+        where V_: de::Visitor,
+    {
+        match self.len {
+            Some(map_len) if map_len == len => visitor.visit_seq(self),
+            Some(_) => Err(de::Error::invalid_length(len)),
+            None => visitor.visit_seq(self),
+        }
+    }
+
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option bytes map unit_struct newtype_struct tuple_struct struct
+        struct_field tuple enum ignored_any
     }
 }
 
@@ -712,12 +768,11 @@ impl<I, K, V, E> de::MapVisitor for MapDeserializer<I, K, V, E>
     fn visit_key<T>(&mut self) -> Result<Option<T>, Self::Error>
         where T: de::Deserialize,
     {
-        match self.iter.next() {
+        match self.next() {
             Some((key, value)) => {
-                self.len -= 1;
                 self.value = Some(value);
                 let mut de = key.into_deserializer();
-                Ok(Some(try!(de::Deserialize::deserialize(&mut de))))
+                de::Deserialize::deserialize(&mut de).map(Some)
             }
             None => Ok(None),
         }
@@ -738,15 +793,133 @@ impl<I, K, V, E> de::MapVisitor for MapDeserializer<I, K, V, E>
     }
 
     fn end(&mut self) -> Result<(), Self::Error> {
-        if self.len == 0 {
-            Ok(())
-        } else {
-            Err(de::Error::invalid_length(self.len))
+        match self.len {
+            Some(len) if len > 0 => Err(de::Error::invalid_length(len)),
+            _ => Ok(())
         }
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.len, Some(self.len))
+        self.len.map_or_else(
+            || self.iter.size_hint(),
+            |len| (len, Some(len)))
+    }
+}
+
+impl<I, K, V, E> de::SeqVisitor for MapDeserializer<I, K, V, E>
+    where I: Iterator<Item=(K, V)>,
+          K: ValueDeserializer<E>,
+          V: ValueDeserializer<E>,
+          E: de::Error,
+{
+    type Error = E;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Self::Error>
+        where T: de::Deserialize,
+    {
+        match self.next() {
+            Some(kv) => {
+                let mut de = PairDeserializer(Some(kv), PhantomData);
+                de::Deserialize::deserialize(&mut de).map(Some)
+            }
+            None => Ok(None),
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Self::Error> {
+        de::MapVisitor::end(self)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        de::MapVisitor::size_hint(self)
+    }
+}
+
+// Used in the `impl SeqVisitor for MapDeserializer` to visit the map as a
+// sequence of pairs.
+struct PairDeserializer<A, B, E>(Option<(A, B)>, PhantomData<E>);
+
+impl<A, B, E> de::Deserializer for PairDeserializer<A, B, E>
+    where A: ValueDeserializer<E>,
+          B: ValueDeserializer<E>,
+          E: de::Error
+{
+    type Error = E;
+
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option bytes map unit_struct newtype_struct tuple_struct struct
+        struct_field tuple enum ignored_any
+    }
+
+    fn deserialize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+        where V: de::Visitor,
+    {
+        self.deserialize_seq(visitor)
+    }
+
+    fn deserialize_seq<V>(&mut self, mut visitor: V) -> Result<V::Value, Self::Error>
+        where V: de::Visitor,
+    {
+        match self.0.take() {
+            Some((k, v)) => {
+                visitor.visit_seq(PairVisitor(Some(k), Some(v), PhantomData))
+            }
+            None => Err(de::Error::end_of_stream()),
+        }
+    }
+
+    fn deserialize_seq_fixed_size<V>(&mut self, len: usize, visitor: V) -> Result<V::Value, Self::Error>
+        where V: de::Visitor,
+    {
+        if len == 2 {
+            self.deserialize_seq(visitor)
+        } else {
+            Err(de::Error::invalid_length(len))
+        }
+    }
+}
+
+struct PairVisitor<A, B, E>(Option<A>, Option<B>, PhantomData<E>);
+
+impl<A, B, E> de::SeqVisitor for PairVisitor<A, B, E>
+    where A: ValueDeserializer<E>,
+          B: ValueDeserializer<E>,
+          E: de::Error,
+{
+    type Error = E;
+
+    fn visit<T>(&mut self) -> Result<Option<T>, Self::Error>
+        where T: de::Deserialize,
+    {
+        if let Some(k) = self.0.take() {
+            let mut de = k.into_deserializer();
+            de::Deserialize::deserialize(&mut de).map(Some)
+        } else if let Some(v) = self.1.take() {
+            let mut de = v.into_deserializer();
+            de::Deserialize::deserialize(&mut de).map(Some)
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn end(&mut self) -> Result<(), Self::Error> {
+        if self.1.is_none() {
+            Ok(())
+        } else {
+            Err(de::Error::invalid_length(self.size_hint().0))
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = if self.0.is_some() {
+            2
+        } else if self.1.is_some() {
+            1
+        } else {
+            0
+        };
+        (len, Some(len))
     }
 }
 
@@ -811,21 +984,10 @@ impl<V_, E> de::Deserializer for MapVisitorDeserializer<V_, E>
         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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple enum ignored_any
     }
 }
 
@@ -858,25 +1020,13 @@ impl<'a, E> de::Deserializer for BytesDeserializer<'a, 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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple enum ignored_any
     }
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
 
 #[cfg(any(feature = "std", feature = "collections"))]
@@ -909,20 +1059,9 @@ impl<E> de::Deserializer for ByteBufDeserializer<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
+    forward_to_deserialize! {
+        bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+        unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+        tuple_struct struct struct_field tuple enum ignored_any
     }
 }

serde/src/lib.rs

@@ -9,7 +9,7 @@
 //! 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")]
+#![doc(html_root_url="https://docs.serde.rs")]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "unstable", feature(reflect_marker, unicode, nonzero, plugin, step_trait, zero_one))]
 #![cfg_attr(feature = "alloc", feature(alloc))]
@@ -45,6 +45,9 @@ macro_rules! format {
     ($s:expr, $($rest:tt)*) => ($s)
 }
 
+#[macro_use]
+mod macros;
+
 pub mod bytes;
 pub mod de;
 #[cfg(feature = "std")]

serde/src/macros.rs

@@ -0,0 +1,179 @@
+#[cfg(feature = "std")]
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_method {
+    ($func:ident($($arg:ty),*)) => {
+        #[inline]
+        fn $func<__V>(&mut self, $(_: $arg,)* visitor: __V) -> ::std::result::Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor
+        {
+            self.deserialize(visitor)
+        }
+    };
+}
+
+#[cfg(not(feature = "std"))]
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_method {
+    ($func:ident($($arg:ty),*)) => {
+        #[inline]
+        fn $func<__V>(&mut self, $(_: $arg,)* visitor: __V) -> ::core::result::Result<__V::Value, Self::Error>
+            where __V: $crate::de::Visitor
+        {
+            self.deserialize(visitor)
+        }
+    };
+}
+
+#[cfg(feature = "std")]
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_enum {
+    () => {
+        #[inline]
+        fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _: __V) -> ::std::result::Result<__V::Value, Self::Error>
+            where __V: $crate::de::EnumVisitor
+        {
+            Err($crate::de::Error::invalid_type($crate::de::Type::Enum))
+        }
+    };
+}
+
+#[cfg(not(feature = "std"))]
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_enum {
+    () => {
+        #[inline]
+        fn deserialize_enum<__V>(&mut self, _: &str, _: &[&str], _: __V) -> ::core::result::Result<__V::Value, Self::Error>
+            where __V: $crate::de::EnumVisitor
+        {
+            Err($crate::de::Error::invalid_type($crate::de::Type::Enum))
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! forward_to_deserialize_helper {
+    (bool) => {
+        forward_to_deserialize_method!{deserialize_bool()}
+    };
+    (usize) => {
+        forward_to_deserialize_method!{deserialize_usize()}
+    };
+    (u8) => {
+        forward_to_deserialize_method!{deserialize_u8()}
+    };
+    (u16) => {
+        forward_to_deserialize_method!{deserialize_u16()}
+    };
+    (u32) => {
+        forward_to_deserialize_method!{deserialize_u32()}
+    };
+    (u64) => {
+        forward_to_deserialize_method!{deserialize_u64()}
+    };
+    (isize) => {
+        forward_to_deserialize_method!{deserialize_isize()}
+    };
+    (i8) => {
+        forward_to_deserialize_method!{deserialize_i8()}
+    };
+    (i16) => {
+        forward_to_deserialize_method!{deserialize_i16()}
+    };
+    (i32) => {
+        forward_to_deserialize_method!{deserialize_i32()}
+    };
+    (i64) => {
+        forward_to_deserialize_method!{deserialize_i64()}
+    };
+    (f32) => {
+        forward_to_deserialize_method!{deserialize_f32()}
+    };
+    (f64) => {
+        forward_to_deserialize_method!{deserialize_f64()}
+    };
+    (char) => {
+        forward_to_deserialize_method!{deserialize_char()}
+    };
+    (str) => {
+        forward_to_deserialize_method!{deserialize_str()}
+    };
+    (string) => {
+        forward_to_deserialize_method!{deserialize_string()}
+    };
+    (unit) => {
+        forward_to_deserialize_method!{deserialize_unit()}
+    };
+    (option) => {
+        forward_to_deserialize_method!{deserialize_option()}
+    };
+    (seq) => {
+        forward_to_deserialize_method!{deserialize_seq()}
+    };
+    (seq_fixed_size) => {
+        forward_to_deserialize_method!{deserialize_seq_fixed_size(usize)}
+    };
+    (bytes) => {
+        forward_to_deserialize_method!{deserialize_bytes()}
+    };
+    (map) => {
+        forward_to_deserialize_method!{deserialize_map()}
+    };
+    (unit_struct) => {
+        forward_to_deserialize_method!{deserialize_unit_struct(&'static str)}
+    };
+    (newtype_struct) => {
+        forward_to_deserialize_method!{deserialize_newtype_struct(&'static str)}
+    };
+    (tuple_struct) => {
+        forward_to_deserialize_method!{deserialize_tuple_struct(&'static str, usize)}
+    };
+    (struct) => {
+        forward_to_deserialize_method!{deserialize_struct(&'static str, &'static [&'static str])}
+    };
+    (struct_field) => {
+        forward_to_deserialize_method!{deserialize_struct_field()}
+    };
+    (tuple) => {
+        forward_to_deserialize_method!{deserialize_tuple(usize)}
+    };
+    (ignored_any) => {
+        forward_to_deserialize_method!{deserialize_ignored_any()}
+    };
+    (enum) => {
+        forward_to_deserialize_enum!();
+    };
+}
+
+/// Helper to forward `Deserializer` methods to `Deserializer::deserialize`.
+/// Every given method ignores all arguments and forwards to `deserialize`.
+/// Note that `deserialize_enum` simply returns an `Error::invalid_type`; a
+/// better approach is tracked in [serde-rs/serde#521][1].
+///
+/// ```rust,ignore
+/// impl Deserializer for MyDeserializer {
+///     fn deserialize<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+///         where V: Visitor
+///     {
+///         /* ... */
+///     }
+///
+///     forward_to_deserialize! {
+///         bool usize u8 u16 u32 u64 isize i8 i16 i32 i64 f32 f64 char str string
+///         unit option seq seq_fixed_size bytes map unit_struct newtype_struct
+///         tuple_struct struct struct_field tuple enum ignored_any
+///     }
+/// }
+/// ```
+///
+/// [1]: https://github.com/serde-rs/serde/issues/521
+#[macro_export]
+macro_rules! forward_to_deserialize {
+    ($($func:ident)*) => {
+        $(forward_to_deserialize_helper!{$func})*
+    };
+}

serde/src/ser/impls.rs

@@ -50,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;
@@ -157,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)
@@ -174,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)
@@ -522,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)
         }
@@ -623,15 +626,26 @@ impl<T, E> Serialize for Result<T, E> where T: Serialize, E: Serialize {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#[cfg(all(feature = "std", feature = "unstable"))]
+#[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(feature = "std")]
 impl Serialize for net::IpAddr {
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
         where S: Serializer,
     {
-        match *self {
-            net::IpAddr::V4(ref addr) => addr.serialize(serializer),
-            net::IpAddr::V6(ref addr) => addr.serialize(serializer),
-        }
+        self.to_string().serialize(serializer)
     }
 }
 

serde/src/ser/mod.rs

@@ -334,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,39 +1,29 @@
 [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-rc3"
+version = "0.8.11"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://github.com/serde-rs/serde"
+documentation = "https://serde.rs/codegen.html"
 keywords = ["serde", "serialization"]
-build = "build.rs"
-include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
+include = ["Cargo.toml", "src/**/*.rs"]
 
 [features]
 default = ["with-syntex"]
-unstable = ["quasi_macros"]
+unstable = []
 unstable-testing = ["clippy"]
 with-syntex = [
-    "quasi/with-syntex",
-    "quasi_codegen",
-    "quasi_codegen/with-syntex",
-    "serde_codegen_internals/with-syntex",
     "syntex",
     "syntex_syntax",
 ]
-
-[build-dependencies]
-quasi_codegen = { version = "^0.15.0", optional = true }
-syntex = { version = "^0.38.0", optional = true }
+with-syn = []
 
 [dependencies]
-aster = { version = "^0.21.1", 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.4.0-rc1", default-features = false }
-syntex = { version = "^0.38.0", optional = true }
-syntex_syntax = { version = "^0.38.0", optional = true }
+quote = "0.2"
+serde_codegen_internals = { version = "=0.9.0", default-features = false, path = "../serde_codegen_internals" }
+syn = { version = "0.8", features = ["aster", "visit"] }
+syntex = { version = "^0.44.0", optional = true }
+syntex_syntax = { version = "^0.44.0", optional = true }

serde_codegen/build.rs

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

serde_codegen/src/bound.rs

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

serde_codegen/src/lib.rs

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

serde_codegen/src/lib.rs.in

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

serde_codegen/src/ser.rs

@@ -1,104 +1,62 @@
-use aster;
-
-use syntax::ast::{self, Ident, MetaItem};
-use syntax::codemap::Span;
-use syntax::ext::base::{Annotatable, ExtCtxt};
-use syntax::ptr::P;
+use syn::{self, aster};
+use quote::Tokens;
 
 use bound;
-use span;
 use internals::ast::{Body, Field, Item, Style, Variant};
-use internals::{attr, Error};
+use internals::{self, attr};
 
-pub fn expand_derive_serialize(
-    cx: &mut ExtCtxt,
-    span: Span,
-    meta_item: &MetaItem,
-    annotatable: &Annotatable,
-    push: &mut FnMut(Annotatable)
-) {
-    let item = match *annotatable {
-        Annotatable::Item(ref item) => item,
-        _ => {
-            cx.span_err(
-                meta_item.span,
-                "`#[derive(Serialize)]` may only be applied to structs and enums");
-            return;
-        }
-    };
+pub fn expand_derive_serialize(item: &syn::MacroInput) -> Result<Tokens, String> {
+    let ctxt = internals::Ctxt::new();
+    let item = Item::from_ast(&ctxt, item);
+    try!(ctxt.check());
 
-    let item = match Item::from_ast(cx, item) {
-        Ok(item) => item,
-        Err(Error::UnexpectedItemKind) => {
-            cx.span_err(item.span,
-                "`#[derive(Serialize)]` may only be applied to structs and enums");
-            return;
-        }
-    };
+    let impl_generics = build_impl_generics(&item);
 
-    let builder = aster::AstBuilder::new().span(span);
-
-    let impl_item = serialize_item(cx, &builder, &item);
-    push(span::record_expansion(cx, impl_item, "Serialize"))
-}
-
-fn serialize_item(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    item: &Item,
-) -> P<ast::Item> {
-    let impl_generics = build_impl_generics(builder, &item);
-
-    let ty = builder.ty().path()
-        .segment(item.ident).with_generics(impl_generics.clone()).build()
+    let ty = aster::ty().path()
+        .segment(item.ident.clone()).with_generics(impl_generics.clone()).build()
         .build();
 
-    let body = serialize_body(cx,
-                              builder,
-                              &item,
+    let body = serialize_body(&item,
                               &impl_generics,
                               ty.clone());
 
     let where_clause = &impl_generics.where_clause;
 
-    let dummy_const = builder.id(format!("_IMPL_SERIALIZE_FOR_{}", item.ident));
+    let dummy_const = aster::id(format!("_IMPL_SERIALIZE_FOR_{}", item.ident));
 
-    quote_item!(cx,
+    Ok(quote! {
         #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
-        const $dummy_const: () = {
+        const #dummy_const: () = {
             extern crate serde as _serde;
             #[automatically_derived]
-            impl $impl_generics _serde::ser::Serialize for $ty $where_clause {
+            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,
+                    where __S: _serde::ser::Serializer
                 {
-                    $body
+                    #body
                 }
             }
         };
-    ).unwrap()
+    })
 }
 
 // All the generics in the input, plus a bound `T: Serialize` for each generic
 // field type that will be serialized by us.
-fn build_impl_generics(
-    builder: &aster::AstBuilder,
-    item: &Item,
-) -> ast::Generics {
+fn build_impl_generics(item: &Item) -> syn::Generics {
     let generics = bound::without_defaults(item.generics);
 
     let generics = bound::with_where_predicates_from_fields(
-        builder, item, &generics,
+        item, &generics,
         |attrs| attrs.ser_bound());
 
     match item.attrs.ser_bound() {
         Some(predicates) => {
-            bound::with_where_predicates(builder, &generics, predicates)
+            bound::with_where_predicates(&generics, predicates)
         }
         None => {
-            bound::with_bound(builder, item, &generics,
+            bound::with_bound(item, &generics,
                 needs_serialize_bound,
-                &builder.path().ids(&["_serde", "ser", "Serialize"]).build())
+                &aster::path().ids(&["_serde", "ser", "Serialize"]).build())
         }
     }
 }
@@ -114,18 +72,14 @@ fn needs_serialize_bound(attrs: &attr::Field) -> bool {
 }
 
 fn serialize_body(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
     item: &Item,
-    impl_generics: &ast::Generics,
-    ty: P<ast::Ty>,
-) -> P<ast::Expr> {
+    impl_generics: &syn::Generics,
+    ty: syn::Ty,
+) -> Tokens {
     match item.body {
         Body::Enum(ref variants) => {
             serialize_item_enum(
-                cx,
-                builder,
-                item.ident,
+                &item.ident,
                 impl_generics,
                 ty,
                 variants,
@@ -133,12 +87,10 @@ fn serialize_body(
         }
         Body::Struct(Style::Struct, ref fields) => {
             if fields.iter().any(|field| field.ident.is_none()) {
-                cx.span_bug(item.span, "struct has unnamed fields")
+                panic!("struct has unnamed fields");
             }
 
             serialize_struct(
-                cx,
-                builder,
                 impl_generics,
                 ty,
                 fields,
@@ -146,12 +98,10 @@ fn serialize_body(
         }
         Body::Struct(Style::Tuple, ref fields) => {
             if fields.iter().any(|field| field.ident.is_some()) {
-                cx.span_bug(item.span, "tuple struct has named fields")
+                panic!("tuple struct has named fields");
             }
 
             serialize_tuple_struct(
-                cx,
-                builder,
                 impl_generics,
                 ty,
                 fields,
@@ -159,8 +109,6 @@ fn serialize_body(
         }
         Body::Struct(Style::Newtype, ref fields) => {
             serialize_newtype_struct(
-                cx,
-                builder,
                 impl_generics,
                 ty,
                 &fields[0],
@@ -168,129 +116,116 @@ fn serialize_body(
         }
         Body::Struct(Style::Unit, _) => {
             serialize_unit_struct(
-                cx,
-                builder,
                 &item.attrs)
         }
     }
 }
 
-fn serialize_unit_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    item_attrs: &attr::Item,
-) -> P<ast::Expr> {
-    let type_name = name_expr(builder, item_attrs.name());
+fn serialize_unit_struct(item_attrs: &attr::Item) -> Tokens {
+    let type_name = item_attrs.name().serialize_name();
 
-    quote_expr!(cx,
-        _serializer.serialize_unit_struct($type_name)
-    )
+    quote! {
+        _serializer.serialize_unit_struct(#type_name)
+    }
 }
 
 fn serialize_newtype_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    impl_generics: &ast::Generics,
-    item_ty: P<ast::Ty>,
+    impl_generics: &syn::Generics,
+    item_ty: syn::Ty,
     field: &Field,
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
-    let type_name = name_expr(builder, item_attrs.name());
+) -> Tokens {
+    let type_name = item_attrs.name().serialize_name();
 
-    let mut field_expr = quote_expr!(cx, &self.0);
+    let mut field_expr = quote!(&self.0);
     if let Some(path) = field.attrs.serialize_with() {
-        field_expr = wrap_serialize_with(cx, builder,
-            &item_ty, impl_generics, &field.ty, path, field_expr);
+        field_expr = wrap_serialize_with(
+            &item_ty, impl_generics, field.ty, path, field_expr);
     }
 
-    quote_expr!(cx,
-        _serializer.serialize_newtype_struct($type_name, $field_expr)
-    )
+    quote! {
+        _serializer.serialize_newtype_struct(#type_name, #field_expr)
+    }
 }
 
 fn serialize_tuple_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    impl_generics: &ast::Generics,
-    ty: P<ast::Ty>,
+    impl_generics: &syn::Generics,
+    ty: syn::Ty,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> Tokens {
     let serialize_stmts = serialize_tuple_struct_visitor(
-        cx,
-        builder,
         ty.clone(),
         fields,
         impl_generics,
         false,
-        cx.ident_of("serialize_tuple_struct_elt"),
+        aster::id("serialize_tuple_struct_elt"),
     );
 
-    let type_name = name_expr(builder, item_attrs.name());
+    let type_name = item_attrs.name().serialize_name();
     let len = serialize_stmts.len();
+    let let_mut = mut_if(len > 0);
 
-    quote_expr!(cx, {
-        let mut state = try!(_serializer.serialize_tuple_struct($type_name, $len));
-        $serialize_stmts
-        _serializer.serialize_tuple_struct_end(state)
-    })
+    quote! {
+        let #let_mut __serde_state = try!(_serializer.serialize_tuple_struct(#type_name, #len));
+        #(serialize_stmts)*
+        _serializer.serialize_tuple_struct_end(__serde_state)
+    }
 }
 
 fn serialize_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    impl_generics: &ast::Generics,
-    ty: P<ast::Ty>,
+    impl_generics: &syn::Generics,
+    ty: syn::Ty,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> Tokens {
     let serialize_fields = serialize_struct_visitor(
-        cx,
-        builder,
         ty.clone(),
         fields,
         impl_generics,
         false,
-        cx.ident_of("serialize_struct_elt"),
+        aster::id("serialize_struct_elt"),
     );
 
-    let type_name = name_expr(builder, item_attrs.name());
-    let len = fields.iter()
+    let type_name = item_attrs.name().serialize_name();
+
+    let mut serialized_fields = fields.iter()
         .filter(|&field| !field.attrs.skip_serializing())
+        .peekable();
+
+    let let_mut = mut_if(serialized_fields.peek().is_some());
+
+    let len = serialized_fields
         .map(|field| {
-            let ident = field.ident.expect("struct has unnamed fields");
-            let field_expr = quote_expr!(cx, &self.$ident);
+            let ident = field.ident.clone().expect("struct has unnamed fields");
+            let field_expr = quote!(&self.#ident);
 
             match field.attrs.skip_serializing_if() {
-                Some(path) => quote_expr!(cx, if $path($field_expr) { 0 } else { 1 }),
-                None => quote_expr!(cx, 1),
+                Some(path) => quote!(if #path(#field_expr) { 0 } else { 1 }),
+                None => quote!(1),
             }
          })
-        .fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
+        .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
 
-    quote_expr!(cx, {
-        let mut state = try!(_serializer.serialize_struct($type_name, $len));
-        $serialize_fields
-        _serializer.serialize_struct_end(state)
-    })
+    quote! {
+        let #let_mut __serde_state = try!(_serializer.serialize_struct(#type_name, #len));
+        #(serialize_fields)*
+        _serializer.serialize_struct_end(__serde_state)
+    }
 }
 
 fn serialize_item_enum(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    type_ident: Ident,
-    impl_generics: &ast::Generics,
-    ty: P<ast::Ty>,
+    type_ident: &syn::Ident,
+    impl_generics: &syn::Generics,
+    ty: syn::Ty,
     variants: &[Variant],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
+) -> Tokens {
     let arms: Vec<_> =
         variants.iter()
             .enumerate()
             .map(|(variant_index, variant)| {
                 serialize_variant(
-                    cx,
-                    builder,
                     type_ident,
                     impl_generics,
                     ty.clone(),
@@ -301,45 +236,40 @@ fn serialize_item_enum(
             })
             .collect();
 
-    quote_expr!(cx,
+    quote! {
         match *self {
-            $arms
+            #(arms)*
         }
-    )
+    }
 }
 
 fn serialize_variant(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    type_ident: Ident,
-    generics: &ast::Generics,
-    ty: P<ast::Ty>,
+    type_ident: &syn::Ident,
+    generics: &syn::Generics,
+    ty: syn::Ty,
     variant: &Variant,
     variant_index: usize,
     item_attrs: &attr::Item,
-) -> ast::Arm {
-    let type_name = name_expr(builder, item_attrs.name());
+) -> Tokens {
+    let type_name = item_attrs.name().serialize_name();
 
-    let variant_ident = variant.ident;
-    let variant_name = name_expr(builder, variant.attrs.name());
+    let variant_ident = variant.ident.clone();
+    let variant_name = variant.attrs.name().serialize_name();
 
     match variant.style {
         Style::Unit => {
-            quote_arm!(cx,
-                $type_ident::$variant_ident => {
+            quote! {
+                #type_ident::#variant_ident =>
                     _serde::ser::Serializer::serialize_unit_variant(
                         _serializer,
-                        $type_name,
-                        $variant_index,
-                        $variant_name,
-                    )
-                }
-            )
+                        #type_name,
+                        #variant_index,
+                        #variant_name,
+                    ),
+            }
         },
         Style::Newtype => {
-            let expr = serialize_newtype_variant(
-                cx,
-                builder,
+            let block = serialize_newtype_variant(
                 type_name,
                 variant_index,
                 variant_name,
@@ -348,26 +278,21 @@ fn serialize_variant(
                 &variant.fields[0],
             );
 
-            quote_arm!(cx,
-                $type_ident::$variant_ident(ref __simple_value) => { $expr }
-            )
+            quote! {
+                #type_ident::#variant_ident(ref __simple_value) => #block,
+            }
         },
         Style::Tuple => {
-            let field_names: Vec<ast::Ident> = (0 .. variant.fields.len())
-                .map(|i| builder.id(format!("__field{}", i)))
+            let field_names: Vec<Tokens> = (0 .. variant.fields.len())
+                .map(|i| {
+                    let id = aster::id(format!("__field{}", i));
+                    quote!(ref #id)
+                })
                 .collect();
 
-            let pat = builder.pat().enum_()
-                .id(type_ident).id(variant_ident).build()
-                .with_pats(
-                    field_names.iter()
-                        .map(|field| builder.pat().ref_id(field))
-                )
-                .build();
+            let pat = quote!(#type_ident::#variant_ident(#(field_names),*));
 
-            let expr = serialize_tuple_variant(
-                cx,
-                builder,
+            let block = serialize_tuple_variant(
                 type_name,
                 variant_index,
                 variant_name,
@@ -376,28 +301,21 @@ fn serialize_variant(
                 &variant.fields,
             );
 
-            quote_arm!(cx,
-                $pat => { $expr }
-            )
+            quote! {
+                #pat => { #block }
+            }
         }
         Style::Struct => {
-            let mut pat = builder.pat().struct_().id(type_ident).id(variant_ident).build();
-            for field in variant.fields.iter() {
-                let name = match field.ident {
-                    Some(name) => name,
-                    None => cx.span_bug(field.span, "struct variant has unnamed fields"),
+            let fields = variant.fields.iter().map(|field| {
+                let id = match field.ident {
+                    Some(ref name) => name.clone(),
+                    None => panic!("struct variant has unnamed fields"),
                 };
-                pat = pat.with_field_pat(ast::FieldPat {
-                    ident: name,
-                    pat: builder.pat().ref_id(name),
-                    is_shorthand: true,
-                });
-            }
-            let pat = pat.build();
+                quote!(ref #id)
+            });
+            let pat = quote!(#type_ident::#variant_ident { #(fields),* });
 
-            let expr = serialize_struct_variant(
-                cx,
-                builder,
+            let block = serialize_struct_variant(
                 variant_index,
                 variant_name,
                 generics,
@@ -406,237 +324,243 @@ fn serialize_variant(
                 item_attrs,
             );
 
-            quote_arm!(cx,
-                $pat => { $expr }
-            )
+            quote! {
+                #pat => { #block }
+            }
         }
     }
 }
 
 fn serialize_newtype_variant(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    type_name: P<ast::Expr>,
+    type_name: String,
     variant_index: usize,
-    variant_name: P<ast::Expr>,
-    item_ty: P<ast::Ty>,
-    generics: &ast::Generics,
+    variant_name: String,
+    item_ty: syn::Ty,
+    generics: &syn::Generics,
     field: &Field,
-) -> P<ast::Expr> {
-    let mut field_expr = quote_expr!(cx, __simple_value);
+) -> Tokens {
+    let mut field_expr = quote!(__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);
+        field_expr = wrap_serialize_with(
+            &item_ty, generics, field.ty, path, field_expr);
     }
 
-    quote_expr!(cx,
+    quote! {
         _serde::ser::Serializer::serialize_newtype_variant(
             _serializer,
-            $type_name,
-            $variant_index,
-            $variant_name,
-            $field_expr,
+            #type_name,
+            #variant_index,
+            #variant_name,
+            #field_expr,
         )
-    )
+    }
 }
 
 fn serialize_tuple_variant(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    type_name: P<ast::Expr>,
+    type_name: String,
     variant_index: usize,
-    variant_name: P<ast::Expr>,
-    generics: &ast::Generics,
-    structure_ty: P<ast::Ty>,
+    variant_name: String,
+    generics: &syn::Generics,
+    structure_ty: syn::Ty,
     fields: &[Field],
-) -> P<ast::Expr> {
+) -> Tokens {
     let serialize_stmts = serialize_tuple_struct_visitor(
-        cx,
-        builder,
         structure_ty,
         fields,
         generics,
         true,
-        cx.ident_of("serialize_tuple_variant_elt"),
+        aster::id("serialize_tuple_variant_elt"),
     );
 
     let len = serialize_stmts.len();
+    let let_mut = mut_if(len > 0);
 
-    quote_expr!(cx, {
-        let mut state = try!(_serializer.serialize_tuple_variant($type_name, $variant_index, $variant_name, $len));
-        $serialize_stmts
-        _serializer.serialize_tuple_variant_end(state)
-    })
+    quote! {
+        let #let_mut __serde_state = try!(_serializer.serialize_tuple_variant(
+            #type_name,
+            #variant_index,
+            #variant_name,
+            #len));
+        #(serialize_stmts)*
+        _serializer.serialize_tuple_variant_end(__serde_state)
+    }
 }
 
 fn serialize_struct_variant(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
     variant_index: usize,
-    variant_name: P<ast::Expr>,
-    generics: &ast::Generics,
-    ty: P<ast::Ty>,
+    variant_name: String,
+    generics: &syn::Generics,
+    ty: syn::Ty,
     fields: &[Field],
     item_attrs: &attr::Item,
-) -> P<ast::Expr> {
-
+) -> Tokens {
     let serialize_fields = serialize_struct_visitor(
-        cx,
-        builder,
         ty.clone(),
         fields,
-        &generics,
+        generics,
         true,
-        cx.ident_of("serialize_struct_variant_elt"),
+        aster::id("serialize_struct_variant_elt"),
     );
 
-    let item_name = name_expr(builder, item_attrs.name());
-    let len = fields.iter()
+    let item_name = item_attrs.name().serialize_name();
+
+    let mut serialized_fields = fields.iter()
         .filter(|&field| !field.attrs.skip_serializing())
+        .peekable();
+
+    let let_mut = mut_if(serialized_fields.peek().is_some());
+
+    let len = serialized_fields
         .map(|field| {
-            let ident = field.ident.expect("struct has unnamed fields");
-            let field_expr = quote_expr!(cx, $ident);
+            let ident = field.ident.clone().expect("struct has unnamed fields");
 
             match field.attrs.skip_serializing_if() {
-                Some(path) => quote_expr!(cx, if $path($field_expr) { 0 } else { 1 }),
-                None => quote_expr!(cx, 1),
+                Some(path) => quote!(if #path(#ident) { 0 } else { 1 }),
+                None => quote!(1),
             }
          })
-        .fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
+        .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
 
-    quote_expr!(cx, {
-        let mut state = try!(_serializer.serialize_struct_variant(
-            $item_name,
-            $variant_index,
-            $variant_name,
-            $len,
+    quote! {
+        let #let_mut __serde_state = try!(_serializer.serialize_struct_variant(
+            #item_name,
+            #variant_index,
+            #variant_name,
+            #len,
         ));
-        $serialize_fields
-        _serializer.serialize_struct_variant_end(state)
-    })
+        #(serialize_fields)*
+        _serializer.serialize_struct_variant_end(__serde_state)
+    }
 }
 
 fn serialize_tuple_struct_visitor(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    structure_ty: P<ast::Ty>,
+    structure_ty: syn::Ty,
     fields: &[Field],
-    generics: &ast::Generics,
+    generics: &syn::Generics,
     is_enum: bool,
-    func: ast::Ident,
-) -> Vec<ast::Stmt> {
+    func: syn::Ident,
+) -> Vec<Tokens> {
     fields.iter()
         .enumerate()
         .map(|(i, field)| {
             let mut field_expr = if is_enum {
-                builder.expr().path().id(format!("__field{}", i)).build()
+                let id = aster::id(format!("__field{}", i));
+                quote!(#id)
             } else {
-                builder.expr().ref_().tup_field(i).self_()
+                let i = aster::id(i);
+                quote!(&self.#i)
             };
 
             let skip = field.attrs.skip_serializing_if()
-                .map(|path| quote_expr!(cx, $path($field_expr)))
-                .unwrap_or(quote_expr!(cx, false));
+                .map(|path| quote!(#path(#field_expr)));
 
             if let Some(path) = field.attrs.serialize_with() {
-                field_expr = wrap_serialize_with(cx, builder,
-                    &structure_ty, generics, &field.ty, path, field_expr);
+                field_expr = wrap_serialize_with(
+                    &structure_ty, generics, field.ty, path, field_expr);
             }
 
-            quote_stmt!(cx,
-                if !$skip {
-                    try!(_serializer.$func(&mut state, $field_expr));
-                }
-            ).unwrap()
+            let ser = quote! {
+                try!(_serializer.#func(&mut __serde_state, #field_expr));
+            };
+
+            match skip {
+                None => ser,
+                Some(skip) => quote!(if !#skip { #ser }),
+            }
         })
         .collect()
 }
 
 fn serialize_struct_visitor(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    structure_ty: P<ast::Ty>,
+    structure_ty: syn::Ty,
     fields: &[Field],
-    generics: &ast::Generics,
+    generics: &syn::Generics,
     is_enum: bool,
-    func: ast::Ident,
-) -> Vec<ast::Stmt> {
+    func: syn::Ident,
+) -> Vec<Tokens> {
     fields.iter()
         .filter(|&field| !field.attrs.skip_serializing())
         .map(|field| {
-            let ident = field.ident.expect("struct has unnamed field");
+            let ident = field.ident.clone().expect("struct has unnamed field");
             let mut field_expr = if is_enum {
-                quote_expr!(cx, $ident)
+                quote!(#ident)
             } else {
-                quote_expr!(cx, &self.$ident)
+                quote!(&self.#ident)
             };
 
-            let key_expr = name_expr(builder, field.attrs.name());
+            let key_expr = field.attrs.name().serialize_name();
 
             let skip = field.attrs.skip_serializing_if()
-                .map(|path| quote_expr!(cx, $path($field_expr)))
-                .unwrap_or(quote_expr!(cx, false));
+                .map(|path| quote!(#path(#field_expr)));
 
             if let Some(path) = field.attrs.serialize_with() {
-                field_expr = wrap_serialize_with(cx, builder,
-                    &structure_ty, generics, &field.ty, path, field_expr)
+                field_expr = wrap_serialize_with(
+                    &structure_ty, generics, field.ty, path, field_expr)
             }
 
-            quote_stmt!(cx,
-                if !$skip {
-                    try!(_serializer.$func(&mut state, $key_expr, $field_expr));
-                }
-            ).unwrap()
+            let ser = quote! {
+                try!(_serializer.#func(&mut __serde_state, #key_expr, #field_expr));
+            };
+
+            match skip {
+                None => ser,
+                Some(skip) => quote!(if !#skip { #ser }),
+            }
         })
         .collect()
 }
 
 fn wrap_serialize_with(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    item_ty: &P<ast::Ty>,
-    generics: &ast::Generics,
-    field_ty: &P<ast::Ty>,
-    path: &ast::Path,
-    value: P<ast::Expr>,
-) -> P<ast::Expr> {
+    item_ty: &syn::Ty,
+    generics: &syn::Generics,
+    field_ty: &syn::Ty,
+    path: &syn::Path,
+    value: Tokens,
+) -> Tokens {
     let where_clause = &generics.where_clause;
 
-    let wrapper_generics = builder.from_generics(generics.clone())
+    let wrapper_generics = aster::from_generics(generics.clone())
         .add_lifetime_bound("'__a")
         .lifetime_name("'__a")
         .build();
 
-    let wrapper_ty = builder.path()
+    let wrapper_ty = aster::path()
         .segment("__SerializeWith")
             .with_generics(wrapper_generics.clone())
             .build()
         .build();
 
-    quote_expr!(cx, {
-        struct __SerializeWith $wrapper_generics $where_clause {
-            value: &'__a $field_ty,
-            phantom: ::std::marker::PhantomData<$item_ty>,
+    quote!({
+        struct __SerializeWith #wrapper_generics #where_clause {
+            value: &'__a #field_ty,
+            phantom: ::std::marker::PhantomData<#item_ty>,
         }
 
-        impl $wrapper_generics _serde::ser::Serialize for $wrapper_ty $where_clause {
-            fn serialize<__S>(&self, __s: &mut __S) -> Result<(), __S::Error>
+        impl #wrapper_generics _serde::ser::Serialize for #wrapper_ty #where_clause {
+            fn serialize<__S>(&self, __s: &mut __S) -> ::std::result::Result<(), __S::Error>
                 where __S: _serde::ser::Serializer
             {
-                $path(self.value, __s)
+                #path(self.value, __s)
             }
         }
 
         __SerializeWith {
-            value: $value,
-            phantom: ::std::marker::PhantomData::<$item_ty>,
+            value: #value,
+            phantom: ::std::marker::PhantomData::<#item_ty>,
         }
     })
 }
 
-fn name_expr(
-    builder: &aster::AstBuilder,
-    name: &attr::Name,
-) -> P<ast::Expr> {
-    builder.expr().str(name.serialize_name())
+// Serialization of an empty struct results in code like:
+//
+//     let mut __serde_state = try!(serializer.serialize_struct("S", 0));
+//     serializer.serialize_struct_end(__serde_state)
+//
+// where we want to omit the `mut` to avoid a warning.
+fn mut_if(is_mut: bool) -> Option<Tokens> {
+    if is_mut {
+        Some(quote!(mut))
+    } else {
+        None
+    }
 }

serde_codegen/src/span.rs

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

serde_codegen_internals/Cargo.toml

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

serde_codegen_internals/src/ast.rs

@@ -1,17 +1,12 @@
-use syntax::ast;
-use syntax::codemap;
-use syntax::ext::base::ExtCtxt;
-use syntax::ptr::P;
-
+use syn;
 use attr;
-use Error;
+use Ctxt;
 
 pub struct Item<'a> {
-    pub ident: ast::Ident,
-    pub span: codemap::Span,
+    pub ident: syn::Ident,
     pub attrs: attr::Item,
     pub body: Body<'a>,
-    pub generics: &'a ast::Generics,
+    pub generics: &'a syn::Generics,
 }
 
 pub enum Body<'a> {
@@ -20,18 +15,16 @@ pub enum Body<'a> {
 }
 
 pub struct Variant<'a> {
-    pub ident: ast::Ident,
-    pub span: codemap::Span,
+    pub ident: syn::Ident,
     pub attrs: attr::Variant,
     pub style: Style,
     pub fields: Vec<Field<'a>>,
 }
 
 pub struct Field<'a> {
-    pub ident: Option<ast::Ident>,
-    pub span: codemap::Span,
+    pub ident: Option<syn::Ident>,
     pub attrs: attr::Field,
-    pub ty: &'a P<ast::Ty>,
+    pub ty: &'a syn::Ty,
 }
 
 pub enum Style {
@@ -42,33 +35,25 @@ pub enum Style {
 }
 
 impl<'a> Item<'a> {
-    pub fn from_ast(
-        cx: &ExtCtxt,
-        item: &'a ast::Item,
-    ) -> Result<Item<'a>, Error> {
+    pub fn from_ast(cx: &Ctxt, item: &'a syn::MacroInput) -> Item<'a> {
         let attrs = attr::Item::from_ast(cx, item);
 
-        let (body, generics) = match item.node {
-            ast::ItemKind::Enum(ref enum_def, ref generics) => {
-                let variants = enum_from_ast(cx, enum_def);
-                (Body::Enum(variants), generics)
+        let body = match item.body {
+            syn::Body::Enum(ref variants) => {
+                Body::Enum(enum_from_ast(cx, variants))
             }
-            ast::ItemKind::Struct(ref variant_data, ref generics) => {
+            syn::Body::Struct(ref variant_data) => {
                 let (style, fields) = struct_from_ast(cx, variant_data);
-                (Body::Struct(style, fields), generics)
-            }
-            _ => {
-                return Err(Error::UnexpectedItemKind);
+                Body::Struct(style, fields)
             }
         };
 
-        Ok(Item {
-            ident: item.ident,
-            span: item.span,
+        Item {
+            ident: item.ident.clone(),
             attrs: attrs,
             body: body,
-            generics: generics,
-        })
+            generics: &item.generics,
+        }
     }
 }
 
@@ -86,16 +71,12 @@ impl<'a> Body<'a> {
     }
 }
 
-fn enum_from_ast<'a>(
-    cx: &ExtCtxt,
-    enum_def: &'a ast::EnumDef,
-) -> Vec<Variant<'a>> {
-    enum_def.variants.iter()
+fn enum_from_ast<'a>(cx: &Ctxt, variants: &'a [syn::Variant]) -> Vec<Variant<'a>> {
+    variants.iter()
         .map(|variant| {
-            let (style, fields) = struct_from_ast(cx, &variant.node.data);
+            let (style, fields) = struct_from_ast(cx, &variant.data);
             Variant {
-                ident: variant.node.name,
-                span: variant.span,
+                ident: variant.ident.clone(),
                 attrs: attr::Variant::from_ast(cx, variant),
                 style: style,
                 fields: fields,
@@ -104,36 +85,29 @@ fn enum_from_ast<'a>(
         .collect()
 }
 
-fn struct_from_ast<'a>(
-    cx: &ExtCtxt,
-    variant_data: &'a ast::VariantData,
-) -> (Style, Vec<Field<'a>>) {
-    match *variant_data {
-        ast::VariantData::Struct(ref fields, _) => {
+fn struct_from_ast<'a>(cx: &Ctxt, data: &'a syn::VariantData) -> (Style, Vec<Field<'a>>) {
+    match *data {
+        syn::VariantData::Struct(ref fields) => {
             (Style::Struct, fields_from_ast(cx, fields))
         }
-        ast::VariantData::Tuple(ref fields, _) if fields.len() == 1 => {
+        syn::VariantData::Tuple(ref fields) if fields.len() == 1 => {
             (Style::Newtype, fields_from_ast(cx, fields))
         }
-        ast::VariantData::Tuple(ref fields, _) => {
+        syn::VariantData::Tuple(ref fields) => {
             (Style::Tuple, fields_from_ast(cx, fields))
         }
-        ast::VariantData::Unit(_) => {
+        syn::VariantData::Unit => {
             (Style::Unit, Vec::new())
         }
     }
 }
 
-fn fields_from_ast<'a>(
-    cx: &ExtCtxt,
-    fields: &'a [ast::StructField],
-) -> Vec<Field<'a>> {
+fn fields_from_ast<'a>(cx: &Ctxt, fields: &'a [syn::Field]) -> Vec<Field<'a>> {
     fields.iter()
         .enumerate()
         .map(|(i, field)| {
             Field {
-                ident: field.ident,
-                span: field.span,
+                ident: field.ident.clone(),
                 attrs: attr::Field::from_ast(cx, i, field),
                 ty: &field.ty,
             }

serde_codegen_internals/src/attr.rs

@@ -1,16 +1,5 @@
-use std::rc::Rc;
-
-use syntax::ast;
-use syntax::attr::{self, HasAttrs};
-use syntax::codemap::{Span, Spanned, respan};
-use syntax::ext::base::ExtCtxt;
-use syntax::fold::Folder;
-use syntax::parse::parser::{Parser, PathStyle};
-use syntax::parse::token::{self, InternedString};
-use syntax::parse;
-use syntax::print::pprust::{lit_to_string, meta_item_to_string};
-use syntax::ptr::P;
-use syntax::tokenstream::{self, TokenTree};
+use Ctxt;
+use syn;
 
 // This module handles parsing of `#[serde(...)]` attributes. The entrypoints
 // are `attr::Item::from_ast`, `attr::Variant::from_ast`, and
@@ -20,13 +9,14 @@ use syntax::tokenstream::{self, TokenTree};
 // user will see errors simultaneously for all bad attributes in the crate
 // rather than just the first.
 
-struct Attr<'a, 'b: 'a, T> {
-    cx: &'a ExtCtxt<'b>,
+struct Attr<'c, T> {
+    cx: &'c Ctxt,
     name: &'static str,
-    value: Option<Spanned<T>>,
+    value: Option<T>,
 }
-impl<'a, 'b, T> Attr<'a, 'b, T> {
-    fn none(cx: &'a ExtCtxt<'b>, name: &'static str) -> Self {
+
+impl<'c, T> Attr<'c, T> {
+    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
         Attr {
             cx: cx,
             name: name,
@@ -34,47 +24,40 @@ impl<'a, 'b, T> Attr<'a, 'b, T> {
         }
     }
 
-    fn set(&mut self, span: Span, t: T) {
-        if let Some(Spanned { span: prev_span, .. }) = self.value {
-            let mut err = self.cx.struct_span_err(
-                span,
-                &format!("duplicate serde attribute `{}`", self.name));
-            err.span_help(prev_span, "previously set here");
-            err.emit();
+    fn set(&mut self, value: T) {
+        if self.value.is_some() {
+            self.cx.error(format!("duplicate serde attribute `{}`", self.name));
         } else {
-            self.value = Some(respan(span, t));
+            self.value = Some(value);
         }
     }
 
-    fn set_opt(&mut self, v: Option<Spanned<T>>) {
-        if let Some(v) = v {
-            self.set(v.span, v.node);
+    fn set_opt(&mut self, value: Option<T>) {
+        if let Some(value) = value {
+            self.set(value);
         }
     }
 
-    fn set_if_none(&mut self, span: Span, t: T) {
+    fn set_if_none(&mut self, value: T) {
         if self.value.is_none() {
-            self.value = Some(respan(span, t));
+            self.value = Some(value);
         }
     }
 
     fn get(self) -> Option<T> {
-        self.value.map(|spanned| spanned.node)
-    }
-
-    fn get_spanned(self) -> Option<Spanned<T>> {
         self.value
     }
 }
 
-struct BoolAttr<'a, 'b: 'a>(Attr<'a, 'b, ()>);
-impl<'a, 'b> BoolAttr<'a, 'b> {
-    fn none(cx: &'a ExtCtxt<'b>, name: &'static str) -> Self {
+struct BoolAttr<'c>(Attr<'c, ()>);
+
+impl<'c> BoolAttr<'c> {
+    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
         BoolAttr(Attr::none(cx, name))
     }
 
-    fn set_true(&mut self, span: Span) {
-        self.0.set(span, ());
+    fn set_true(&mut self) {
+        self.0.set(());
     }
 
     fn get(&self) -> bool {
@@ -84,18 +67,18 @@ impl<'a, 'b> BoolAttr<'a, 'b> {
 
 #[derive(Debug)]
 pub struct Name {
-    serialize: InternedString,
-    deserialize: InternedString,
+    serialize: String,
+    deserialize: String,
 }
 
 impl Name {
     /// Return the container name for the container when serializing.
-    pub fn serialize_name(&self) -> InternedString {
+    pub fn serialize_name(&self) -> String {
         self.serialize.clone()
     }
 
     /// Return the container name for the container when deserializing.
-    pub fn deserialize_name(&self) -> InternedString {
+    pub fn deserialize_name(&self) -> String {
         self.deserialize.clone()
     }
 }
@@ -105,35 +88,32 @@ impl Name {
 pub struct Item {
     name: Name,
     deny_unknown_fields: bool,
-    ser_bound: Option<Vec<ast::WherePredicate>>,
-    de_bound: Option<Vec<ast::WherePredicate>>,
+    ser_bound: Option<Vec<syn::WherePredicate>>,
+    de_bound: Option<Vec<syn::WherePredicate>>,
 }
 
 impl Item {
     /// Extract out the `#[serde(...)]` attributes from an item.
-    pub fn from_ast(cx: &ExtCtxt, item: &ast::Item) -> Self {
+    pub fn from_ast(cx: &Ctxt, item: &syn::MacroInput) -> Self {
         let mut ser_name = Attr::none(cx, "rename");
         let mut de_name = Attr::none(cx, "rename");
         let mut deny_unknown_fields = BoolAttr::none(cx, "deny_unknown_fields");
         let mut ser_bound = Attr::none(cx, "bound");
         let mut de_bound = Attr::none(cx, "bound");
 
-        let ident = item.ident.name.as_str();
-
-        for meta_items in item.attrs().iter().filter_map(get_serde_meta_items) {
+        for meta_items in item.attrs.iter().filter_map(get_serde_meta_items) {
             for meta_item in meta_items {
-                let span = meta_item.span;
-                match meta_item.node {
+                match meta_item {
                     // Parse `#[serde(rename="foo")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
-                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
-                            ser_name.set(span, s.clone());
-                            de_name.set(span, s);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "rename" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_name.set(s.clone());
+                            de_name.set(s);
                         }
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
+                    syn::MetaItem::List(ref name, ref meta_items) if name == "rename" => {
                         if let Ok((ser, de)) = get_renames(cx, meta_items) {
                             ser_name.set_opt(ser);
                             de_name.set_opt(de);
@@ -141,20 +121,20 @@ impl Item {
                     }
 
                     // Parse `#[serde(deny_unknown_fields)]`
-                    ast::MetaItemKind::Word(ref name) if name == &"deny_unknown_fields" => {
-                        deny_unknown_fields.set_true(span);
+                    syn::MetaItem::Word(ref name) if name == "deny_unknown_fields" => {
+                        deny_unknown_fields.set_true();
                     }
 
                     // Parse `#[serde(bound="D: Serialize")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"bound" => {
-                        if let Ok(where_predicates) = parse_lit_into_where(cx, name, lit) {
-                            ser_bound.set(span, where_predicates.clone());
-                            de_bound.set(span, where_predicates);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "bound" => {
+                        if let Ok(where_predicates) = parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_bound.set(where_predicates.clone());
+                            de_bound.set(where_predicates);
                         }
                     }
 
                     // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
-                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
+                    syn::MetaItem::List(ref name, ref meta_items) if name == "bound" => {
                         if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
                             ser_bound.set_opt(ser);
                             de_bound.set_opt(de);
@@ -162,10 +142,8 @@ impl Item {
                     }
 
                     _ => {
-                        cx.span_err(
-                            meta_item.span,
-                            &format!("unknown serde container attribute `{}`",
-                                     meta_item_to_string(meta_item)));
+                        cx.error(format!("unknown serde container attribute `{}`",
+                                         meta_item.name()));
                     }
                 }
             }
@@ -173,8 +151,8 @@ impl Item {
 
         Item {
             name: Name {
-                serialize: ser_name.get().unwrap_or(ident.clone()),
-                deserialize: de_name.get().unwrap_or(ident),
+                serialize: ser_name.get().unwrap_or_else(|| item.ident.to_string()),
+                deserialize: de_name.get().unwrap_or_else(|| item.ident.to_string()),
             },
             deny_unknown_fields: deny_unknown_fields.get(),
             ser_bound: ser_bound.get(),
@@ -190,11 +168,11 @@ impl Item {
         self.deny_unknown_fields
     }
 
-    pub fn ser_bound(&self) -> Option<&[ast::WherePredicate]> {
+    pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
         self.ser_bound.as_ref().map(|vec| &vec[..])
     }
 
-    pub fn de_bound(&self) -> Option<&[ast::WherePredicate]> {
+    pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
         self.de_bound.as_ref().map(|vec| &vec[..])
     }
 }
@@ -206,26 +184,23 @@ pub struct Variant {
 }
 
 impl Variant {
-    pub fn from_ast(cx: &ExtCtxt, variant: &ast::Variant) -> Self {
+    pub fn from_ast(cx: &Ctxt, variant: &syn::Variant) -> Self {
         let mut ser_name = Attr::none(cx, "rename");
         let mut de_name = Attr::none(cx, "rename");
 
-        let ident = variant.node.name.name.as_str();
-
-        for meta_items in variant.node.attrs.iter().filter_map(get_serde_meta_items) {
+        for meta_items in variant.attrs.iter().filter_map(get_serde_meta_items) {
             for meta_item in meta_items {
-                let span = meta_item.span;
-                match meta_item.node {
+                match meta_item {
                     // Parse `#[serde(rename="foo")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
-                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
-                            ser_name.set(span, s.clone());
-                            de_name.set(span, s);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "rename" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_name.set(s.clone());
+                            de_name.set(s);
                         }
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
+                    syn::MetaItem::List(ref name, ref meta_items) if name == "rename" => {
                         if let Ok((ser, de)) = get_renames(cx, meta_items) {
                             ser_name.set_opt(ser);
                             de_name.set_opt(de);
@@ -233,10 +208,8 @@ impl Variant {
                     }
 
                     _ => {
-                        cx.span_err(
-                            meta_item.span,
-                            &format!("unknown serde variant attribute `{}`",
-                                     meta_item_to_string(meta_item)));
+                        cx.error(format!("unknown serde variant attribute `{}`",
+                                         meta_item.name()));
                     }
                 }
             }
@@ -244,8 +217,8 @@ impl Variant {
 
         Variant {
             name: Name {
-                serialize: ser_name.get().unwrap_or(ident.clone()),
-                deserialize: de_name.get().unwrap_or(ident),
+                serialize: ser_name.get().unwrap_or_else(|| variant.ident.to_string()),
+                deserialize: de_name.get().unwrap_or_else(|| variant.ident.to_string()),
             },
         }
     }
@@ -261,12 +234,12 @@ pub struct Field {
     name: Name,
     skip_serializing: bool,
     skip_deserializing: bool,
-    skip_serializing_if: Option<ast::Path>,
+    skip_serializing_if: Option<syn::Path>,
     default: FieldDefault,
-    serialize_with: Option<ast::Path>,
-    deserialize_with: Option<ast::Path>,
-    ser_bound: Option<Vec<ast::WherePredicate>>,
-    de_bound: Option<Vec<ast::WherePredicate>>,
+    serialize_with: Option<syn::Path>,
+    deserialize_with: Option<syn::Path>,
+    ser_bound: Option<Vec<syn::WherePredicate>>,
+    de_bound: Option<Vec<syn::WherePredicate>>,
 }
 
 /// Represents the default to use for a field when deserializing.
@@ -277,14 +250,14 @@ pub enum FieldDefault {
     /// The default is given by `std::default::Default::default()`.
     Default,
     /// The default is given by this function.
-    Path(ast::Path),
+    Path(syn::Path),
 }
 
 impl Field {
     /// Extract out the `#[serde(...)]` attributes from a struct field.
-    pub fn from_ast(cx: &ExtCtxt,
+    pub fn from_ast(cx: &Ctxt,
                     index: usize,
-                    field: &ast::StructField) -> Self {
+                    field: &syn::Field) -> Self {
         let mut ser_name = Attr::none(cx, "rename");
         let mut de_name = Attr::none(cx, "rename");
         let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
@@ -297,24 +270,23 @@ impl Field {
         let mut de_bound = Attr::none(cx, "bound");
 
         let ident = match field.ident {
-            Some(ident) => ident.name.as_str(),
-            None => token::intern_and_get_ident(&index.to_string()),
+            Some(ref ident) => ident.to_string(),
+            None => index.to_string(),
         };
 
         for meta_items in field.attrs.iter().filter_map(get_serde_meta_items) {
             for meta_item in meta_items {
-                let span = meta_item.span;
-                match meta_item.node {
+                match meta_item {
                     // Parse `#[serde(rename="foo")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
-                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
-                            ser_name.set(span, s.clone());
-                            de_name.set(span, s);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "rename" => {
+                        if let Ok(s) = get_string_from_lit(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_name.set(s.clone());
+                            de_name.set(s);
                         }
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
-                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
+                    syn::MetaItem::List(ref name, ref meta_items) if name == "rename" => {
                         if let Ok((ser, de)) = get_renames(cx, meta_items) {
                             ser_name.set_opt(ser);
                             de_name.set_opt(de);
@@ -322,58 +294,58 @@ impl Field {
                     }
 
                     // Parse `#[serde(default)]`
-                    ast::MetaItemKind::Word(ref name) if name == &"default" => {
-                        default.set(span, FieldDefault::Default);
+                    syn::MetaItem::Word(ref name) if name == "default" => {
+                        default.set(FieldDefault::Default);
                     }
 
                     // Parse `#[serde(default="...")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"default" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
-                            default.set(span, FieldDefault::Path(path));
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "default" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            default.set(FieldDefault::Path(path));
                         }
                     }
 
                     // Parse `#[serde(skip_serializing)]`
-                    ast::MetaItemKind::Word(ref name) if name == &"skip_serializing" => {
-                        skip_serializing.set_true(span);
+                    syn::MetaItem::Word(ref name) if name == "skip_serializing" => {
+                        skip_serializing.set_true();
                     }
 
                     // Parse `#[serde(skip_deserializing)]`
-                    ast::MetaItemKind::Word(ref name) if name == &"skip_deserializing" => {
-                        skip_deserializing.set_true(span);
+                    syn::MetaItem::Word(ref name) if name == "skip_deserializing" => {
+                        skip_deserializing.set_true();
                     }
 
                     // Parse `#[serde(skip_serializing_if="...")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"skip_serializing_if" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
-                            skip_serializing_if.set(span, path);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "skip_serializing_if" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            skip_serializing_if.set(path);
                         }
                     }
 
                     // Parse `#[serde(serialize_with="...")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize_with" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
-                            serialize_with.set(span, path);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "serialize_with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            serialize_with.set(path);
                         }
                     }
 
                     // Parse `#[serde(deserialize_with="...")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize_with" => {
-                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
-                            deserialize_with.set(span, path);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "deserialize_with" => {
+                        if let Ok(path) = parse_lit_into_path(cx, name.as_ref(), lit) {
+                            deserialize_with.set(path);
                         }
                     }
 
                     // Parse `#[serde(bound="D: Serialize")]`
-                    ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"bound" => {
-                        if let Ok(where_predicates) = parse_lit_into_where(cx, name, lit) {
-                            ser_bound.set(span, where_predicates.clone());
-                            de_bound.set(span, where_predicates);
+                    syn::MetaItem::NameValue(ref name, ref lit) if name == "bound" => {
+                        if let Ok(where_predicates) = parse_lit_into_where(cx, name.as_ref(), name.as_ref(), lit) {
+                            ser_bound.set(where_predicates.clone());
+                            de_bound.set(where_predicates);
                         }
                     }
 
                     // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
-                    ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
+                    syn::MetaItem::List(ref name, ref meta_items) if name == "bound" => {
                         if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
                             ser_bound.set_opt(ser);
                             de_bound.set_opt(de);
@@ -381,10 +353,8 @@ impl Field {
                     }
 
                     _ => {
-                        cx.span_err(
-                            meta_item.span,
-                            &format!("unknown serde field attribute `{}`",
-                                     meta_item_to_string(meta_item)));
+                        cx.error(format!("unknown serde field attribute `{}`",
+                                         meta_item.name()));
                     }
                 }
             }
@@ -392,8 +362,8 @@ impl Field {
 
         // Is skip_deserializing, initialize the field to Default::default()
         // unless a different default is specified by `#[serde(default="...")]`
-        if let Some(Spanned { span, .. }) = skip_deserializing.0.value {
-            default.set_if_none(span, FieldDefault::Default);
+        if skip_deserializing.0.value.is_some() {
+            default.set_if_none(FieldDefault::Default);
         }
 
         Field {
@@ -424,7 +394,7 @@ impl Field {
         self.skip_deserializing
     }
 
-    pub fn skip_serializing_if(&self) -> Option<&ast::Path> {
+    pub fn skip_serializing_if(&self) -> Option<&syn::Path> {
         self.skip_serializing_if.as_ref()
     }
 
@@ -432,207 +402,106 @@ impl Field {
         &self.default
     }
 
-    pub fn serialize_with(&self) -> Option<&ast::Path> {
+    pub fn serialize_with(&self) -> Option<&syn::Path> {
         self.serialize_with.as_ref()
     }
 
-    pub fn deserialize_with(&self) -> Option<&ast::Path> {
+    pub fn deserialize_with(&self) -> Option<&syn::Path> {
         self.deserialize_with.as_ref()
     }
 
-    pub fn ser_bound(&self) -> Option<&[ast::WherePredicate]> {
+    pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
         self.ser_bound.as_ref().map(|vec| &vec[..])
     }
 
-    pub fn de_bound(&self) -> Option<&[ast::WherePredicate]> {
+    pub fn de_bound(&self) -> Option<&[syn::WherePredicate]> {
         self.de_bound.as_ref().map(|vec| &vec[..])
     }
 }
 
+type SerAndDe<T> = (Option<T>, Option<T>);
+
 fn get_ser_and_de<T, F>(
-    cx: &ExtCtxt,
-    attribute: &'static str,
-    items: &[P<ast::MetaItem>],
+    cx: &Ctxt,
+    attr_name: &'static str,
+    items: &[syn::MetaItem],
     f: F
-) -> Result<(Option<Spanned<T>>, Option<Spanned<T>>), ()>
-    where F: Fn(&ExtCtxt, &str, &ast::Lit) -> Result<T, ()>,
+) -> Result<SerAndDe<T>, ()>
+    where F: Fn(&Ctxt, &str, &str, &syn::Lit) -> Result<T, ()>,
 {
-    let mut ser_item = Attr::none(cx, attribute);
-    let mut de_item = Attr::none(cx, attribute);
+    let mut ser_item = Attr::none(cx, attr_name);
+    let mut de_item = Attr::none(cx, attr_name);
 
     for item in items {
-        match item.node {
-            ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize" => {
-                if let Ok(v) = f(cx, name, lit) {
-                    ser_item.set(item.span, v);
+        match *item {
+            syn::MetaItem::NameValue(ref name, ref lit) if name == "serialize" => {
+                if let Ok(v) = f(cx, attr_name, name.as_ref(), lit) {
+                    ser_item.set(v);
                 }
             }
 
-            ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize" => {
-                if let Ok(v) = f(cx, name, lit) {
-                    de_item.set(item.span, v);
+            syn::MetaItem::NameValue(ref name, ref lit) if name == "deserialize" => {
+                if let Ok(v) = f(cx, attr_name, name.as_ref(), lit) {
+                    de_item.set(v);
                 }
             }
 
             _ => {
-                cx.span_err(
-                    item.span,
-                    &format!("unknown {} attribute `{}`",
-                             attribute,
-                             meta_item_to_string(item)));
-
+                cx.error(format!("malformed {0} attribute, expected `{0}(serialize = ..., deserialize = ...)`",
+                                 attr_name));
                 return Err(());
             }
         }
     }
 
-    Ok((ser_item.get_spanned(), de_item.get_spanned()))
+    Ok((ser_item.get(), de_item.get()))
 }
 
 fn get_renames(
-    cx: &ExtCtxt,
-    items: &[P<ast::MetaItem>],
-) -> Result<(Option<Spanned<InternedString>>, Option<Spanned<InternedString>>), ()> {
-    get_ser_and_de(cx, "rename", items, get_str_from_lit)
+    cx: &Ctxt,
+    items: &[syn::MetaItem],
+) -> Result<SerAndDe<String>, ()> {
+    get_ser_and_de(cx, "rename", items, get_string_from_lit)
 }
 
 fn get_where_predicates(
-    cx: &ExtCtxt,
-    items: &[P<ast::MetaItem>],
-) -> Result<(Option<Spanned<Vec<ast::WherePredicate>>>, Option<Spanned<Vec<ast::WherePredicate>>>), ()> {
+    cx: &Ctxt,
+    items: &[syn::MetaItem],
+) -> Result<SerAndDe<Vec<syn::WherePredicate>>, ()> {
     get_ser_and_de(cx, "bound", items, parse_lit_into_where)
 }
 
-pub fn get_serde_meta_items(attr: &ast::Attribute) -> Option<&[P<ast::MetaItem>]> {
-    match attr.node.value.node {
-        ast::MetaItemKind::List(ref name, ref items) if name == &"serde" => {
-            attr::mark_used(&attr);
-            Some(items)
+pub fn get_serde_meta_items(attr: &syn::Attribute) -> Option<Vec<syn::MetaItem>> {
+    match attr.value {
+        syn::MetaItem::List(ref name, ref items) if name == "serde" => {
+            Some(items.iter().cloned().collect())
         }
         _ => None
     }
 }
 
-/// This syntax folder rewrites tokens to say their spans are coming from a macro context.
-struct Respanner<'a, 'b: 'a> {
-    cx: &'a ExtCtxt<'b>,
-}
-
-impl<'a, 'b> Folder for Respanner<'a, 'b> {
-    fn fold_tt(&mut self, tt: &TokenTree) -> TokenTree {
-        match *tt {
-            TokenTree::Token(span, ref tok) => {
-                TokenTree::Token(
-                    self.new_span(span),
-                    self.fold_token(tok.clone())
-                )
-            }
-            TokenTree::Delimited(span, ref delimed) => {
-                TokenTree::Delimited(
-                    self.new_span(span),
-                    Rc::new(tokenstream::Delimited {
-                        delim: delimed.delim,
-                        open_span: delimed.open_span,
-                        tts: self.fold_tts(&delimed.tts),
-                        close_span: delimed.close_span,
-                    })
-                )
-            }
-            TokenTree::Sequence(span, ref seq) => {
-                TokenTree::Sequence(
-                    self.new_span(span),
-                    Rc::new(tokenstream::SequenceRepetition {
-                        tts: self.fold_tts(&seq.tts),
-                        separator: seq.separator.clone().map(|tok| self.fold_token(tok)),
-                        ..**seq
-                    })
-                )
-            }
-        }
-    }
-
-    fn new_span(&mut self, span: Span) -> Span {
-        Span {
-            lo: span.lo,
-            hi: span.hi,
-            expn_id: self.cx.backtrace(),
-        }
+fn get_string_from_lit(cx: &Ctxt, attr_name: &str, meta_item_name: &str, lit: &syn::Lit) -> Result<String, ()> {
+    if let syn::Lit::Str(ref s, _) = *lit {
+        Ok(s.clone())
+    } else {
+        cx.error(format!("expected serde {} attribute to be a string: `{} = \"...\"`",
+                         attr_name, meta_item_name));
+        Err(())
     }
 }
 
-fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<InternedString, ()> {
-    match lit.node {
-        ast::LitKind::Str(ref s, _) => Ok(s.clone()),
-        _ => {
-            cx.span_err(
-                lit.span,
-                &format!("serde annotation `{}` must be a string, not `{}`",
-                         name,
-                         lit_to_string(lit)));
-
-            return Err(());
-        }
-    }
+fn parse_lit_into_path(cx: &Ctxt, attr_name: &str, lit: &syn::Lit) -> Result<syn::Path, ()> {
+    let string = try!(get_string_from_lit(cx, attr_name, attr_name, lit));
+    syn::parse_path(&string).map_err(|err| cx.error(err))
 }
 
-// If we just parse a string literal from an attibute, any syntax errors in the
-// source will only have spans that point inside the string and not back to the
-// attribute. So to have better error reporting, we'll first parse the string
-// into a token tree. Then we'll update those spans to say they're coming from a
-// macro context that originally came from the attribnute, and then finally
-// parse them into an expression or where-clause.
-fn parse_string_via_tts<T, F>(cx: &ExtCtxt, name: &str, string: String, action: F) -> Result<T, ()>
-    where F: for<'a> Fn(&'a mut Parser) -> parse::PResult<'a, T>,
-{
-    let tts = panictry!(parse::parse_tts_from_source_str(
-        format!("<serde {} expansion>", name),
-        string,
-        cx.cfg(),
-        cx.parse_sess()));
-
-    // Respan the spans to say they are all coming from this macro.
-    let tts = Respanner { cx: cx }.fold_tts(&tts);
-
-    let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts);
-
-    let path = match action(&mut parser) {
-        Ok(path) => path,
-        Err(mut e) => {
-            e.emit();
-            return Err(());
-        }
-    };
-
-    // Make sure to error out if there are trailing characters in the stream.
-    match parser.expect(&token::Eof) {
-        Ok(()) => { }
-        Err(mut e) => {
-            e.emit();
-            return Err(());
-        }
-    }
-
-    Ok(path)
-}
-
-fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::Path, ()> {
-    let string = try!(get_str_from_lit(cx, name, lit)).to_string();
-
-    parse_string_via_tts(cx, name, string, |parser| {
-        parser.parse_path(PathStyle::Type)
-    })
-}
-
-fn parse_lit_into_where(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<Vec<ast::WherePredicate>, ()> {
-    let string = try!(get_str_from_lit(cx, name, lit));
+fn parse_lit_into_where(cx: &Ctxt, attr_name: &str, meta_item_name: &str, lit: &syn::Lit) -> Result<Vec<syn::WherePredicate>, ()> {
+    let string = try!(get_string_from_lit(cx, attr_name, meta_item_name, lit));
     if string.is_empty() {
         return Ok(Vec::new());
     }
 
     let where_string = format!("where {}", string);
 
-    parse_string_via_tts(cx, name, where_string, |parser| {
-        let where_clause = try!(parser.parse_where_clause());
-        Ok(where_clause.predicates)
-    })
+    syn::parse_where_clause(&where_string).map(|wh| wh.predicates).map_err(|err| cx.error(err))
 }

serde_codegen_internals/src/ctxt.rs

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

serde_codegen_internals/src/error.rs

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

serde_codegen_internals/src/lib.rs

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

serde_derive/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "serde_derive"
+version = "0.8.11"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
+homepage = "https://serde.rs"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://serde.rs/codegen.html"
+keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "src/**/*.rs"]
+
+[lib]
+name = "serde_derive"
+rustc-macro = true
+
+[dependencies.serde_codegen]
+version = "=0.8.11"
+path = "../serde_codegen"
+default-features = false
+features = ["with-syn"]
+
+[dev-dependencies]
+compiletest_rs = "^0.2.0"
+fnv = "1.0"
+serde = { version = "0.8.11", path = "../serde" }
+serde_test = { version = "0.8.11", path = "../serde_test" }

serde_derive/src/lib.rs

@@ -0,0 +1,25 @@
+#![feature(rustc_macro, rustc_macro_lib)]
+#![cfg(not(test))]
+
+extern crate rustc_macro;
+extern crate serde_codegen;
+
+use rustc_macro::TokenStream;
+
+#[rustc_macro_derive(Serialize)]
+pub fn derive_serialize(input: TokenStream) -> TokenStream {
+    let item = format!("#[derive(Serialize)]\n{}", input);
+    match serde_codegen::expand_single_item(&item) {
+        Ok(expanded) => expanded.parse().unwrap(),
+        Err(msg) => panic!(msg),
+    }
+}
+
+#[rustc_macro_derive(Deserialize)]
+pub fn derive_deserialize(input: TokenStream) -> TokenStream {
+    let item = format!("#[derive(Deserialize)]\n{}", input);
+    match serde_codegen::expand_single_item(&item) {
+        Ok(expanded) => expanded.parse().unwrap(),
+        Err(msg) => panic!(msg),
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

serde_derive/tests/compile-fail/str_ref_deser.rs

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

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

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

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

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

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

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

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

@@ -1,8 +1,9 @@
-#![feature(custom_derive, plugin)]
-#![plugin(serde_macros, clippy)]
-
+#![feature(rustc_macro)]
 #![deny(identity_op)]
 
+#[macro_use]
+extern crate serde_derive;
+
 // The derived implementation uses 0+1 to add up the number of fields
 // serialized, which Clippy warns about. If the expansion info is registered
 // correctly, the Clippy lint is not triggered.

serde_derive/tests/test.rs

@@ -1,5 +1,7 @@
-#![feature(test, custom_attribute, custom_derive, plugin)]
-#![plugin(serde_macros)]
+#![feature(test, rustc_macro, rustc_attrs)]
+
+#[macro_use]
+extern crate serde_derive;
 
 extern crate test;
 

serde_macros/.gitignore

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

serde_macros/Cargo.toml

@@ -1,39 +0,0 @@
-[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-rc3"
-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"]
-
-[lib]
-name = "serde_macros"
-plugin = true
-
-[features]
-unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"]
-
-[dependencies]
-clippy = { version = "^0.*", optional = true }
-serde_codegen = { version = "^0.8.0-rc3", default-features = false, features = ["unstable"] }
-
-[dev-dependencies]
-clippy = "^0.*"
-compiletest_rs = "^0.2.0"
-fnv = "1.0"
-rustc-serialize = "^0.3.16"
-serde = "0.8.0-rc3"
-serde_test = "0.8.0-rc3"
-
-[[test]]
-name = "test"
-path = "tests/test.rs"
-
-[[bench]]
-name = "bench"
-path = "benches/bench.rs"

serde_macros/benches/bench.rs

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

serde_macros/src/lib.rs

@@ -1,12 +0,0 @@
-#![feature(plugin_registrar, rustc_private)]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", plugin(clippy))]
-
-extern crate serde_codegen;
-extern crate rustc_plugin;
-
-#[plugin_registrar]
-#[doc(hidden)]
-pub fn plugin_registrar(reg: &mut rustc_plugin::Registry) {
-    serde_codegen::register(reg);
-}

serde_macros/tests/compile-fail/duplicate_attributes.rs

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

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

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

serde_macros/tests/compile-fail/str_ref_deser.rs

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

serde_test/Cargo.toml

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

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,11 +1,12 @@
 [package]
 name = "serde_testing"
-version = "0.8.0-rc3"
+version = "0.8.11"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
+homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "http://serde-rs.github.io/serde/serde"
+documentation = "https://docs.serde.rs/serde/"
 readme = "README.md"
 keywords = ["serialization"]
 build = "build.rs"

testing/tests/test_bytes.rs

@@ -229,9 +229,14 @@ impl Serializer for BytesSerializer {
         Err(Error)
     }
 
-    fn serialize_map_elt<K, V>(&mut self, _: &mut (), _key: K, _value: V) -> Result<(), Error>
-        where K: Serialize,
-              V: 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)
     }

testing/tests/test_de.rs

@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::net;
 use std::path::PathBuf;
+use std::time::Duration;
 
 use serde::Deserialize;
 
@@ -745,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")],
     }

testing/tests/test_gen.rs

@@ -6,8 +6,14 @@ extern crate serde;
 use self::serde::ser::{Serialize, Serializer};
 use self::serde::de::{Deserialize, Deserializer};
 
+use std::borrow::Cow;
 use std::marker::PhantomData;
 
+// Try to trip up the generated code if it fails to use fully qualified paths.
+#[allow(dead_code)]
+struct Result;
+use std::result::Result as StdResult;
+
 //////////////////////////////////////////////////////////////////////////
 
 #[test]
@@ -177,6 +183,25 @@ fn test_gen() {
         e: E,
     }
     assert::<WithTraits2<X, X>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct CowStr<'a>(Cow<'a, str>);
+    assert::<CowStr>();
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(bound(deserialize = "T::Owned: Deserialize"))]
+    struct CowT<'a, T: ?Sized + 'a + ToOwned>(Cow<'a, T>);
+    assert::<CowT<str>>();
+
+    #[derive(Serialize, Deserialize)]
+    struct EmptyStruct {}
+    assert::<EmptyStruct>();
+
+    #[derive(Serialize, Deserialize)]
+    enum EmptyEnumVariant {
+        EmptyStruct {},
+    }
+    assert::<EmptyEnumVariant>();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -185,32 +210,32 @@ fn assert<T: Serialize + Deserialize>() {}
 fn assert_ser<T: Serialize>() {}
 
 trait SerializeWith {
-    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> Result<(), S::Error>;
+    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> StdResult<(), S::Error>;
 }
 
 trait DeserializeWith: Sized {
-    fn deserialize_with<D: Deserializer>(_: &mut D) -> Result<Self, D::Error>;
+    fn deserialize_with<D: Deserializer>(_: &mut D) -> StdResult<Self, D::Error>;
 }
 
 // Implements neither Serialize nor Deserialize
 struct X;
 
-fn ser_x<S: Serializer>(_: &X, _: &mut S) -> Result<(), S::Error> {
+fn ser_x<S: Serializer>(_: &X, _: &mut S) -> StdResult<(), S::Error> {
     unimplemented!()
 }
 
-fn de_x<D: Deserializer>(_: &mut D) -> Result<X, D::Error> {
+fn de_x<D: Deserializer>(_: &mut D) -> StdResult<X, D::Error> {
     unimplemented!()
 }
 
 impl SerializeWith for X {
-    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> Result<(), S::Error> {
+    fn serialize_with<S: Serializer>(_: &Self, _: &mut S) -> StdResult<(), S::Error> {
         unimplemented!()
     }
 }
 
 impl DeserializeWith for X {
-    fn deserialize_with<D: Deserializer>(_: &mut D) -> Result<Self, D::Error> {
+    fn deserialize_with<D: Deserializer>(_: &mut D) -> StdResult<Self, D::Error> {
         unimplemented!()
     }
 }

testing/tests/test_macros.rs

@@ -600,3 +600,28 @@ fn test_default_ty_param() {
         ]
     );
 }
+
+#[test]
+fn test_enum_state_field() {
+    #[derive(Debug, PartialEq, Serialize, Deserialize)]
+    enum SomeEnum {
+        Key { key: char, state: bool },
+    }
+
+    assert_tokens(
+        &SomeEnum::Key { key: 'a', state: true },
+        &[
+            Token::EnumMapStart("SomeEnum", "Key", 2),
+
+            Token::EnumMapSep,
+            Token::Str("key"),
+            Token::Char('a'),
+
+            Token::EnumMapSep,
+            Token::Str("state"),
+            Token::Bool(true),
+
+            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")],
     }