Merge pull request #430 from serde-rs/bump

Update syntex to 0.38

.travis.yml

@@ -1,41 +1,36 @@
+sudo: false
 language: rust
 rust:
 - stable
 - beta
 - nightly
-- 1.5.0
+- 1.7.0
+- 1.8.0
 addons:
   apt:
     packages:
     - libcurl4-openssl-dev
     - libelf-dev
     - libdw-dev
-    - binutils-dev
 before_script:
 - pip install 'travis-cargo<0.2' --user
 - export PATH=$HOME/.local/bin:$PATH
 script:
 - (cd serde && travis-cargo build)
-- (cd serde && travis-cargo test)
+- (cd serde && travis-cargo --skip nightly test)
 - (cd serde && travis-cargo --only nightly test -- --features nightly-testing)
-- (cd serde && travis-cargo --skip 1.5.0 build -- --no-default-features)
-- (cd serde && travis-cargo --only nightly build -- --no-default-features)
+- (cd serde && travis-cargo build -- --no-default-features)
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc)
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
-- (cd serde_tests && travis-cargo test)
-- (cd serde_tests && travis-cargo --only nightly test -- --features nightly-testing)
+- (cd testing && travis-cargo --skip nightly test)
+- (cd testing && travis-cargo --only nightly test -- --features nightly-testing)
 - (cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing)
-- (cd serde_macros && travis-cargo --only nightly bench -- --features nightly-testing)
-- (cd examples/serde-syntex-example && travis-cargo --skip 1.5.0 run)
-- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --features nightly --no-default-features)
+- (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
+- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features nightly)
 - (cd serde && travis-cargo --only stable doc)
-- (cd serde_codegen && travis-cargo --only stable doc)
-- (cd serde_macros && travis-cargo --only nightly doc)
 after_success:
 - (cd serde && travis-cargo --only stable doc-upload)
-#- (cd serde_codegen && travis-cargo --only stable doc-upload)
-#- (cd serde_macros && travis-cargo --only nightly doc-upload)
-- (cd serde_tests && travis-cargo coveralls --no-sudo)
+- (cd testing && travis-cargo --only stable coveralls --no-sudo)
 env:
   global:
   - TRAVIS_CARGO_NIGHTLY_FEATURE=""

README.md

@@ -4,7 +4,7 @@ Serde Rust Serialization Framework
 [![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](http://clippy.bashy.io/github/serde-rs/serde/master/badge.svg)](http://clippy.bashy.io/github/serde-rs/serde/master/log)
+[![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 powerful framework that enables serialization libraries to
 generically serialize Rust data structures without the overhead of runtime type
@@ -12,74 +12,100 @@ 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 is available at:
+[Documentation](https://serde-rs.github.io/serde/serde/index.html)
 
-* [serde](https://serde-rs.github.io/serde/serde/index.html)
+Simple Serde Example
+====================
 
-Using Serde with Nightly Rust and serde\_macros
-===============================================
-
-Here is a simple example that demonstrates how to use Serde by serializing and
-deserializing to JSON. Serde comes with 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 Nightly Rust, which is currently a bit simpler than Stable
-Rust:
-
-`Cargo.toml`:
+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_nightly"
+name = "serde_example"
 version = "0.1.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 
 [dependencies]
-serde = "*"
 serde_json = "*"
-serde_macros = "*"
 ```
 
-`src/main.rs`
-
-```rust
-#![feature(custom_derive, plugin)]
-#![plugin(serde_macros)]
+Next, the `src/main.rs` file itself:
 
+```rust,ignore
 extern crate serde_json;
 
-#[derive(Serialize, Deserialize, Debug)]
-struct Point {
-    x: i32,
-    y: i32,
-}
+use std::collections::HashMap;
+use serde_json::Value;
+use serde_json::builder::{ArrayBuilder, ObjectBuilder};
 
 fn main() {
-    let point = Point { x: 1, y: 2 };
-    let serialized = serde_json::to_string(&point).unwrap();
+    // 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);
 
-    println!("{}", serialized);
+    let deserialized: Vec<u32> = serde_json::from_str(&serialized).unwrap();
+    println!("deserialized vec: {:?}", deserialized);
 
-    let deserialized: Point = serde_json::from_str(&serialized).unwrap();
+    // ... and maps:
+    let mut map = HashMap::new();
+    map.insert("x".to_string(), 1);
+    map.insert("y".to_string(), 2);
 
-    println!("{:?}", deserialized);
+    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);
 }
 ```
 
-When run, it produces:
+This produces the following output when run:
 
 ```
 % cargo run
-{"x":1,"y":2}
-Point { x: 1, y: 2 }
+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, syntex, and serde\_codegen
-========================================================
+Using Serde with Stable Rust and serde\_codegen
+===============================================
 
-Stable Rust is a little more complicated because it does not yet support
-compiler plugins. Instead we need to use the code generation library
-[syntex](https://github.com/serde-rs/syntex) for this:
+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]
@@ -90,23 +116,14 @@ build = "build.rs"
 
 [build-dependencies]
 serde_codegen = "*"
-syntex = "*"
 
 [dependencies]
 serde = "*"
 serde_json = "*"
 ```
 
-`src/main.rs`:
-
-```rust,ignore
-extern crate serde;
-extern crate serde_json;
-
-include!(concat!(env!("OUT_DIR"), "/main.rs"));
-```
-
-`src/main.rs.in`:
+Next, we define our source file, `src/main.rs.in`. Note this is a different
+extension than usual becaues we need to do code generation:
 
 ```rust,ignore
 #[derive(Serialize, Deserialize, Debug)]
@@ -117,20 +134,30 @@ struct Point {
 
 fn main() {
     let point = Point { x: 1, y: 2 };
-    let serialized = serde_json::to_string(&point).unwrap();
 
+    let serialized = serde_json::to_string(&point).unwrap();
     println!("{}", serialized);
 
     let deserialized: Point = serde_json::from_str(&serialized).unwrap();
-
     println!("{:?}", deserialized);
 }
 ```
 
-`build.rs`
+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 syntex;
 extern crate serde_codegen;
 
 use std::env;
@@ -146,7 +173,7 @@ pub fn main() {
 }
 ```
 
-This also produces:
+All this produces this when run:
 
 ```
 % cargo run
@@ -155,8 +182,63 @@ 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. You
-may find it easier to develop with Nightly Rust and `serde\_macros`, then
+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:
+
+```rust
+#![feature(custom_derive, plugin)]
+#![plugin(serde_macros)]
+
+extern crate serde_json;
+
+#[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);
+}
+```
+
+This also produces the same output:
+
+```
+% 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:
 
@@ -175,7 +257,6 @@ nightly = ["serde_macros"]
 
 [build-dependencies]
 serde_codegen = { version = "*", optional = true }
-syntex = "*"
 
 [dependencies]
 serde = "*"
@@ -188,7 +269,6 @@ serde_macros = { version = "*", optional = true }
 ```rust,ignore
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;

examples/serde-syntex-example/Cargo.toml

@@ -9,10 +9,9 @@ default = ["serde_codegen"]
 nightly = ["serde_macros"]
 
 [build-dependencies]
-serde_codegen = { version = "^0.7.9", optional = true }
-syntex = "^0.33.0"
+serde_codegen = { version = "^0.7", optional = true }
 
 [dependencies]
-serde = "^0.7.9"
-serde_json = "^0.7.0"
-serde_macros = { version = "^0.7.9", optional = true }
+serde = "^0.7"
+serde_json = "^0.7"
+serde_macros = { version = "^0.7", optional = true }

examples/serde-syntex-example/build.rs

@@ -1,6 +1,5 @@
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "0.7.9"
+version = "0.7.14"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"

serde/src/de/impls.rs

@@ -32,7 +32,7 @@ use collections::enum_set::{CLike, EnumSet};
 #[cfg(all(feature = "nightly", feature = "collections"))]
 use collections::borrow::ToOwned;
 
-use core::hash::Hash;
+use core::hash::{Hash, BuildHasher};
 use core::marker::PhantomData;
 #[cfg(feature = "std")]
 use std::net;
@@ -381,29 +381,30 @@ impl<T> Deserialize for PhantomData<T> where T: Deserialize {
 macro_rules! seq_impl {
     (
         $ty:ty,
-        < $($constraints:ident),* >,
-        $visitor_name:ident,
+        $visitor_ty:ident < $($typaram:ident : $bound1:ident $(+ $bound2:ident)*),* >,
         $visitor:ident,
         $ctor:expr,
         $with_capacity:expr,
         $insert:expr
     ) => {
         /// A visitor that produces a sequence.
-        pub struct $visitor_name<T> {
-            marker: PhantomData<T>,
+        pub struct $visitor_ty<$($typaram),*> {
+            marker: PhantomData<$ty>,
         }
 
-        impl<T> $visitor_name<T> {
+        impl<$($typaram),*> $visitor_ty<$($typaram),*>
+            where $($typaram: $bound1 $(+ $bound2)*),*
+        {
             /// Construct a new sequence visitor.
             pub fn new() -> Self {
-                $visitor_name {
+                $visitor_ty {
                     marker: PhantomData,
                 }
             }
         }
 
-        impl<T> Visitor for $visitor_name<T>
-            where T: $($constraints +)*,
+        impl<$($typaram),*> Visitor for $visitor_ty<$($typaram),*>
+            where $($typaram: $bound1 $(+ $bound2)*),*
         {
             type Value = $ty;
 
@@ -430,13 +431,13 @@ macro_rules! seq_impl {
             }
         }
 
-        impl<T> Deserialize for $ty
-            where T: $($constraints +)*,
+        impl<$($typaram),*> Deserialize for $ty
+            where $($typaram: $bound1 $(+ $bound2)*),*
         {
             fn deserialize<D>(deserializer: &mut D) -> Result<$ty, D::Error>
                 where D: Deserializer,
             {
-                deserializer.deserialize_seq($visitor_name::new())
+                deserializer.deserialize_seq($visitor_ty::new())
             }
         }
     }
@@ -445,8 +446,7 @@ macro_rules! seq_impl {
 #[cfg(any(feature = "std", feature = "collections"))]
 seq_impl!(
     BinaryHeap<T>,
-    <Deserialize, Ord>,
-    BinaryHeapVisitor,
+    BinaryHeapVisitor<T: Deserialize + Ord>,
     visitor,
     BinaryHeap::new(),
     BinaryHeap::with_capacity(visitor.size_hint().0),
@@ -455,8 +455,7 @@ seq_impl!(
 #[cfg(any(feature = "std", feature = "collections"))]
 seq_impl!(
     BTreeSet<T>,
-    <Deserialize, Eq, Ord>,
-    BTreeSetVisitor,
+    BTreeSetVisitor<T: Deserialize + Eq + Ord>,
     visitor,
     BTreeSet::new(),
     BTreeSet::new(),
@@ -465,8 +464,7 @@ seq_impl!(
 #[cfg(all(feature = "nightly", feature = "collections"))]
 seq_impl!(
     EnumSet<T>,
-    <Deserialize, CLike>,
-    EnumSetVisitor,
+    EnumSetVisitor<T: Deserialize + CLike>,
     visitor,
     EnumSet::new(),
     EnumSet::new(),
@@ -475,8 +473,7 @@ seq_impl!(
 #[cfg(any(feature = "std", feature = "collections"))]
 seq_impl!(
     LinkedList<T>,
-    <Deserialize>,
-    LinkedListVisitor,
+    LinkedListVisitor<T: Deserialize>,
     visitor,
     LinkedList::new(),
     LinkedList::new(),
@@ -484,19 +481,18 @@ seq_impl!(
 
 #[cfg(feature = "std")]
 seq_impl!(
-    HashSet<T>,
-    <Deserialize, Eq, Hash>,
-    HashSetVisitor,
+    HashSet<T, S>,
+    HashSetVisitor<T: Deserialize + Eq + Hash,
+                   S: BuildHasher + Default>,
     visitor,
-    HashSet::new(),
-    HashSet::with_capacity(visitor.size_hint().0),
+    HashSet::with_hasher(S::default()),
+    HashSet::with_capacity_and_hasher(visitor.size_hint().0, S::default()),
     HashSet::insert);
 
 #[cfg(any(feature = "std", feature = "collections"))]
 seq_impl!(
     Vec<T>,
-    <Deserialize>,
-    VecVisitor,
+    VecVisitor<T: Deserialize>,
     visitor,
     Vec::new(),
     Vec::with_capacity(visitor.size_hint().0),
@@ -505,8 +501,7 @@ seq_impl!(
 #[cfg(any(feature = "std", feature = "collections"))]
 seq_impl!(
     VecDeque<T>,
-    <Deserialize>,
-    VecDequeVisitor,
+    VecDequeVisitor<T: Deserialize>,
     visitor,
     VecDeque::new(),
     VecDeque::with_capacity(visitor.size_hint().0),
@@ -651,7 +646,6 @@ array_impls! {
 ///////////////////////////////////////////////////////////////////////////////
 
 macro_rules! tuple_impls {
-    () => {};
     ($($len:expr => $visitor:ident => ($($name:ident),+),)+) => {
         $(
             /// Construct a tuple visitor.
@@ -719,6 +713,10 @@ tuple_impls! {
     10 => TupleVisitor10 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9),
     11 => TupleVisitor11 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10),
     12 => TupleVisitor12 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11),
+    13 => TupleVisitor13 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12),
+    14 => TupleVisitor14 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13),
+    15 => TupleVisitor15 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14),
+    16 => TupleVisitor16 => (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15),
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -726,30 +724,29 @@ tuple_impls! {
 macro_rules! map_impl {
     (
         $ty:ty,
-        < $($constraints:ident),* >,
-        $visitor_name:ident,
+        $visitor_ty:ident < $($typaram:ident : $bound1:ident $(+ $bound2:ident)*),* >,
         $visitor:ident,
         $ctor:expr,
-        $with_capacity:expr,
-        $insert:expr
+        $with_capacity:expr
     ) => {
         /// A visitor that produces a map.
-        pub struct $visitor_name<K, V> {
+        pub struct $visitor_ty<$($typaram),*> {
             marker: PhantomData<$ty>,
         }
 
-        impl<K, V> $visitor_name<K, V> {
+        impl<$($typaram),*> $visitor_ty<$($typaram),*>
+            where $($typaram: $bound1 $(+ $bound2)*),*
+        {
             /// Construct a `MapVisitor*<T>`.
             pub fn new() -> Self {
-                $visitor_name {
+                $visitor_ty {
                     marker: PhantomData,
                 }
             }
         }
 
-        impl<K, V> Visitor for $visitor_name<K, V>
-            where K: $($constraints +)*,
-                  V: Deserialize,
+        impl<$($typaram),*> Visitor for $visitor_ty<$($typaram),*>
+            where $($typaram: $bound1 $(+ $bound2)*),*
         {
             type Value = $ty;
 
@@ -767,7 +764,7 @@ macro_rules! map_impl {
                 let mut values = $with_capacity;
 
                 while let Some((key, value)) = try!($visitor.visit()) {
-                    $insert(&mut values, key, value);
+                    values.insert(key, value);
                 }
 
                 try!($visitor.end());
@@ -776,14 +773,13 @@ macro_rules! map_impl {
             }
         }
 
-        impl<K, V> Deserialize for $ty
-            where K: $($constraints +)*,
-                  V: Deserialize,
+        impl<$($typaram),*> Deserialize for $ty
+            where $($typaram: $bound1 $(+ $bound2)*),*
         {
             fn deserialize<D>(deserializer: &mut D) -> Result<$ty, D::Error>
                 where D: Deserializer,
             {
-                deserializer.deserialize_map($visitor_name::new())
+                deserializer.deserialize_map($visitor_ty::new())
             }
         }
     }
@@ -792,22 +788,21 @@ macro_rules! map_impl {
 #[cfg(any(feature = "std", feature = "collections"))]
 map_impl!(
     BTreeMap<K, V>,
-    <Deserialize, Eq, Ord>,
-    BTreeMapVisitor,
+    BTreeMapVisitor<K: Deserialize + Eq + Ord,
+                    V: Deserialize>,
     visitor,
     BTreeMap::new(),
-    BTreeMap::new(),
-    BTreeMap::insert);
+    BTreeMap::new());
 
 #[cfg(feature = "std")]
 map_impl!(
-    HashMap<K, V>,
-    <Deserialize, Eq, Hash>,
-    HashMapVisitor,
+    HashMap<K, V, S>,
+    HashMapVisitor<K: Deserialize + Eq + Hash,
+                   V: Deserialize,
+                   S: BuildHasher + Default>,
     visitor,
-    HashMap::new(),
-    HashMap::with_capacity(visitor.size_hint().0),
-    HashMap::insert);
+    HashMap::with_hasher(S::default()),
+    HashMap::with_capacity_and_hasher(visitor.size_hint().0, S::default()));
 
 ///////////////////////////////////////////////////////////////////////////////
 

serde/src/de/mod.rs

@@ -8,6 +8,8 @@ use error;
 #[cfg(all(not(feature = "std"), feature = "collections"))]
 use collections::{String, Vec};
 
+use core::fmt;
+
 pub mod impls;
 pub mod value;
 mod from_primitive;
@@ -169,6 +171,46 @@ pub enum Type {
     Bytes,
 }
 
+impl fmt::Display for Type {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        let display = match *self {
+            Type::Bool          => "bool",
+            Type::Usize         => "usize",
+            Type::U8            => "u8",
+            Type::U16           => "u16",
+            Type::U32           => "u32",
+            Type::U64           => "u64",
+            Type::Isize         => "isize",
+            Type::I8            => "i8",
+            Type::I16           => "i16",
+            Type::I32           => "i32",
+            Type::I64           => "i64",
+            Type::F32           => "f32",
+            Type::F64           => "f64",
+            Type::Char          => "char",
+            Type::Str           => "str",
+            Type::String        => "string",
+            Type::Unit          => "unit",
+            Type::Option        => "option",
+            Type::Seq           => "seq",
+            Type::Map           => "map",
+            Type::UnitStruct    => "unit struct",
+            Type::NewtypeStruct => "newtype struct",
+            Type::TupleStruct   => "tuple struct",
+            Type::Struct        => "struct",
+            Type::FieldName     => "field name",
+            Type::Tuple         => "tuple",
+            Type::Enum          => "enum",
+            Type::VariantName   => "variant name",
+            Type::StructVariant => "struct variant",
+            Type::TupleVariant  => "tuple variant",
+            Type::UnitVariant   => "unit variant",
+            Type::Bytes         => "bytes",
+        };
+        display.fmt(formatter)
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /// `Deserialize` represents a type that can be deserialized.
@@ -635,7 +677,7 @@ pub trait Visitor {
         Err(Error::invalid_type(Type::NewtypeStruct))
     }
 
-    /// `visit_bool` deserializes a `SeqVisitor` into a `Value`.
+    /// `visit_seq` deserializes a `SeqVisitor` into a `Value`.
     fn visit_seq<V>(&mut self, _visitor: V) -> Result<Self::Value, V::Error>
         where V: SeqVisitor,
     {

serde/src/ser/impls.rs

@@ -31,7 +31,7 @@ use collections::enum_set::{CLike, EnumSet};
 #[cfg(all(feature = "nightly", feature = "collections"))]
 use collections::borrow::ToOwned;
 
-use core::hash::Hash;
+use core::hash::{Hash, BuildHasher};
 #[cfg(feature = "nightly")]
 use core::iter;
 #[cfg(feature = "std")]
@@ -330,8 +330,9 @@ impl<T> Serialize for EnumSet<T>
 }
 
 #[cfg(feature = "std")]
-impl<T> Serialize for HashSet<T>
+impl<T, H> Serialize for HashSet<T, H>
     where T: Serialize + Eq + Hash,
+          H: BuildHasher,
 {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
@@ -567,6 +568,72 @@ tuple_impls! {
         10 => 10,
         11 => 11,
     }
+    TupleVisitor13 (13, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+    }
+    TupleVisitor14 (14, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+    }
+    TupleVisitor15 (15, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+    }
+    TupleVisitor16 (16, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15) {
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -651,9 +718,10 @@ impl<K, V> Serialize for BTreeMap<K, V>
 }
 
 #[cfg(feature = "std")]
-impl<K, V> Serialize for HashMap<K, V>
+impl<K, V, H> Serialize for HashMap<K, V, H>
     where K: Serialize + Eq + Hash,
           V: Serialize,
+          H: BuildHasher,
 {
     #[inline]
     fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>

serde_codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_codegen"
-version = "0.7.9"
+version = "0.7.14"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
@@ -14,16 +14,24 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
 default = ["with-syntex"]
 nightly = ["quasi_macros"]
 nightly-testing = ["clippy"]
-with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
+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.11.0", optional = true }
-syntex = { version = "^0.33.0", optional = true }
+quasi_codegen = { version = "^0.15.0", optional = true }
+syntex = { version = "^0.38.0", optional = true }
 
 [dependencies]
-aster = { version = "^0.17.0", default-features = false }
+aster = { version = "^0.21.1", default-features = false }
 clippy = { version = "^0.*", optional = true }
-quasi = { version = "^0.11.0", default-features = false }
-quasi_macros = { version = "^0.11.0", optional = true }
-syntex = { version = "^0.33.0", optional = true }
-syntex_syntax = { version = "^0.33.0", optional = true }
+quasi = { version = "^0.15.0", default-features = false }
+quasi_macros = { version = "^0.15.0", optional = true }
+serde_codegen_internals = { version = "^0.3.0", path = "../serde_codegen_internals", default-features = false }
+syntex = { version = "^0.38.0", optional = true }
+syntex_syntax = { version = "^0.38.0", optional = true }

serde_codegen/build.rs

@@ -1,6 +1,5 @@
 #[cfg(feature = "with-syntex")]
 mod inner {
-    extern crate syntex;
     extern crate quasi_codegen;
 
     use std::env;
@@ -8,13 +7,11 @@ mod inner {
 
     pub fn main() {
         let out_dir = env::var_os("OUT_DIR").unwrap();
-        let mut registry = syntex::Registry::new();
-        quasi_codegen::register(&mut registry);
 
         let src = Path::new("src/lib.rs.in");
         let dst = Path::new(&out_dir).join("lib.rs");
 
-        registry.expand("", &src, &dst).unwrap();
+        quasi_codegen::expand(&src, &dst).unwrap();
     }
 }
 

serde_codegen/src/bound.rs

@@ -1,14 +1,11 @@
-use std::collections::HashSet;
-
 use aster::AstBuilder;
 
 use syntax::ast;
-use syntax::ext::base::ExtCtxt;
 use syntax::ptr::P;
 use syntax::visit;
 
-use attr;
-use error::Error;
+use internals::ast::Item;
+use internals::attr;
 
 // Remove the default from every type parameter because in the generated impls
 // they look like associated types: "error: associated type bindings are not
@@ -35,41 +32,35 @@ pub fn with_where_predicates(
 }
 
 pub fn with_where_predicates_from_fields<F>(
-    cx: &ExtCtxt,
     builder: &AstBuilder,
-    item: &ast::Item,
+    item: &Item,
     generics: &ast::Generics,
     from_field: F,
-) -> Result<ast::Generics, Error>
-    where F: Fn(&attr::FieldAttrs) -> Option<&[ast::WherePredicate]>,
+) -> ast::Generics
+    where F: Fn(&attr::Field) -> Option<&[ast::WherePredicate]>,
 {
-    Ok(builder.from_generics(generics.clone())
+    builder.from_generics(generics.clone())
         .with_predicates(
-            try!(all_fields_with_attrs(cx, item))
-                .iter()
-                .flat_map(|&(_, ref attrs)| from_field(attrs))
+            item.body.all_fields()
+                .flat_map(|field| from_field(&field.attrs))
                 .flat_map(|predicates| predicates.to_vec()))
-        .build())
+        .build()
 }
 
 pub fn with_bound<F>(
-    cx: &ExtCtxt,
     builder: &AstBuilder,
-    item: &ast::Item,
+    item: &Item,
     generics: &ast::Generics,
     filter: F,
     bound: &ast::Path,
-) -> Result<ast::Generics, Error>
-    where F: Fn(&ast::StructField, &attr::FieldAttrs) -> bool,
+) -> ast::Generics
+    where F: Fn(&attr::Field) -> bool,
 {
-    Ok(builder.from_generics(generics.clone())
+    builder.from_generics(generics.clone())
         .with_predicates(
-            try!(all_fields_with_attrs(cx, item))
-                .iter()
-                .filter(|&&(ref field, ref attrs)| filter(field, attrs))
-                .map(|&(ref field, _)| &field.ty)
-                // TODO this filter can be removed later, see comment on function
-                .filter(|ty| contains_generic(ty, generics))
+            item.body.all_fields()
+                .filter(|&field| filter(&field.attrs))
+                .map(|field| &field.ty)
                 .filter(|ty| !contains_recursion(ty, item.ident))
                 .map(|ty| strip_reference(ty))
                 .map(|ty| builder.where_predicate()
@@ -78,86 +69,7 @@ pub fn with_bound<F>(
                     // the bound e.g. Serialize
                     .bound().trait_(bound.clone()).build()
                     .build()))
-        .build())
-}
-
-fn all_fields_with_attrs(
-    cx: &ExtCtxt,
-    item: &ast::Item,
-) -> Result<Vec<(ast::StructField, attr::FieldAttrs)>, Error> {
-    let fields: Vec<ast::StructField> =
-        all_variants(cx, item).iter()
-            .flat_map(|variant_data| all_struct_fields(variant_data))
-            .cloned()
-            .collect();
-
-    attr::fields_with_attrs(cx, &fields)
-}
-
-fn all_variants<'a>(cx: &ExtCtxt, item: &'a ast::Item) -> Vec<&'a ast::VariantData> {
-    match item.node {
-        ast::ItemKind::Struct(ref variant_data, _) => {
-            vec![variant_data]
-        }
-        ast::ItemKind::Enum(ref enum_def, _) => {
-            enum_def.variants.iter()
-                .map(|variant| &variant.node.data)
-                .collect()
-        }
-        _ => {
-            cx.span_bug(item.span, "expected Item to be Struct or Enum");
-        }
-    }
-}
-
-fn all_struct_fields(variant_data: &ast::VariantData) -> &[ast::StructField] {
-    match *variant_data {
-        ast::VariantData::Struct(ref fields, _) |
-        ast::VariantData::Tuple(ref fields, _) => {
-            fields
-        }
-        ast::VariantData::Unit(_) => {
-            &[]
-        }
-    }
-}
-
-// Rust <1.7 enforces that `where` clauses involve generic type parameters. The
-// corresponding compiler error is E0193. It is no longer enforced in Rust >=1.7
-// so this filtering can be removed in the future when we stop supporting <1.7.
-//
-// E0193 means we must not generate a `where` clause like `i32: Serialize`
-// because even though i32 implements Serialize, i32 is not a generic type
-// parameter. Clauses like `T: Serialize` and `Option<T>: Serialize` are okay.
-// This function decides whether a given type references any of the generic type
-// parameters in the input `Generics`.
-fn contains_generic(ty: &ast::Ty, generics: &ast::Generics) -> bool {
-    struct FindGeneric<'a> {
-        generic_names: &'a HashSet<ast::Name>,
-        found_generic: bool,
-    }
-    impl<'a, 'v> visit::Visitor<'v> for FindGeneric<'a> {
-        fn visit_path(&mut self, path: &'v ast::Path, _id: ast::NodeId) {
-            if !path.global
-                    && path.segments.len() == 1
-                    && self.generic_names.contains(&path.segments[0].identifier.name) {
-                self.found_generic = true;
-            } else {
-                visit::walk_path(self, path);
-            }
-        }
-    }
-
-    let generic_names: HashSet<_> = generics.ty_params.iter()
-        .map(|ty_param| ty_param.ident.name)
-        .collect();
-
-    let mut visitor = FindGeneric {
-        generic_names: &generic_names,
-        found_generic: false,
-    };
-    visit::walk_ty(&mut visitor, ty);
-    visitor.found_generic
+        .build()
 }
 
 // We do not attempt to generate any bounds based on field types that are
@@ -184,8 +96,8 @@ fn contains_recursion(ty: &ast::Ty, ident: ast::Ident) -> bool {
         ident: ast::Ident,
         found_recursion: bool,
     }
-    impl<'v> visit::Visitor<'v> for FindRecursion {
-        fn visit_path(&mut self, path: &'v ast::Path, _id: ast::NodeId) {
+    impl visit::Visitor for FindRecursion {
+        fn visit_path(&mut self, path: &ast::Path, _id: ast::NodeId) {
             if !path.global
                     && path.segments.len() == 1
                     && path.segments[0].identifier == self.ident {

serde_codegen/src/error.rs

@@ -1,2 +0,0 @@
-/// Error returned if failed to parse attribute.
-pub struct Error;

serde_codegen/src/lib.rs

@@ -7,6 +7,7 @@
 
 extern crate aster;
 extern crate quasi;
+extern crate serde_codegen_internals as internals;
 
 #[cfg(feature = "with-syntex")]
 extern crate syntex;
@@ -22,8 +23,6 @@ extern crate syntax;
 #[cfg(not(feature = "with-syntex"))]
 extern crate rustc_plugin;
 
-#[cfg(feature = "with-syntex")]
-use std::io;
 #[cfg(feature = "with-syntex")]
 use std::path::Path;
 
@@ -37,7 +36,7 @@ include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 include!("lib.rs.in");
 
 #[cfg(feature = "with-syntex")]
-pub fn expand<S, D>(src: S, dst: D) -> io::Result<()>
+pub fn expand<S, D>(src: S, dst: D) -> Result<(), syntex::Error>
     where S: AsRef<Path>,
           D: AsRef<Path>,
 {

serde_codegen/src/lib.rs.in

@@ -1,5 +1,4 @@
-mod attr;
 mod bound;
 mod de;
-mod error;
 mod ser;
+mod span;

serde_codegen/src/ser.rs

@@ -1,18 +1,14 @@
 use aster;
 
-use syntax::ast::{
-    Ident,
-    MetaItem,
-    Item,
-};
-use syntax::ast;
+use syntax::ast::{self, Ident, MetaItem};
 use syntax::codemap::Span;
 use syntax::ext::base::{Annotatable, ExtCtxt};
 use syntax::ptr::P;
 
-use attr;
 use bound;
-use error::Error;
+use span;
+use internals::ast::{Body, Field, Item, Style, Variant};
+use internals::{attr, Error};
 
 pub fn expand_derive_serialize(
     cx: &mut ExtCtxt,
@@ -31,55 +27,43 @@ pub fn expand_derive_serialize(
         }
     };
 
-    let builder = aster::AstBuilder::new().span(span);
-
-    let impl_item = match serialize_item(cx, &builder, &item) {
+    let item = match Item::from_ast(cx, item) {
         Ok(item) => item,
-        Err(Error) => {
-            // An error occured, but it should have been reported already.
+        Err(Error::UnexpectedItemKind) => {
+            cx.span_err(item.span,
+                "`#[derive(Serialize)]` may only be applied to structs and enums");
             return;
         }
     };
 
-    push(Annotatable::Item(impl_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,
-) -> Result<P<ast::Item>, Error> {
-    let generics = match item.node {
-        ast::ItemKind::Struct(_, ref generics) => generics,
-        ast::ItemKind::Enum(_, ref generics) => generics,
-        _ => {
-            cx.span_err(
-                item.span,
-                "`#[derive(Serialize)]` may only be applied to structs and enums");
-            return Err(Error);
-        }
-    };
-
-    let container_attrs = try!(attr::ContainerAttrs::from_item(cx, item));
-
-    let impl_generics = try!(build_impl_generics(cx, builder, item, generics, &container_attrs));
+) -> 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()
         .build();
 
-    let body = try!(serialize_body(cx,
-                                   &builder,
-                                   &item,
-                                   &impl_generics,
-                                   ty.clone(),
-                                   &container_attrs));
+    let body = serialize_body(cx,
+                              builder,
+                              &item,
+                              &impl_generics,
+                              ty.clone());
 
     let where_clause = &impl_generics.where_clause;
 
     let dummy_const = builder.id(format!("_IMPL_SERIALIZE_FOR_{}", item.ident));
 
-    Ok(quote_item!(cx,
+    quote_item!(cx,
         #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
         const $dummy_const: () = {
             extern crate serde as _serde;
@@ -92,34 +76,29 @@ fn serialize_item(
                 }
             }
         };
-    ).unwrap())
+    ).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(
-    cx: &ExtCtxt,
     builder: &aster::AstBuilder,
     item: &Item,
-    generics: &ast::Generics,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<ast::Generics, Error> {
-    let generics = bound::without_defaults(generics);
+) -> ast::Generics {
+    let generics = bound::without_defaults(item.generics);
 
-    let generics = try!(bound::with_where_predicates_from_fields(
-        cx, builder, item, &generics,
-        |attrs| attrs.ser_bound()));
+    let generics = bound::with_where_predicates_from_fields(
+        builder, item, &generics,
+        |attrs| attrs.ser_bound());
 
-    match container_attrs.ser_bound() {
+    match item.attrs.ser_bound() {
         Some(predicates) => {
-            let generics = bound::with_where_predicates(builder, &generics, predicates);
-            Ok(generics)
+            bound::with_where_predicates(builder, &generics, predicates)
         }
         None => {
-            let generics = try!(bound::with_bound(cx, builder, item, &generics,
+            bound::with_bound(builder, item, &generics,
                 needs_serialize_bound,
-                &builder.path().ids(&["_serde", "ser", "Serialize"]).build()));
-            Ok(generics)
+                &builder.path().ids(&["_serde", "ser", "Serialize"]).build())
         }
     }
 }
@@ -128,8 +107,8 @@ fn build_impl_generics(
 // serialized by us so we do not generate a bound. Fields with a `bound`
 // attribute specify their own bound so we do not generate one. All other fields
 // may need a `T: Serialize` bound where T is the type of the field.
-fn needs_serialize_bound(_: &ast::StructField, attrs: &attr::FieldAttrs) -> bool {
-    !attrs.skip_serializing_field()
+fn needs_serialize_bound(attrs: &attr::Field) -> bool {
+    !attrs.skip_serializing()
         && attrs.serialize_with().is_none()
         && attrs.ser_bound().is_none()
 }
@@ -140,127 +119,93 @@ fn serialize_body(
     item: &Item,
     impl_generics: &ast::Generics,
     ty: P<ast::Ty>,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    match item.node {
-        ast::ItemKind::Struct(ref variant_data, _) => {
-            serialize_item_struct(
-                cx,
-                builder,
-                impl_generics,
-                ty,
-                item.span,
-                variant_data,
-                container_attrs,
-            )
-        }
-        ast::ItemKind::Enum(ref enum_def, _) => {
+) -> P<ast::Expr> {
+    match item.body {
+        Body::Enum(ref variants) => {
             serialize_item_enum(
                 cx,
                 builder,
                 item.ident,
                 impl_generics,
                 ty,
-                enum_def,
-                container_attrs,
-            )
+                variants,
+                &item.attrs)
         }
-        _ => {
-            cx.span_bug(item.span,
-                        "expected ItemStruct or ItemEnum in #[derive(Serialize)]");
-        }
-    }
-}
-
-fn serialize_item_struct(
-    cx: &ExtCtxt,
-    builder: &aster::AstBuilder,
-    impl_generics: &ast::Generics,
-    ty: P<ast::Ty>,
-    span: Span,
-    variant_data: &ast::VariantData,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    match *variant_data {
-        ast::VariantData::Unit(_) => {
-            serialize_unit_struct(
-                cx,
-                container_attrs,
-            )
-        }
-        ast::VariantData::Tuple(ref fields, _) if fields.len() == 1 => {
-            serialize_newtype_struct(
-                cx,
-                &builder,
-                impl_generics,
-                ty,
-                &fields[0],
-                container_attrs,
-            )
-        }
-        ast::VariantData::Tuple(ref fields, _) => {
-            if fields.iter().any(|field| field.ident.is_some()) {
-                cx.span_bug(span, "tuple struct has named fields")
-            }
-
-            serialize_tuple_struct(
-                cx,
-                &builder,
-                impl_generics,
-                ty,
-                fields,
-                container_attrs,
-            )
-        }
-        ast::VariantData::Struct(ref fields, _) => {
+        Body::Struct(Style::Struct, ref fields) => {
             if fields.iter().any(|field| field.ident.is_none()) {
-                cx.span_bug(span, "struct has unnamed fields")
+                cx.span_bug(item.span, "struct has unnamed fields")
             }
 
             serialize_struct(
                 cx,
-                &builder,
+                builder,
                 impl_generics,
                 ty,
                 fields,
-                container_attrs,
-            )
+                &item.attrs)
+        }
+        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")
+            }
+
+            serialize_tuple_struct(
+                cx,
+                builder,
+                impl_generics,
+                ty,
+                fields,
+                &item.attrs)
+        }
+        Body::Struct(Style::Newtype, ref fields) => {
+            serialize_newtype_struct(
+                cx,
+                builder,
+                impl_generics,
+                ty,
+                &fields[0],
+                &item.attrs)
+        }
+        Body::Struct(Style::Unit, _) => {
+            serialize_unit_struct(
+                cx,
+                builder,
+                &item.attrs)
         }
     }
 }
 
 fn serialize_unit_struct(
     cx: &ExtCtxt,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    let type_name = container_attrs.name().serialize_name_expr();
+    builder: &aster::AstBuilder,
+    item_attrs: &attr::Item,
+) -> P<ast::Expr> {
+    let type_name = name_expr(builder, item_attrs.name());
 
-    Ok(quote_expr!(cx,
+    quote_expr!(cx,
         _serializer.serialize_unit_struct($type_name)
-    ))
+    )
 }
 
 fn serialize_newtype_struct(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
     impl_generics: &ast::Generics,
-    container_ty: P<ast::Ty>,
-    field: &ast::StructField,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    let type_name = container_attrs.name().serialize_name_expr();
-
-    let attrs = try!(attr::FieldAttrs::from_field(cx, 0, field));
+    item_ty: P<ast::Ty>,
+    field: &Field,
+    item_attrs: &attr::Item,
+) -> P<ast::Expr> {
+    let type_name = name_expr(builder, item_attrs.name());
 
     let mut field_expr = quote_expr!(cx, &self.0);
-    if let Some(path) = attrs.serialize_with() {
+    if let Some(path) = field.attrs.serialize_with() {
         field_expr = wrap_serialize_with(cx, builder,
-            &container_ty, impl_generics, &field.ty, path, field_expr);
+            &item_ty, impl_generics, &field.ty, path, field_expr);
     }
 
-    Ok(quote_expr!(cx,
+    quote_expr!(cx,
         _serializer.serialize_newtype_struct($type_name, $field_expr)
-    ))
+    )
 }
 
 fn serialize_tuple_struct(
@@ -268,10 +213,10 @@ fn serialize_tuple_struct(
     builder: &aster::AstBuilder,
     impl_generics: &ast::Generics,
     ty: P<ast::Ty>,
-    fields: &[ast::StructField],
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    let (visitor_struct, visitor_impl) = try!(serialize_tuple_struct_visitor(
+    fields: &[Field],
+    item_attrs: &attr::Item,
+) -> P<ast::Expr> {
+    let (visitor_struct, visitor_impl) = serialize_tuple_struct_visitor(
         cx,
         builder,
         ty.clone(),
@@ -283,11 +228,11 @@ fn serialize_tuple_struct(
         fields,
         impl_generics,
         false,
-    ));
+    );
 
-    let type_name = container_attrs.name().serialize_name_expr();
+    let type_name = name_expr(builder, item_attrs.name());
 
-    Ok(quote_expr!(cx, {
+    quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
         _serializer.serialize_tuple_struct($type_name, Visitor {
@@ -295,7 +240,7 @@ fn serialize_tuple_struct(
             state: 0,
             _structure_ty: ::std::marker::PhantomData::<&$ty>,
         })
-    }))
+    })
 }
 
 fn serialize_struct(
@@ -303,10 +248,10 @@ fn serialize_struct(
     builder: &aster::AstBuilder,
     impl_generics: &ast::Generics,
     ty: P<ast::Ty>,
-    fields: &[ast::StructField],
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    let (visitor_struct, visitor_impl) = try!(serialize_struct_visitor(
+    fields: &[Field],
+    item_attrs: &attr::Item,
+) -> P<ast::Expr> {
+    let (visitor_struct, visitor_impl) = serialize_struct_visitor(
         cx,
         builder,
         ty.clone(),
@@ -318,11 +263,11 @@ fn serialize_struct(
         fields,
         impl_generics,
         false,
-    ));
+    );
 
-    let type_name = container_attrs.name().serialize_name_expr();
+    let type_name = name_expr(builder, item_attrs.name());
 
-    Ok(quote_expr!(cx, {
+    quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
         _serializer.serialize_struct($type_name, Visitor {
@@ -330,7 +275,7 @@ fn serialize_struct(
             state: 0,
             _structure_ty: ::std::marker::PhantomData::<&$ty>,
         })
-    }))
+    })
 }
 
 fn serialize_item_enum(
@@ -339,11 +284,11 @@ fn serialize_item_enum(
     type_ident: Ident,
     impl_generics: &ast::Generics,
     ty: P<ast::Ty>,
-    enum_def: &ast::EnumDef,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
-    let arms: Vec<_> = try!(
-        enum_def.variants.iter()
+    variants: &[Variant],
+    item_attrs: &attr::Item,
+) -> P<ast::Expr> {
+    let arms: Vec<_> =
+        variants.iter()
             .enumerate()
             .map(|(variant_index, variant)| {
                 serialize_variant(
@@ -354,17 +299,16 @@ fn serialize_item_enum(
                     ty.clone(),
                     variant,
                     variant_index,
-                    container_attrs,
+                    item_attrs,
                 )
             })
-            .collect()
-    );
+            .collect();
 
-    Ok(quote_expr!(cx,
+    quote_expr!(cx,
         match *self {
             $arms
         }
-    ))
+    )
 }
 
 fn serialize_variant(
@@ -373,19 +317,18 @@ fn serialize_variant(
     type_ident: Ident,
     generics: &ast::Generics,
     ty: P<ast::Ty>,
-    variant: &ast::Variant,
+    variant: &Variant,
     variant_index: usize,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<ast::Arm, Error> {
-    let type_name = container_attrs.name().serialize_name_expr();
+    item_attrs: &attr::Item,
+) -> ast::Arm {
+    let type_name = name_expr(builder, item_attrs.name());
 
-    let variant_ident = variant.node.name;
-    let variant_attrs = try!(attr::VariantAttrs::from_variant(cx, variant));
-    let variant_name = variant_attrs.name().serialize_name_expr();
+    let variant_ident = variant.ident;
+    let variant_name = name_expr(builder, variant.attrs.name());
 
-    match variant.node.data {
-        ast::VariantData::Unit(_) => {
-            Ok(quote_arm!(cx,
+    match variant.style {
+        Style::Unit => {
+            quote_arm!(cx,
                 $type_ident::$variant_ident => {
                     _serde::ser::Serializer::serialize_unit_variant(
                         _serializer,
@@ -394,10 +337,10 @@ fn serialize_variant(
                         $variant_name,
                     )
                 }
-            ))
+            )
         },
-        ast::VariantData::Tuple(ref fields, _) if fields.len() == 1 => {
-            let expr = try!(serialize_newtype_variant(
+        Style::Newtype => {
+            let expr = serialize_newtype_variant(
                 cx,
                 builder,
                 type_name,
@@ -405,15 +348,15 @@ fn serialize_variant(
                 variant_name,
                 ty,
                 generics,
-                &fields[0],
-            ));
+                &variant.fields[0],
+            );
 
-            Ok(quote_arm!(cx,
+            quote_arm!(cx,
                 $type_ident::$variant_ident(ref __simple_value) => { $expr }
-            ))
+            )
         },
-        ast::VariantData::Tuple(ref fields, _) => {
-            let field_names: Vec<ast::Ident> = (0 .. fields.len())
+        Style::Tuple => {
+            let field_names: Vec<ast::Ident> = (0 .. variant.fields.len())
                 .map(|i| builder.id(format!("__field{}", i)))
                 .collect();
 
@@ -425,7 +368,7 @@ fn serialize_variant(
                 )
                 .build();
 
-            let expr = try!(serialize_tuple_variant(
+            let expr = serialize_tuple_variant(
                 cx,
                 builder,
                 type_name,
@@ -433,16 +376,16 @@ fn serialize_variant(
                 variant_name,
                 generics,
                 ty,
-                fields,
+                &variant.fields,
                 field_names,
-            ));
+            );
 
-            Ok(quote_arm!(cx,
+            quote_arm!(cx,
                 $pat => { $expr }
-            ))
+            )
         }
-        ast::VariantData::Struct(ref fields, _) => {
-            let field_names: Vec<_> = (0 .. fields.len())
+        Style::Struct => {
+            let field_names: Vec<_> = (0 .. variant.fields.len())
                 .map(|i| builder.id(format!("__field{}", i)))
                 .collect();
 
@@ -450,7 +393,7 @@ fn serialize_variant(
                 .id(type_ident).id(variant_ident).build()
                 .with_pats(
                     field_names.iter()
-                        .zip(fields.iter())
+                        .zip(variant.fields.iter())
                         .map(|(id, field)| {
                             let name = match field.ident {
                                 Some(name) => name,
@@ -464,21 +407,21 @@ fn serialize_variant(
                 )
                 .build();
 
-            let expr = try!(serialize_struct_variant(
+            let expr = serialize_struct_variant(
                 cx,
                 builder,
                 variant_index,
                 variant_name,
                 generics,
                 ty,
-                fields,
+                &variant.fields,
                 field_names,
-                container_attrs,
-            ));
+                item_attrs,
+            );
 
-            Ok(quote_arm!(cx,
+            quote_arm!(cx,
                 $pat => { $expr }
-            ))
+            )
         }
     }
 }
@@ -489,19 +432,17 @@ fn serialize_newtype_variant(
     type_name: P<ast::Expr>,
     variant_index: usize,
     variant_name: P<ast::Expr>,
-    container_ty: P<ast::Ty>,
+    item_ty: P<ast::Ty>,
     generics: &ast::Generics,
-    field: &ast::StructField,
-) -> Result<P<ast::Expr>, Error> {
-    let attrs = try!(attr::FieldAttrs::from_field(cx, 0, field));
-
+    field: &Field,
+) -> P<ast::Expr> {
     let mut field_expr = quote_expr!(cx, __simple_value);
-    if let Some(path) = attrs.serialize_with() {
+    if let Some(path) = field.attrs.serialize_with() {
         field_expr = wrap_serialize_with(cx, builder,
-            &container_ty, generics, &field.ty, path, field_expr);
+            &item_ty, generics, &field.ty, path, field_expr);
     }
 
-    Ok(quote_expr!(cx,
+    quote_expr!(cx,
         _serde::ser::Serializer::serialize_newtype_variant(
             _serializer,
             $type_name,
@@ -509,7 +450,7 @@ fn serialize_newtype_variant(
             $variant_name,
             $field_expr,
         )
-    ))
+    )
 }
 
 fn serialize_tuple_variant(
@@ -520,9 +461,9 @@ fn serialize_tuple_variant(
     variant_name: P<ast::Expr>,
     generics: &ast::Generics,
     structure_ty: P<ast::Ty>,
-    fields: &[ast::StructField],
+    fields: &[Field],
     field_names: Vec<Ident>,
-) -> Result<P<ast::Expr>, Error> {
+) -> P<ast::Expr> {
     let variant_ty = builder.ty().tuple()
         .with_tys(
             fields.iter().map(|field| {
@@ -534,7 +475,7 @@ fn serialize_tuple_variant(
         )
         .build();
 
-    let (visitor_struct, visitor_impl) = try!(serialize_tuple_struct_visitor(
+    let (visitor_struct, visitor_impl) = serialize_tuple_struct_visitor(
         cx,
         builder,
         structure_ty.clone(),
@@ -543,7 +484,7 @@ fn serialize_tuple_variant(
         fields,
         generics,
         true,
-    ));
+    );
 
     let value_expr = builder.expr().tuple()
         .with_exprs(
@@ -553,7 +494,7 @@ fn serialize_tuple_variant(
         )
         .build();
 
-    Ok(quote_expr!(cx, {
+    quote_expr!(cx, {
         $visitor_struct
         $visitor_impl
         _serializer.serialize_tuple_variant($type_name, $variant_index, $variant_name, Visitor {
@@ -561,7 +502,7 @@ fn serialize_tuple_variant(
             state: 0,
             _structure_ty: ::std::marker::PhantomData::<&$structure_ty>,
         })
-    }))
+    })
 }
 
 fn serialize_struct_variant(
@@ -571,10 +512,10 @@ fn serialize_struct_variant(
     variant_name: P<ast::Expr>,
     generics: &ast::Generics,
     ty: P<ast::Ty>,
-    fields: &[ast::StructField],
+    fields: &[Field],
     field_names: Vec<Ident>,
-    container_attrs: &attr::ContainerAttrs,
-) -> Result<P<ast::Expr>, Error> {
+    item_attrs: &attr::Item,
+) -> P<ast::Expr> {
     let variant_generics = builder.generics()
         .with(generics.clone())
         .add_lifetime_bound("'__serde_variant")
@@ -586,7 +527,6 @@ fn serialize_struct_variant(
         .with_fields(
             fields.iter().map(|field| {
                 builder.struct_field(field.ident.expect("struct has unnamed fields"))
-                    .with_attrs(field.attrs.iter().cloned())
                     .ty()
                     .ref_()
                     .lifetime("'__serde_variant")
@@ -623,7 +563,7 @@ fn serialize_struct_variant(
             .build()
         .build();
 
-    let (visitor_struct, visitor_impl) = try!(serialize_struct_visitor(
+    let (visitor_struct, visitor_impl) = serialize_struct_visitor(
         cx,
         builder,
         variant_ty.clone(),
@@ -632,16 +572,16 @@ fn serialize_struct_variant(
         fields,
         &variant_generics,
         true,
-    ));
+    );
 
-    let container_name = container_attrs.name().serialize_name_expr();
+    let item_name = name_expr(builder, item_attrs.name());
 
-    Ok(quote_expr!(cx, {
+    quote_expr!(cx, {
         $variant_struct
         $visitor_struct
         $visitor_impl
         _serializer.serialize_struct_variant(
-            $container_name,
+            $item_name,
             $variant_index,
             $variant_name,
             Visitor {
@@ -650,7 +590,7 @@ fn serialize_struct_variant(
                 _structure_ty: ::std::marker::PhantomData,
             },
         )
-    }))
+    })
 }
 
 fn serialize_tuple_struct_visitor(
@@ -659,24 +599,22 @@ fn serialize_tuple_struct_visitor(
     structure_ty: P<ast::Ty>,
     variant_ty: P<ast::Ty>,
     serializer_method: ast::Ident,
-    fields: &[ast::StructField],
+    fields: &[Field],
     generics: &ast::Generics,
     is_enum: bool,
-) -> Result<(P<ast::Item>, P<ast::Item>), Error> {
-    let fields_with_attrs = try!(attr::fields_with_attrs(cx, fields));
-
-    let arms: Vec<_> = fields_with_attrs.iter()
+) -> (P<ast::Item>, P<ast::Item>) {
+    let arms: Vec<_> = fields.iter()
         .enumerate()
-        .map(|(i, &(ref field, ref attrs))| {
+        .map(|(i, field)| {
             let mut field_expr = builder.expr().tup_field(i).field("value").self_();
             if !is_enum {
                 field_expr = quote_expr!(cx, &$field_expr);
             }
 
-            let continue_if_skip = attrs.skip_serializing_if()
+            let continue_if_skip = field.attrs.skip_serializing_if()
                 .map(|path| quote_stmt!(cx, if $path($field_expr) { continue }));
 
-            if let Some(path) = attrs.serialize_with() {
+            if let Some(path) = field.attrs.serialize_with() {
                 field_expr = wrap_serialize_with(cx, builder,
                     &structure_ty, generics, &field.ty, path, field_expr);
             }
@@ -704,7 +642,7 @@ fn serialize_tuple_struct_visitor(
 
     let nfields = fields.len();
 
-    Ok((
+    (
         quote_item!(cx,
             struct Visitor $visitor_impl_generics $where_clause {
                 state: usize,
@@ -733,7 +671,7 @@ fn serialize_tuple_struct_visitor(
                 }
             }
         ).unwrap(),
-    ))
+    )
 }
 
 fn serialize_struct_visitor(
@@ -742,28 +680,26 @@ fn serialize_struct_visitor(
     structure_ty: P<ast::Ty>,
     variant_ty: P<ast::Ty>,
     serializer_method: ast::Ident,
-    fields: &[ast::StructField],
+    fields: &[Field],
     generics: &ast::Generics,
     is_enum: bool,
-) -> Result<(P<ast::Item>, P<ast::Item>), Error> {
-    let fields_with_attrs = try!(attr::fields_with_attrs(cx, fields));
-
-    let arms: Vec<ast::Arm> = fields_with_attrs.iter()
-        .filter(|&&(_, ref attrs)| !attrs.skip_serializing_field())
+) -> (P<ast::Item>, P<ast::Item>) {
+    let arms: Vec<ast::Arm> = fields.iter()
+        .filter(|&field| !field.attrs.skip_serializing())
         .enumerate()
-        .map(|(i, &(ref field, ref attrs))| {
+        .map(|(i, field)| {
             let ident = field.ident.expect("struct has unnamed field");
             let mut field_expr = quote_expr!(cx, self.value.$ident);
             if !is_enum {
                 field_expr = quote_expr!(cx, &$field_expr);
             }
 
-            let key_expr = attrs.name().serialize_name_expr();
+            let key_expr = name_expr(builder, field.attrs.name());
 
-            let continue_if_skip = attrs.skip_serializing_if()
+            let continue_if_skip = field.attrs.skip_serializing_if()
                 .map(|path| quote_stmt!(cx, if $path($field_expr) { continue }));
 
-            if let Some(path) = attrs.serialize_with() {
+            if let Some(path) = field.attrs.serialize_with() {
                 field_expr = wrap_serialize_with(cx, builder,
                     &structure_ty, generics, &field.ty, path, field_expr)
             }
@@ -793,23 +729,23 @@ fn serialize_struct_visitor(
         .strip_bounds()
         .build();
 
-    let len = fields_with_attrs.iter()
-        .filter(|&&(_, ref attrs)| !attrs.skip_serializing_field())
-        .map(|&(ref field, ref attrs)| {
+    let len = fields.iter()
+        .filter(|&field| !field.attrs.skip_serializing())
+        .map(|field| {
             let ident = field.ident.expect("struct has unnamed fields");
             let mut field_expr = quote_expr!(cx, self.value.$ident);
             if !is_enum {
                 field_expr = quote_expr!(cx, &$field_expr);
             }
 
-            match attrs.skip_serializing_if() {
+            match field.attrs.skip_serializing_if() {
                 Some(path) => quote_expr!(cx, if $path($field_expr) { 0 } else { 1 }),
                 None => quote_expr!(cx, 1),
             }
         })
         .fold(quote_expr!(cx, 0), |sum, expr| quote_expr!(cx, $sum + $expr));
 
-    Ok((
+    (
         quote_item!(cx,
             struct Visitor $visitor_impl_generics $where_clause {
                 state: usize,
@@ -841,13 +777,13 @@ fn serialize_struct_visitor(
                 }
             }
         ).unwrap(),
-    ))
+    )
 }
 
 fn wrap_serialize_with(
     cx: &ExtCtxt,
     builder: &aster::AstBuilder,
-    container_ty: &P<ast::Ty>,
+    item_ty: &P<ast::Ty>,
     generics: &ast::Generics,
     field_ty: &P<ast::Ty>,
     path: &ast::Path,
@@ -869,7 +805,7 @@ fn wrap_serialize_with(
     quote_expr!(cx, {
         struct __SerializeWith $wrapper_generics $where_clause {
             value: &'__a $field_ty,
-            phantom: ::std::marker::PhantomData<$container_ty>,
+            phantom: ::std::marker::PhantomData<$item_ty>,
         }
 
         impl $wrapper_generics _serde::ser::Serialize for $wrapper_ty $where_clause {
@@ -882,7 +818,14 @@ fn wrap_serialize_with(
 
         __SerializeWith {
             value: $value,
-            phantom: ::std::marker::PhantomData::<$container_ty>,
+            phantom: ::std::marker::PhantomData::<$item_ty>,
         }
     })
 }
+
+fn name_expr(
+    builder: &aster::AstBuilder,
+    name: &attr::Name,
+) -> P<ast::Expr> {
+    builder.expr().str(name.serialize_name())
+}

serde_codegen/src/span.rs

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

@@ -0,0 +1,20 @@
+[package]
+name = "serde_codegen_internals"
+version = "0.3.0"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "AST representation used by Serde codegen. Unstable."
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://github.com/serde-rs/serde"
+keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "src/**/*.rs"]
+
+[features]
+default = ["with-syntex"]
+nightly-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 }

serde_codegen_internals/src/ast.rs

@@ -0,0 +1,142 @@
+use syntax::ast;
+use syntax::codemap;
+use syntax::ext::base::ExtCtxt;
+use syntax::ptr::P;
+
+use attr;
+use Error;
+
+pub struct Item<'a> {
+    pub ident: ast::Ident,
+    pub span: codemap::Span,
+    pub attrs: attr::Item,
+    pub body: Body<'a>,
+    pub generics: &'a ast::Generics,
+}
+
+pub enum Body<'a> {
+    Enum(Vec<Variant<'a>>),
+    Struct(Style, Vec<Field<'a>>),
+}
+
+pub struct Variant<'a> {
+    pub ident: ast::Ident,
+    pub span: codemap::Span,
+    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 attrs: attr::Field,
+    pub ty: &'a P<ast::Ty>,
+}
+
+pub enum Style {
+    Struct,
+    Tuple,
+    Newtype,
+    Unit,
+}
+
+impl<'a> Item<'a> {
+    pub fn from_ast(
+        cx: &ExtCtxt,
+        item: &'a ast::Item,
+    ) -> Result<Item<'a>, Error> {
+        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)
+            }
+            ast::ItemKind::Struct(ref variant_data, ref generics) => {
+                let (style, fields) = struct_from_ast(cx, variant_data);
+                (Body::Struct(style, fields), generics)
+            }
+            _ => {
+                return Err(Error::UnexpectedItemKind);
+            }
+        };
+
+        Ok(Item {
+            ident: item.ident,
+            span: item.span,
+            attrs: attrs,
+            body: body,
+            generics: generics,
+        })
+    }
+}
+
+impl<'a> Body<'a> {
+    pub fn all_fields(&'a self) -> Box<Iterator<Item=&'a Field<'a>> + 'a> {
+        match *self {
+            Body::Enum(ref variants) => {
+                Box::new(variants.iter()
+                             .flat_map(|variant| variant.fields.iter()))
+            }
+            Body::Struct(_, ref fields) => {
+                Box::new(fields.iter())
+            }
+        }
+    }
+}
+
+fn enum_from_ast<'a>(
+    cx: &ExtCtxt,
+    enum_def: &'a ast::EnumDef,
+) -> Vec<Variant<'a>> {
+    enum_def.variants.iter()
+        .map(|variant| {
+            let (style, fields) = struct_from_ast(cx, &variant.node.data);
+            Variant {
+                ident: variant.node.name,
+                span: variant.span,
+                attrs: attr::Variant::from_ast(cx, variant),
+                style: style,
+                fields: fields,
+            }
+        })
+        .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, _) => {
+            (Style::Struct, fields_from_ast(cx, fields))
+        }
+        ast::VariantData::Tuple(ref fields, _) if fields.len() == 1 => {
+            (Style::Newtype, fields_from_ast(cx, fields))
+        }
+        ast::VariantData::Tuple(ref fields, _) => {
+            (Style::Tuple, fields_from_ast(cx, fields))
+        }
+        ast::VariantData::Unit(_) => {
+            (Style::Unit, Vec::new())
+        }
+    }
+}
+
+fn fields_from_ast<'a>(
+    cx: &ExtCtxt,
+    fields: &'a [ast::StructField],
+) -> Vec<Field<'a>> {
+    fields.iter()
+        .enumerate()
+        .map(|(i, field)| {
+            Field {
+                ident: field.ident,
+                span: field.span,
+                attrs: attr::Field::from_ast(cx, i, field),
+                ty: &field.ty,
+            }
+        })
+        .collect()
+}

serde_codegen_internals/src/attr.rs

@@ -1,7 +1,8 @@
 use std::rc::Rc;
-use syntax::ast::{self, TokenTree};
-use syntax::attr;
-use syntax::codemap::Span;
+
+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};
@@ -9,114 +10,154 @@ 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 aster::AstBuilder;
+// This module handles parsing of `#[serde(...)]` attributes. The entrypoints
+// are `attr::Item::from_ast`, `attr::Variant::from_ast`, and
+// `attr::Field::from_ast`. Each returns an instance of the corresponding
+// struct. Note that none of them return a Result. Unrecognized, malformed, or
+// duplicated attributes result in a span_err but otherwise are ignored. The
+// user will see errors simultaneously for all bad attributes in the crate
+// rather than just the first.
 
-use error::Error;
+struct Attr<'a, 'b: 'a, T> {
+    cx: &'a ExtCtxt<'b>,
+    name: &'static str,
+    value: Option<Spanned<T>>,
+}
+impl<'a, 'b, T> Attr<'a, 'b, T> {
+    fn none(cx: &'a ExtCtxt<'b>, name: &'static str) -> Self {
+        Attr {
+            cx: cx,
+            name: name,
+            value: None,
+        }
+    }
+
+    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();
+        } else {
+            self.value = Some(respan(span, t));
+        }
+    }
+
+    fn set_opt(&mut self, v: Option<Spanned<T>>) {
+        if let Some(v) = v {
+            self.set(v.span, v.node);
+        }
+    }
+
+    fn set_if_none(&mut self, span: Span, t: T) {
+        if self.value.is_none() {
+            self.value = Some(respan(span, t));
+        }
+    }
+
+    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 {
+        BoolAttr(Attr::none(cx, name))
+    }
+
+    fn set_true(&mut self, span: Span) {
+        self.0.set(span, ());
+    }
+
+    fn get(&self) -> bool {
+        self.0.value.is_some()
+    }
+}
 
 #[derive(Debug)]
 pub struct Name {
-    ident: ast::Ident,
-    serialize_name: Option<InternedString>,
-    deserialize_name: Option<InternedString>,
+    serialize: InternedString,
+    deserialize: InternedString,
 }
 
 impl Name {
-    fn new(ident: ast::Ident) -> Self {
-        Name {
-            ident: ident,
-            serialize_name: None,
-            deserialize_name: None,
-        }
-    }
-
     /// Return the container name for the container when serializing.
     pub fn serialize_name(&self) -> InternedString {
-        match self.serialize_name {
-            Some(ref name) => name.clone(),
-            None => self.ident.name.as_str(),
-        }
-    }
-
-    /// Return the container name expression for the container when deserializing.
-    pub fn serialize_name_expr(&self) -> P<ast::Expr> {
-        AstBuilder::new().expr().str(self.serialize_name())
+        self.serialize.clone()
     }
 
     /// Return the container name for the container when deserializing.
     pub fn deserialize_name(&self) -> InternedString {
-        match self.deserialize_name {
-            Some(ref name) => name.clone(),
-            None => self.ident.name.as_str(),
-        }
-    }
-
-    /// Return the container name expression for the container when deserializing.
-    pub fn deserialize_name_expr(&self) -> P<ast::Expr> {
-        AstBuilder::new().expr().str(self.deserialize_name())
+        self.deserialize.clone()
     }
 }
 
 /// Represents container (e.g. struct) attribute information
 #[derive(Debug)]
-pub struct ContainerAttrs {
+pub struct Item {
     name: Name,
     deny_unknown_fields: bool,
     ser_bound: Option<Vec<ast::WherePredicate>>,
     de_bound: Option<Vec<ast::WherePredicate>>,
 }
 
-impl ContainerAttrs {
+impl Item {
     /// Extract out the `#[serde(...)]` attributes from an item.
-    pub fn from_item(cx: &ExtCtxt, item: &ast::Item) -> Result<Self, Error> {
-        let mut container_attrs = ContainerAttrs {
-            name: Name::new(item.ident),
-            deny_unknown_fields: false,
-            ser_bound: None,
-            de_bound: None,
-        };
+    pub fn from_ast(cx: &ExtCtxt, item: &ast::Item) -> 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_item in meta_items {
+                let span = meta_item.span;
                 match meta_item.node {
                     // Parse `#[serde(rename="foo")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
-                        let s = try!(get_str_from_lit(cx, name, lit));
-                        container_attrs.name.serialize_name = Some(s.clone());
-                        container_attrs.name.deserialize_name = Some(s);
+                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
+                            ser_name.set(span, s.clone());
+                            de_name.set(span, s);
+                        }
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
                     ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
-                        let (ser_name, de_name) = try!(get_renames(cx, meta_items));
-                        if ser_name.is_some() {
-                            container_attrs.name.serialize_name = ser_name;
-                        }
-                        if de_name.is_some() {
-                            container_attrs.name.deserialize_name = de_name;
+                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
+                            ser_name.set_opt(ser);
+                            de_name.set_opt(de);
                         }
                     }
 
                     // Parse `#[serde(deny_unknown_fields)]`
                     ast::MetaItemKind::Word(ref name) if name == &"deny_unknown_fields" => {
-                        container_attrs.deny_unknown_fields = true;
+                        deny_unknown_fields.set_true(span);
                     }
 
                     // Parse `#[serde(bound="D: Serialize")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"bound" => {
-                        let where_predicates = try!(parse_lit_into_where(cx, name, lit));
-                        container_attrs.ser_bound = Some(where_predicates.clone());
-                        container_attrs.de_bound = Some(where_predicates);
+                        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);
+                        }
                     }
 
                     // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
                     ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
-                        let (ser_bound, de_bound) = try!(get_where_predicates(cx, meta_items));
-                        if ser_bound.is_some() {
-                            container_attrs.ser_bound = ser_bound;
-                        }
-                        if de_bound.is_some() {
-                            container_attrs.de_bound = de_bound;
+                        if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
+                            ser_bound.set_opt(ser);
+                            de_bound.set_opt(de);
                         }
                     }
 
@@ -125,14 +166,20 @@ impl ContainerAttrs {
                             meta_item.span,
                             &format!("unknown serde container attribute `{}`",
                                      meta_item_to_string(meta_item)));
-
-                        return Err(Error);
                     }
                 }
             }
         }
 
-        Ok(container_attrs)
+        Item {
+            name: Name {
+                serialize: ser_name.get().unwrap_or(ident.clone()),
+                deserialize: de_name.get().unwrap_or(ident),
+            },
+            deny_unknown_fields: deny_unknown_fields.get(),
+            ser_bound: ser_bound.get(),
+            de_bound: de_bound.get(),
+        }
     }
 
     pub fn name(&self) -> &Name {
@@ -154,34 +201,34 @@ impl ContainerAttrs {
 
 /// Represents variant attribute information
 #[derive(Debug)]
-pub struct VariantAttrs {
+pub struct Variant {
     name: Name,
 }
 
-impl VariantAttrs {
-    pub fn from_variant(cx: &ExtCtxt, variant: &ast::Variant) -> Result<Self, Error> {
-        let mut variant_attrs = VariantAttrs {
-            name: Name::new(variant.node.name),
-        };
+impl Variant {
+    pub fn from_ast(cx: &ExtCtxt, variant: &ast::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_item in meta_items {
+                let span = meta_item.span;
                 match meta_item.node {
                     // Parse `#[serde(rename="foo")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
-                        let s = try!(get_str_from_lit(cx, name, lit));
-                        variant_attrs.name.serialize_name = Some(s.clone());
-                        variant_attrs.name.deserialize_name = Some(s);
+                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
+                            ser_name.set(span, s.clone());
+                            de_name.set(span, s);
+                        }
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
                     ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
-                        let (ser_name, de_name) = try!(get_renames(cx, meta_items));
-                        if ser_name.is_some() {
-                            variant_attrs.name.serialize_name = ser_name;
-                        }
-                        if de_name.is_some() {
-                            variant_attrs.name.deserialize_name = de_name;
+                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
+                            ser_name.set_opt(ser);
+                            de_name.set_opt(de);
                         }
                     }
 
@@ -190,14 +237,17 @@ impl VariantAttrs {
                             meta_item.span,
                             &format!("unknown serde variant attribute `{}`",
                                      meta_item_to_string(meta_item)));
-
-                        return Err(Error);
                     }
                 }
             }
         }
 
-        Ok(variant_attrs)
+        Variant {
+            name: Name {
+                serialize: ser_name.get().unwrap_or(ident.clone()),
+                deserialize: de_name.get().unwrap_or(ident),
+            },
+        }
     }
 
     pub fn name(&self) -> &Name {
@@ -207,128 +257,126 @@ impl VariantAttrs {
 
 /// Represents field attribute information
 #[derive(Debug)]
-pub struct FieldAttrs {
+pub struct Field {
     name: Name,
-    skip_serializing_field: bool,
-    skip_deserializing_field: bool,
+    skip_serializing: bool,
+    skip_deserializing: bool,
     skip_serializing_if: Option<ast::Path>,
-    default_expr_if_missing: Option<P<ast::Expr>>,
+    default: FieldDefault,
     serialize_with: Option<ast::Path>,
     deserialize_with: Option<ast::Path>,
     ser_bound: Option<Vec<ast::WherePredicate>>,
     de_bound: Option<Vec<ast::WherePredicate>>,
 }
 
-impl FieldAttrs {
+/// Represents the default to use for a field when deserializing.
+#[derive(Debug, PartialEq)]
+pub enum FieldDefault {
+    /// Field must always be specified because it does not have a default.
+    None,
+    /// The default is given by `std::default::Default::default()`.
+    Default,
+    /// The default is given by this function.
+    Path(ast::Path),
+}
+
+impl Field {
     /// Extract out the `#[serde(...)]` attributes from a struct field.
-    pub fn from_field(cx: &ExtCtxt,
-                      index: usize,
-                      field: &ast::StructField) -> Result<Self, Error> {
-        let builder = AstBuilder::new();
+    pub fn from_ast(cx: &ExtCtxt,
+                    index: usize,
+                    field: &ast::StructField) -> Self {
+        let mut ser_name = Attr::none(cx, "rename");
+        let mut de_name = Attr::none(cx, "rename");
+        let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
+        let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing");
+        let mut skip_serializing_if = Attr::none(cx, "skip_serializing_if");
+        let mut default = Attr::none(cx, "default");
+        let mut serialize_with = Attr::none(cx, "serialize_with");
+        let mut deserialize_with = Attr::none(cx, "deserialize_with");
+        let mut ser_bound = Attr::none(cx, "bound");
+        let mut de_bound = Attr::none(cx, "bound");
 
-        let field_ident = match field.ident {
-            Some(ident) => ident,
-            None => builder.id(index.to_string()),
-        };
-
-        let mut field_attrs = FieldAttrs {
-            name: Name::new(field_ident),
-            skip_serializing_field: false,
-            skip_deserializing_field: false,
-            skip_serializing_if: None,
-            default_expr_if_missing: None,
-            serialize_with: None,
-            deserialize_with: None,
-            ser_bound: None,
-            de_bound: None,
+        let ident = match field.ident {
+            Some(ident) => ident.name.as_str(),
+            None => token::intern_and_get_ident(&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 {
                     // Parse `#[serde(rename="foo")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
-                        let s = try!(get_str_from_lit(cx, name, lit));
-                        field_attrs.name.serialize_name = Some(s.clone());
-                        field_attrs.name.deserialize_name = Some(s);
+                        if let Ok(s) = get_str_from_lit(cx, name, lit) {
+                            ser_name.set(span, s.clone());
+                            de_name.set(span, s);
+                        }
                     }
 
                     // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
                     ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
-                        let (ser_name, de_name) = try!(get_renames(cx, meta_items));
-                        if ser_name.is_some() {
-                            field_attrs.name.serialize_name = ser_name;
-                        }
-                        if de_name.is_some() {
-                            field_attrs.name.deserialize_name = de_name;
+                        if let Ok((ser, de)) = get_renames(cx, meta_items) {
+                            ser_name.set_opt(ser);
+                            de_name.set_opt(de);
                         }
                     }
 
                     // Parse `#[serde(default)]`
                     ast::MetaItemKind::Word(ref name) if name == &"default" => {
-                        let default_expr = builder.expr().default();
-                        field_attrs.default_expr_if_missing = Some(default_expr);
+                        default.set(span, FieldDefault::Default);
                     }
 
                     // Parse `#[serde(default="...")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"default" => {
-                        let wrapped_expr = wrap_default(
-                            try!(parse_lit_into_path(cx, name, lit)),
-                        );
-
-                        field_attrs.default_expr_if_missing = Some(wrapped_expr);
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            default.set(span, FieldDefault::Path(path));
+                        }
                     }
 
                     // Parse `#[serde(skip_serializing)]`
                     ast::MetaItemKind::Word(ref name) if name == &"skip_serializing" => {
-                        field_attrs.skip_serializing_field = true;
+                        skip_serializing.set_true(span);
                     }
 
                     // Parse `#[serde(skip_deserializing)]`
                     ast::MetaItemKind::Word(ref name) if name == &"skip_deserializing" => {
-                        field_attrs.skip_deserializing_field = true;
-
-                        // Initialize field to Default::default() unless a different
-                        // default is specified by `#[serde(default="...")]`
-                        if field_attrs.default_expr_if_missing.is_none() {
-                            let default_expr = builder.expr().default();
-                            field_attrs.default_expr_if_missing = Some(default_expr);
-                        }
+                        skip_deserializing.set_true(span);
                     }
 
                     // Parse `#[serde(skip_serializing_if="...")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"skip_serializing_if" => {
-                        let path = try!(parse_lit_into_path(cx, name, lit));
-                        field_attrs.skip_serializing_if = Some(path);
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            skip_serializing_if.set(span, path);
+                        }
                     }
 
                     // Parse `#[serde(serialize_with="...")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize_with" => {
-                        let path = try!(parse_lit_into_path(cx, name, lit));
-                        field_attrs.serialize_with = Some(path);
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            serialize_with.set(span, path);
+                        }
                     }
 
                     // Parse `#[serde(deserialize_with="...")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize_with" => {
-                        let path = try!(parse_lit_into_path(cx, name, lit));
-                        field_attrs.deserialize_with = Some(path);
+                        if let Ok(path) = parse_lit_into_path(cx, name, lit) {
+                            deserialize_with.set(span, path);
+                        }
                     }
 
                     // Parse `#[serde(bound="D: Serialize")]`
                     ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"bound" => {
-                        let where_predicates = try!(parse_lit_into_where(cx, name, lit));
-                        field_attrs.ser_bound = Some(where_predicates.clone());
-                        field_attrs.de_bound = Some(where_predicates);
+                        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);
+                        }
                     }
 
                     // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
                     ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
-                        let (ser_bound, de_bound) = try!(get_where_predicates(cx, meta_items));
-                        if ser_bound.is_some() {
-                            field_attrs.ser_bound = ser_bound;
-                        }
-                        if de_bound.is_some() {
-                            field_attrs.de_bound = de_bound;
+                        if let Ok((ser, de)) = get_where_predicates(cx, meta_items) {
+                            ser_bound.set_opt(ser);
+                            de_bound.set_opt(de);
                         }
                     }
 
@@ -337,34 +385,51 @@ impl FieldAttrs {
                             meta_item.span,
                             &format!("unknown serde field attribute `{}`",
                                      meta_item_to_string(meta_item)));
-
-                        return Err(Error);
                     }
                 }
             }
         }
 
-        Ok(field_attrs)
+        // 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);
+        }
+
+        Field {
+            name: Name {
+                serialize: ser_name.get().unwrap_or(ident.clone()),
+                deserialize: de_name.get().unwrap_or(ident),
+            },
+            skip_serializing: skip_serializing.get(),
+            skip_deserializing: skip_deserializing.get(),
+            skip_serializing_if: skip_serializing_if.get(),
+            default: default.get().unwrap_or(FieldDefault::None),
+            serialize_with: serialize_with.get(),
+            deserialize_with: deserialize_with.get(),
+            ser_bound: ser_bound.get(),
+            de_bound: de_bound.get(),
+        }
     }
 
     pub fn name(&self) -> &Name {
         &self.name
     }
 
-    pub fn skip_serializing_field(&self) -> bool {
-        self.skip_serializing_field
+    pub fn skip_serializing(&self) -> bool {
+        self.skip_serializing
     }
 
-    pub fn skip_deserializing_field(&self) -> bool {
-        self.skip_deserializing_field
+    pub fn skip_deserializing(&self) -> bool {
+        self.skip_deserializing
     }
 
     pub fn skip_serializing_if(&self) -> Option<&ast::Path> {
         self.skip_serializing_if.as_ref()
     }
 
-    pub fn default_expr_if_missing(&self) -> Option<&P<ast::Expr>> {
-        self.default_expr_if_missing.as_ref()
+    pub fn default(&self) -> &FieldDefault {
+        &self.default
     }
 
     pub fn serialize_with(&self) -> Option<&ast::Path> {
@@ -384,42 +449,29 @@ impl FieldAttrs {
     }
 }
 
-
-/// Zip together fields and `#[serde(...)]` attributes on those fields.
-pub fn fields_with_attrs(
-    cx: &ExtCtxt,
-    fields: &[ast::StructField],
-) -> Result<Vec<(ast::StructField, FieldAttrs)>, Error> {
-    fields.iter()
-        .enumerate()
-        .map(|(i, field)| {
-            let attrs = try!(FieldAttrs::from_field(cx, i, field));
-            Ok((field.clone(), attrs))
-        })
-        .collect()
-}
-
 fn get_ser_and_de<T, F>(
     cx: &ExtCtxt,
-    attribute: &str,
+    attribute: &'static str,
     items: &[P<ast::MetaItem>],
     f: F
-) -> Result<(Option<T>, Option<T>), Error>
-    where F: Fn(&ExtCtxt, &str, &ast::Lit) -> Result<T, Error>,
+) -> Result<(Option<Spanned<T>>, Option<Spanned<T>>), ()>
+    where F: Fn(&ExtCtxt, &str, &ast::Lit) -> Result<T, ()>,
 {
-    let mut ser_item = None;
-    let mut de_item = None;
+    let mut ser_item = Attr::none(cx, attribute);
+    let mut de_item = Attr::none(cx, attribute);
 
     for item in items {
         match item.node {
             ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize" => {
-                let s = try!(f(cx, name, lit));
-                ser_item = Some(s);
+                if let Ok(v) = f(cx, name, lit) {
+                    ser_item.set(item.span, v);
+                }
             }
 
             ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize" => {
-                let s = try!(f(cx, name, lit));
-                de_item = Some(s);
+                if let Ok(v) = f(cx, name, lit) {
+                    de_item.set(item.span, v);
+                }
             }
 
             _ => {
@@ -429,25 +481,25 @@ fn get_ser_and_de<T, F>(
                              attribute,
                              meta_item_to_string(item)));
 
-                return Err(Error);
+                return Err(());
             }
         }
     }
 
-    Ok((ser_item, de_item))
+    Ok((ser_item.get_spanned(), de_item.get_spanned()))
 }
 
 fn get_renames(
     cx: &ExtCtxt,
     items: &[P<ast::MetaItem>],
-) -> Result<(Option<InternedString>, Option<InternedString>), Error> {
+) -> Result<(Option<Spanned<InternedString>>, Option<Spanned<InternedString>>), ()> {
     get_ser_and_de(cx, "rename", items, get_str_from_lit)
 }
 
 fn get_where_predicates(
     cx: &ExtCtxt,
     items: &[P<ast::MetaItem>],
-) -> Result<(Option<Vec<ast::WherePredicate>>, Option<Vec<ast::WherePredicate>>), Error> {
+) -> Result<(Option<Spanned<Vec<ast::WherePredicate>>>, Option<Spanned<Vec<ast::WherePredicate>>>), ()> {
     get_ser_and_de(cx, "bound", items, parse_lit_into_where)
 }
 
@@ -478,7 +530,7 @@ impl<'a, 'b> Folder for Respanner<'a, 'b> {
             TokenTree::Delimited(span, ref delimed) => {
                 TokenTree::Delimited(
                     self.new_span(span),
-                    Rc::new(ast::Delimited {
+                    Rc::new(tokenstream::Delimited {
                         delim: delimed.delim,
                         open_span: delimed.open_span,
                         tts: self.fold_tts(&delimed.tts),
@@ -489,7 +541,7 @@ impl<'a, 'b> Folder for Respanner<'a, 'b> {
             TokenTree::Sequence(span, ref seq) => {
                 TokenTree::Sequence(
                     self.new_span(span),
-                    Rc::new(ast::SequenceRepetition {
+                    Rc::new(tokenstream::SequenceRepetition {
                         tts: self.fold_tts(&seq.tts),
                         separator: seq.separator.clone().map(|tok| self.fold_token(tok)),
                         ..**seq
@@ -508,7 +560,7 @@ impl<'a, 'b> Folder for Respanner<'a, 'b> {
     }
 }
 
-fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<InternedString, Error> {
+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()),
         _ => {
@@ -518,7 +570,7 @@ fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<Interned
                          name,
                          lit_to_string(lit)));
 
-            return Err(Error);
+            return Err(());
         }
     }
 }
@@ -529,7 +581,7 @@ fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<Interned
 // 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, Error>
+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(
@@ -547,7 +599,7 @@ fn parse_string_via_tts<T, F>(cx: &ExtCtxt, name: &str, string: String, action:
         Ok(path) => path,
         Err(mut e) => {
             e.emit();
-            return Err(Error);
+            return Err(());
         }
     };
 
@@ -556,14 +608,14 @@ fn parse_string_via_tts<T, F>(cx: &ExtCtxt, name: &str, string: String, action:
         Ok(()) => { }
         Err(mut e) => {
             e.emit();
-            return Err(Error);
+            return Err(());
         }
     }
 
     Ok(path)
 }
 
-fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::Path, Error> {
+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| {
@@ -571,7 +623,7 @@ fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::
     })
 }
 
-fn parse_lit_into_where(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<Vec<ast::WherePredicate>, Error> {
+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));
     if string.is_empty() {
         return Ok(Vec::new());
@@ -584,11 +636,3 @@ fn parse_lit_into_where(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<Vec<
         Ok(where_clause.predicates)
     })
 }
-
-/// This function wraps the expression in `#[serde(default="...")]` in a function to prevent it
-/// from accessing the internal `Deserialize` state.
-fn wrap_default(path: ast::Path) -> P<ast::Expr> {
-    AstBuilder::new().expr().call()
-        .build_path(path)
-        .build()
-}

serde_codegen_internals/src/error.rs

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

@@ -0,0 +1,21 @@
+#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
+#![cfg_attr(feature = "nightly-testing", 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;
+
+pub mod ast;
+pub mod attr;
+
+mod error;
+pub use error::Error;

serde_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_macros"
-version = "0.7.9"
+version = "0.7.14"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
@@ -18,12 +18,15 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
-serde_codegen = { version = "^0.7.9", path = "../serde_codegen", default-features = false, features = ["nightly"] }
+serde_codegen = { version = "^0.7.14", path = "../serde_codegen", default-features = false, features = ["nightly"] }
 
 [dev-dependencies]
-compiletest_rs = "^0.1.1"
+clippy = "^0.0.78"
+compiletest_rs = "^0.2.0"
+fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = { version = "^0.7.9", path = "../serde" }
+serde = { version = "^0.7.14", path = "../serde" }
+serde_test = { version = "^0.7.14", path = "../serde_test" }
 
 [[test]]
 name = "test"

serde_macros/benches/bench.rs

@@ -6,4 +6,4 @@ extern crate rustc_serialize;
 extern crate serde;
 extern crate test;
 
-include!("../../serde_tests/benches/bench.rs.in");
+include!("../../testing/benches/bench.rs.in");

serde_macros/tests/compile-fail/duplicate_attributes.rs

@@ -0,0 +1,32 @@
+#![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/str_ref_deser.rs

@@ -0,0 +1,9 @@
+#![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_macros/tests/compile_tests.rs

@@ -20,6 +20,11 @@ fn run_mode(mode: &'static str) {
 }
 
 #[test]
-fn compile_test() {
+fn compile_fail() {
     run_mode("compile-fail");
 }
+
+#[test]
+fn run_pass() {
+    run_mode("run-pass");
+}

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

@@ -0,0 +1,12 @@
+#![feature(custom_derive, plugin)]
+#![plugin(serde_macros, clippy)]
+
+#![deny(identity_op)]
+
+// 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.
+#[derive(Serialize)]
+struct A { b: u8 }
+
+fn main() {}

serde_macros/tests/test.rs

@@ -4,6 +4,6 @@
 extern crate serde;
 extern crate test;
 
-include!("../../serde_tests/tests/test.rs.in");
+include!("../../testing/tests/test.rs.in");
 
 mod compile_tests;

serde_test/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "serde_test"
+version = "0.7.14"
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "Token De/Serializer for testing De/Serialize implementations"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://serde-rs.github.io/serde/serde/"
+readme = "../README.md"
+keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "src/**/*.rs"]
+
+[dependencies]
+serde = { version = "0.7.14", path = "../serde" }

serde_test/src/assert.rs

@@ -0,0 +1,54 @@
+use serde::{Serialize, Deserialize};
+
+use de::Deserializer;
+use error::Error;
+use ser::Serializer;
+use token::Token;
+
+use std::fmt::Debug;
+
+pub fn assert_tokens<T>(value: &T, tokens: &[Token<'static>])
+    where T: Serialize + Deserialize + PartialEq + Debug,
+{
+    assert_ser_tokens(value, tokens);
+    assert_de_tokens(value, tokens);
+}
+
+pub fn assert_ser_tokens<T>(value: &T, tokens: &[Token])
+    where T: Serialize,
+{
+    let mut ser = Serializer::new(tokens.iter());
+    assert_eq!(Serialize::serialize(value, &mut ser), Ok(()));
+    assert_eq!(ser.next_token(), None);
+}
+
+/// Expect an error serializing `T`.
+pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: Error)
+    where T: Serialize + PartialEq + Debug,
+{
+    let mut ser = Serializer::new(tokens.iter());
+    let v: Result<(), Error> = Serialize::serialize(value, &mut ser);
+    assert_eq!(v.as_ref(), Err(&error));
+    assert_eq!(ser.next_token(), None);
+}
+
+pub fn assert_de_tokens<T>(value: &T, tokens: &[Token<'static>])
+    where T: Deserialize + PartialEq + Debug,
+{
+    let mut de = Deserializer::new(tokens.to_vec().into_iter());
+    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
+    assert_eq!(v.as_ref(), Ok(value));
+    assert_eq!(de.next_token(), None);
+}
+
+/// Expect an error deserializing tokens into a `T`.
+pub fn assert_de_tokens_error<T>(tokens: &[Token<'static>], error: Error)
+    where T: Deserialize + PartialEq + Debug,
+{
+    let mut de = Deserializer::new(tokens.to_vec().into_iter());
+    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
+    assert_eq!(v, Err(error));
+    // There may be one token left if a peek caused the error
+    de.next_token();
+    assert_eq!(de.next_token(), None);
+}

serde_test/src/error.rs

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

serde_test/src/lib.rs

@@ -0,0 +1,22 @@
+extern crate serde;
+
+mod assert;
+pub use assert::{
+    assert_tokens,
+    assert_ser_tokens,
+    assert_ser_tokens_error,
+    assert_de_tokens,
+    assert_de_tokens_error,
+};
+
+mod ser;
+pub use ser::Serializer;
+
+mod de;
+pub use de::Deserializer;
+
+mod token;
+pub use token::Token;
+
+mod error;
+pub use error::Error;

serde_test/src/ser.rs

@@ -0,0 +1,350 @@
+use std::marker::PhantomData;
+
+use serde::ser::{
+    self,
+    MapVisitor,
+    SeqVisitor,
+    Serialize,
+};
+
+use error::Error;
+use token::Token;
+
+pub struct Serializer<'a, I>
+    where I: Iterator<Item=&'a Token<'a>>,
+{
+    tokens: I,
+    phantom: PhantomData<&'a Token<'a>>,
+}
+
+impl<'a, I> Serializer<'a, I>
+    where I: Iterator<Item=&'a Token<'a>>,
+{
+    pub fn new(tokens: I) -> Serializer<'a, I> {
+        Serializer {
+            tokens: tokens,
+            phantom: PhantomData,
+        }
+    }
+
+    pub fn next_token(&mut self) -> Option<&'a Token<'a>> {
+        self.tokens.next()
+    }
+
+    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<(), Error>
+        where V: SeqVisitor
+    {
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::SeqEnd));
+
+        Ok(())
+    }
+
+    fn visit_map<V>(&mut self, mut visitor: V) -> Result<(), Error>
+        where V: MapVisitor
+    {
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::MapEnd));
+
+        Ok(())
+    }
+}
+
+impl<'a, I> ser::Serializer for Serializer<'a, I>
+    where I: Iterator<Item=&'a Token<'a>>,
+{
+    type Error = Error;
+
+    fn serialize_unit(&mut self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Unit));
+        Ok(())
+    }
+
+    fn serialize_newtype_variant<T>(&mut self,
+                                name: &str,
+                                _variant_index: usize,
+                                variant: &str,
+                                value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumNewType(name, variant)));
+        value.serialize(self)
+    }
+
+    fn serialize_unit_struct(&mut self, name: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::UnitStruct(name)));
+        Ok(())
+    }
+
+    fn serialize_unit_variant(&mut self,
+                          name: &str,
+                          _variant_index: usize,
+                          variant: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumUnit(name, variant)));
+
+        Ok(())
+    }
+
+    fn serialize_bool(&mut self, v: bool) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Bool(v)));
+        Ok(())
+    }
+
+    fn serialize_isize(&mut self, v: isize) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Isize(v)));
+        Ok(())
+    }
+
+    fn serialize_i8(&mut self, v: i8) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I8(v)));
+        Ok(())
+    }
+
+    fn serialize_i16(&mut self, v: i16) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I16(v)));
+        Ok(())
+    }
+
+    fn serialize_i32(&mut self, v: i32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I32(v)));
+        Ok(())
+    }
+
+    fn serialize_i64(&mut self, v: i64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::I64(v)));
+        Ok(())
+    }
+
+    fn serialize_usize(&mut self, v: usize) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Usize(v)));
+        Ok(())
+    }
+
+    fn serialize_u8(&mut self, v: u8) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U8(v)));
+        Ok(())
+    }
+
+    fn serialize_u16(&mut self, v: u16) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U16(v)));
+        Ok(())
+    }
+
+    fn serialize_u32(&mut self, v: u32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U32(v)));
+        Ok(())
+    }
+
+    fn serialize_u64(&mut self, v: u64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::U64(v)));
+        Ok(())
+    }
+
+    fn serialize_f32(&mut self, v: f32) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::F32(v)));
+        Ok(())
+    }
+
+    fn serialize_f64(&mut self, v: f64) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::F64(v)));
+        Ok(())
+    }
+
+    fn serialize_char(&mut self, v: char) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Char(v)));
+        Ok(())
+    }
+
+    fn serialize_str(&mut self, v: &str) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Str(v)));
+        Ok(())
+    }
+
+    fn serialize_none(&mut self) -> Result<(), Error> {
+        assert_eq!(self.tokens.next(), Some(&Token::Option(false)));
+        Ok(())
+    }
+
+    fn serialize_some<V>(&mut self, value: V) -> Result<(), Error>
+        where V: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::Option(true)));
+        value.serialize(self)
+    }
+
+
+    fn serialize_seq<V>(&mut self, visitor: V) -> Result<(), Error>
+        where V: SeqVisitor
+    {
+        let len = visitor.len();
+
+        assert_eq!(self.tokens.next(), Some(&Token::SeqStart(len)));
+
+        self.visit_seq(visitor)
+    }
+
+    fn serialize_fixed_size_array<V>(&mut self, visitor: V) -> Result<(), Error>
+        where V: SeqVisitor
+    {
+        let len = visitor.len().expect("arrays must have a length");
+
+        assert_eq!(self.tokens.next(), Some(&Token::SeqArrayStart(len)));
+
+        self.visit_seq(visitor)
+    }
+
+    fn serialize_seq_elt<T>(&mut self, value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::SeqSep));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple<V>(&mut self, mut visitor: V) -> Result<(), Error>
+        where V: SeqVisitor
+    {
+        let len = visitor.len().expect("arrays must have a length");
+
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStart(len)));
+
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::TupleEnd));
+
+        Ok(())
+    }
+
+    fn serialize_tuple_elt<T>(&mut self, value: T) -> Result<(), Error>
+        where T: Serialize
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleSep));
+        value.serialize(self)
+    }
+
+    fn serialize_newtype_struct<T>(&mut self,
+                               name: &'static str,
+                               value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::StructNewType(name)));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple_struct<V>(&mut self, name: &str, mut visitor: V) -> Result<(), Error>
+        where V: SeqVisitor
+    {
+        let len = visitor.len();
+
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructStart(name, len)));
+
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructEnd));
+
+        Ok(())
+    }
+
+    fn serialize_tuple_struct_elt<T>(&mut self, value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::TupleStructSep));
+        value.serialize(self)
+    }
+
+    fn serialize_tuple_variant<V>(&mut self,
+                                  name: &str,
+                                  _variant_index: usize,
+                                  variant: &str,
+                                  mut visitor: V) -> Result<(), Error>
+        where V: SeqVisitor
+    {
+        let len = visitor.len();
+
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqStart(name, variant, len)));
+
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqEnd));
+
+        Ok(())
+    }
+
+    fn serialize_tuple_variant_elt<T>(&mut self, value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqSep));
+        value.serialize(self)
+    }
+
+    fn serialize_map<V>(&mut self, visitor: V) -> Result<(), Error>
+        where V: MapVisitor
+    {
+        let len = visitor.len();
+
+        assert_eq!(self.tokens.next(), Some(&Token::MapStart(len)));
+
+        self.visit_map(visitor)
+    }
+
+    fn serialize_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Error>
+        where K: Serialize,
+              V: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::MapSep));
+
+        try!(key.serialize(self));
+        value.serialize(self)
+    }
+
+    fn serialize_struct<V>(&mut self, name: &str, mut visitor: V) -> Result<(), Error>
+        where V: MapVisitor
+    {
+        let len = visitor.len();
+
+        assert_eq!(self.tokens.next(), Some(&Token::StructStart(name, len)));
+
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::StructEnd));
+
+        Ok(())
+    }
+
+    fn serialize_struct_elt<T>(&mut self, key: &'static str, value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::StructSep));
+
+        try!(key.serialize(self));
+        value.serialize(self)
+    }
+
+    fn serialize_struct_variant<V>(&mut self,
+                                   name: &str,
+                                   _variant_index: usize,
+                                   variant: &str,
+                                   mut visitor: V) -> Result<(), Error>
+        where V: MapVisitor
+    {
+        let len = visitor.len();
+
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapStart(name, variant, len)));
+
+        while let Some(()) = try!(visitor.visit(self)) { }
+
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapEnd));
+
+        Ok(())
+    }
+
+    fn serialize_struct_variant_elt<T>(&mut self, key: &'static str, value: T) -> Result<(), Error>
+        where T: Serialize,
+    {
+        assert_eq!(self.tokens.next(), Some(&Token::EnumMapSep));
+
+        try!(key.serialize(self));
+        value.serialize(self)
+    }
+}

serde_test/src/token.rs

@@ -0,0 +1,60 @@
+#[derive(Clone, PartialEq, Debug)]
+pub enum Token<'a> {
+    Bool(bool),
+    Isize(isize),
+    I8(i8),
+    I16(i16),
+    I32(i32),
+    I64(i64),
+    Usize(usize),
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    F32(f32),
+    F64(f64),
+    Char(char),
+    Str(&'a str),
+    String(String),
+    Bytes(&'a [u8]),
+
+    Option(bool),
+
+    Unit,
+    UnitStruct(&'a str),
+
+    StructNewType(&'a str),
+
+    EnumStart(&'a str),
+    EnumUnit(&'a str, &'a str),
+    EnumNewType(&'a str, &'a str),
+
+    SeqStart(Option<usize>),
+    SeqArrayStart(usize),
+    SeqSep,
+    SeqEnd,
+
+    TupleStart(usize),
+    TupleSep,
+    TupleEnd,
+
+    TupleStructStart(&'a str, Option<usize>),
+    TupleStructSep,
+    TupleStructEnd,
+
+    MapStart(Option<usize>),
+    MapSep,
+    MapEnd,
+
+    StructStart(&'a str, Option<usize>),
+    StructSep,
+    StructEnd,
+
+    EnumSeqStart(&'a str, &'a str, Option<usize>),
+    EnumSeqSep,
+    EnumSeqEnd,
+
+    EnumMapStart(&'a str, &'a str, Option<usize>),
+    EnumMapSep,
+    EnumMapEnd,
+}

testing/Cargo.toml

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

testing/build.rs

@@ -1,4 +1,3 @@
-extern crate syntex;
 extern crate serde_codegen;
 
 use std::env;
@@ -13,10 +12,6 @@ fn main() {
     ] {
         let src = Path::new(src);
         let dst = Path::new(&out_dir).join(dst);
-
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }

testing/tests/macros.rs

@@ -5,7 +5,7 @@ macro_rules! declare_ser_tests {
             #[test]
             fn $name() {
                 $(
-                    ::token::assert_ser_tokens(&$value, $tokens);
+                    assert_ser_tokens(&$value, $tokens);
                 )+
             }
         )+
@@ -62,6 +62,14 @@ macro_rules! hashset {
             $(set.insert($value);)+
             set
         }
+    };
+    ($hasher:ident @ $($value:expr),+) => {
+        {
+            use std::hash::BuildHasherDefault;
+            let mut set = HashSet::with_hasher(BuildHasherDefault::<$hasher>::default());
+            $(set.insert($value);)+
+            set
+        }
     }
 }
 
@@ -75,5 +83,13 @@ macro_rules! hashmap {
             $(map.insert($key, $value);)+
             map
         }
+    };
+    ($hasher:ident @ $($key:expr => $value:expr),+) => {
+        {
+            use std::hash::BuildHasherDefault;
+            let mut map = HashMap::with_hasher(BuildHasherDefault::<$hasher>::default());
+            $(map.insert($key, $value);)+
+            map
+        }
     }
 }

testing/tests/test.rs.in

@@ -1,8 +1,6 @@
 #[macro_use]
 mod macros;
 
-mod token;
-
 mod test_annotations;
 mod test_bytes;
 mod test_de;

testing/tests/test_annotations.rs

@@ -1,7 +1,8 @@
 extern crate serde;
 use self::serde::{Serialize, Serializer, Deserialize, Deserializer};
 
-use token::{
+extern crate serde_test;
+use self::serde_test::{
     Error,
     Token,
     assert_tokens,
@@ -80,7 +81,7 @@ struct DefaultStruct<A, B, C, D, E>
 fn test_default_struct() {
     assert_de_tokens(
         &DefaultStruct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
-        vec![
+        &[
             Token::StructStart("DefaultStruct", Some(3)),
 
             Token::StructSep,
@@ -109,7 +110,7 @@ fn test_default_struct() {
 
     assert_de_tokens(
         &DefaultStruct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 },
-        vec![
+        &[
             Token::StructStart("DefaultStruct", Some(1)),
 
             Token::StructSep,
@@ -143,7 +144,7 @@ enum DefaultEnum<A, B, C, D, E>
 fn test_default_enum() {
     assert_de_tokens(
         &DefaultEnum::Struct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
-        vec![
+        &[
             Token::EnumMapStart("DefaultEnum", "Struct", Some(5)),
 
             Token::EnumMapSep,
@@ -172,7 +173,7 @@ fn test_default_enum() {
 
     assert_de_tokens(
         &DefaultEnum::Struct { a1: 1, a2: 0, a3: 123, a4: 0, a5: 123 },
-        vec![
+        &[
             Token::EnumMapStart("DefaultEnum", "Struct", Some(5)),
 
             Token::EnumMapSep,
@@ -206,7 +207,7 @@ struct ContainsNoStdDefault<A: MyDefault> {
 fn test_no_std_default() {
     assert_de_tokens(
         &ContainsNoStdDefault { a: NoStdDefault(123) },
-        vec![
+        &[
             Token::StructStart("ContainsNoStdDefault", Some(1)),
             Token::StructEnd,
         ]
@@ -214,7 +215,7 @@ fn test_no_std_default() {
 
     assert_de_tokens(
         &ContainsNoStdDefault { a: NoStdDefault(8) },
-        vec![
+        &[
             Token::StructStart("ContainsNoStdDefault", Some(1)),
 
             Token::StructSep,
@@ -279,7 +280,7 @@ fn test_elt_not_deserialize() {
             c: NotDeserializeStruct(123),
             e: NotDeserializeEnum::Trouble,
         },
-        vec![
+        &[
             Token::StructStart("ContainsNotDeserialize", Some(3)),
             Token::StructEnd,
         ]
@@ -297,7 +298,7 @@ fn test_ignore_unknown() {
     // 'Default' allows unknown. Basic smoke test of ignore...
     assert_de_tokens(
         &DefaultStruct { a1: 1, a2: 2, a3: 3, a4: 0, a5: 123 },
-        vec![
+        &[
             Token::StructStart("DefaultStruct", Some(5)),
 
             Token::StructSep,
@@ -332,7 +333,7 @@ fn test_ignore_unknown() {
     );
 
     assert_de_tokens_error::<DenyUnknown>(
-        vec![
+        &[
             Token::StructStart("DenyUnknown", Some(2)),
 
             Token::StructSep,
@@ -341,11 +342,8 @@ fn test_ignore_unknown() {
 
             Token::StructSep,
             Token::Str("whoops"),
-            Token::I32(2),
-
-            Token::StructEnd,
         ],
-        Error::UnknownFieldError("whoops".to_owned())
+        Error::UnknownField("whoops".to_owned())
     );
 }
 
@@ -369,7 +367,7 @@ struct RenameStructSerializeDeserialize {
 fn test_rename_struct() {
     assert_tokens(
         &RenameStruct { a1: 1, a2: 2 },
-        vec![
+        &[
             Token::StructStart("Superhero", Some(2)),
 
             Token::StructSep,
@@ -403,7 +401,7 @@ fn test_rename_struct() {
 
     assert_de_tokens(
         &RenameStructSerializeDeserialize { a1: 1, a2: 2 },
-        vec![
+        &[
             Token::StructStart("SuperheroDe", Some(2)),
 
             Token::StructSep,
@@ -451,14 +449,14 @@ enum RenameEnumSerializeDeserialize<A> {
 fn test_rename_enum() {
     assert_tokens(
         &RenameEnum::Batman,
-        vec![
+        &[
             Token::EnumUnit("Superhero", "bruce_wayne"),
         ]
     );
 
     assert_tokens(
         &RenameEnum::Superman(0),
-        vec![
+        &[
             Token::EnumNewType("Superhero", "clark_kent"),
             Token::I8(0),
         ]
@@ -466,7 +464,7 @@ fn test_rename_enum() {
 
     assert_tokens(
         &RenameEnum::WonderWoman(0, 1),
-        vec![
+        &[
             Token::EnumSeqStart("Superhero", "diana_prince", Some(2)),
 
             Token::EnumSeqSep,
@@ -481,7 +479,7 @@ fn test_rename_enum() {
 
     assert_tokens(
         &RenameEnum::Flash { a: 1 },
-        vec![
+        &[
             Token::EnumMapStart("Superhero", "barry_allan", Some(1)),
 
             Token::EnumMapSep,
@@ -517,7 +515,7 @@ fn test_rename_enum() {
             a: 0,
             b: String::new(),
         },
-        vec![
+        &[
             Token::EnumMapStart("SuperheroDe", "jason_todd", Some(2)),
 
             Token::EnumMapSep,
@@ -807,7 +805,7 @@ fn test_deserialize_with_struct() {
             a: 1,
             b: 2,
         },
-        vec![
+        &[
             Token::StructStart("DeserializeWithStruct", Some(2)),
 
             Token::StructSep,
@@ -827,7 +825,7 @@ fn test_deserialize_with_struct() {
             a: 1,
             b: 123,
         },
-        vec![
+        &[
             Token::StructStart("DeserializeWithStruct", Some(2)),
 
             Token::StructSep,
@@ -859,7 +857,7 @@ fn test_deserialize_with_enum() {
             a: 1,
             b: 2,
         },
-        vec![
+        &[
             Token::EnumMapStart("DeserializeWithEnum", "Struct", Some(2)),
 
             Token::EnumMapSep,
@@ -879,7 +877,7 @@ fn test_deserialize_with_enum() {
             a: 1,
             b: 123,
         },
-        vec![
+        &[
             Token::EnumMapStart("DeserializeWithEnum", "Struct", Some(2)),
 
             Token::EnumMapSep,
@@ -898,7 +896,7 @@ fn test_deserialize_with_enum() {
 #[test]
 fn test_missing_renamed_field_struct() {
     assert_de_tokens_error::<RenameStruct>(
-        vec![
+        &[
             Token::StructStart("Superhero", Some(2)),
 
             Token::StructSep,
@@ -907,11 +905,11 @@ fn test_missing_renamed_field_struct() {
 
             Token::StructEnd,
         ],
-        Error::MissingFieldError("a3"),
+        Error::MissingField("a3"),
     );
 
     assert_de_tokens_error::<RenameStructSerializeDeserialize>(
-        vec![
+        &[
             Token::StructStart("SuperheroDe", Some(2)),
 
             Token::StructSep,
@@ -920,23 +918,23 @@ fn test_missing_renamed_field_struct() {
 
             Token::StructEnd,
         ],
-        Error::MissingFieldError("a5"),
+        Error::MissingField("a5"),
     );
 }
 
 #[test]
 fn test_missing_renamed_field_enum() {
     assert_de_tokens_error::<RenameEnum>(
-        vec![
+        &[
             Token::EnumMapStart("Superhero", "barry_allan", Some(1)),
 
             Token::EnumMapEnd,
         ],
-        Error::MissingFieldError("b"),
+        Error::MissingField("b"),
     );
 
     assert_de_tokens_error::<RenameEnumSerializeDeserialize<i8>>(
-        vec![
+        &[
             Token::EnumMapStart("SuperheroDe", "jason_todd", Some(2)),
 
             Token::EnumMapSep,
@@ -945,6 +943,34 @@ fn test_missing_renamed_field_enum() {
 
             Token::EnumMapEnd,
         ],
-        Error::MissingFieldError("d"),
+        Error::MissingField("d"),
+    );
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+enum InvalidLengthEnum {
+    A(i32, i32, i32),
+    B(#[serde(skip_deserializing)] i32, i32, i32),
+}
+
+#[test]
+fn test_invalid_length_enum() {
+    assert_de_tokens_error::<InvalidLengthEnum>(
+        &[
+            Token::EnumSeqStart("InvalidLengthEnum", "A", Some(3)),
+                Token::EnumSeqSep,
+                Token::I32(1),
+            Token::EnumSeqEnd,
+        ],
+        Error::InvalidLength(1),
+    );
+    assert_de_tokens_error::<InvalidLengthEnum>(
+        &[
+            Token::EnumSeqStart("InvalidLengthEnum", "B", Some(3)),
+                Token::EnumSeqSep,
+                Token::I32(1),
+            Token::EnumSeqEnd,
+        ],
+        Error::InvalidLength(1),
     );
 }

testing/tests/test_de.rs

@@ -2,11 +2,17 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::net;
 use std::path::PathBuf;
 
-use token::{
+extern crate serde;
+use self::serde::Deserialize;
+
+extern crate fnv;
+use self::fnv::FnvHasher;
+
+extern crate serde_test;
+use self::serde_test::{
     Error,
     Token,
     assert_de_tokens,
-    assert_de_tokens_ignore,
     assert_de_tokens_error,
 };
 
@@ -70,107 +76,147 @@ macro_rules! declare_error_tests {
     }
 }
 
+fn assert_de_tokens_ignore(ignorable_tokens: &[Token<'static>]) {
+    #[derive(PartialEq, Debug, Deserialize)]
+    struct IgnoreBase {
+        a: i32,
+    }
+ 
+    let expected = IgnoreBase{a: 1};
+ 
+    // Embed the tokens to be ignored in the normal token
+    // stream for an IgnoreBase type
+    let concated_tokens : Vec<Token<'static>> = vec![
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::Str("a"),
+                Token::I32(1),
+ 
+                Token::MapSep,
+                Token::Str("ignored")
+        ]
+        .into_iter()
+        .chain(ignorable_tokens.to_vec().into_iter())
+        .chain(vec![
+            Token::MapEnd,
+        ].into_iter())
+        .collect();
+ 
+    let mut de = serde_test::Deserializer::new(concated_tokens.into_iter());
+    let v: Result<IgnoreBase, Error> = Deserialize::deserialize(&mut de);
+ 
+    // We run this test on every token stream for convenience, but
+    // some token streams don't make sense embedded as a map value,
+    // so we ignore those. SyntaxError is the real sign of trouble.
+    if let Err(Error::UnexpectedToken(_)) = v {
+        return;
+    }
+ 
+    assert_eq!(v.as_ref(), Ok(&expected));
+    assert_eq!(de.next_token(), None);
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 declare_tests! {
     test_bool {
-        true => vec![Token::Bool(true)],
-        false => vec![Token::Bool(false)],
+        true => &[Token::Bool(true)],
+        false => &[Token::Bool(false)],
     }
     test_isize {
-        0isize => vec![Token::Isize(0)],
-        0isize => vec![Token::I8(0)],
-        0isize => vec![Token::I16(0)],
-        0isize => vec![Token::I32(0)],
-        0isize => vec![Token::I64(0)],
-        0isize => vec![Token::Usize(0)],
-        0isize => vec![Token::U8(0)],
-        0isize => vec![Token::U16(0)],
-        0isize => vec![Token::U32(0)],
-        0isize => vec![Token::U64(0)],
-        0isize => vec![Token::F32(0.)],
-        0isize => vec![Token::F64(0.)],
+        0isize => &[Token::Isize(0)],
+        0isize => &[Token::I8(0)],
+        0isize => &[Token::I16(0)],
+        0isize => &[Token::I32(0)],
+        0isize => &[Token::I64(0)],
+        0isize => &[Token::Usize(0)],
+        0isize => &[Token::U8(0)],
+        0isize => &[Token::U16(0)],
+        0isize => &[Token::U32(0)],
+        0isize => &[Token::U64(0)],
+        0isize => &[Token::F32(0.)],
+        0isize => &[Token::F64(0.)],
     }
     test_ints {
-        0isize => vec![Token::Isize(0)],
-        0i8 => vec![Token::I8(0)],
-        0i16 => vec![Token::I16(0)],
-        0i32 => vec![Token::I32(0)],
-        0i64 => vec![Token::I64(0)],
+        0isize => &[Token::Isize(0)],
+        0i8 => &[Token::I8(0)],
+        0i16 => &[Token::I16(0)],
+        0i32 => &[Token::I32(0)],
+        0i64 => &[Token::I64(0)],
     }
     test_uints {
-        0usize => vec![Token::Usize(0)],
-        0u8 => vec![Token::U8(0)],
-        0u16 => vec![Token::U16(0)],
-        0u32 => vec![Token::U32(0)],
-        0u64 => vec![Token::U64(0)],
+        0usize => &[Token::Usize(0)],
+        0u8 => &[Token::U8(0)],
+        0u16 => &[Token::U16(0)],
+        0u32 => &[Token::U32(0)],
+        0u64 => &[Token::U64(0)],
     }
     test_floats {
-        0f32 => vec![Token::F32(0.)],
-        0f64 => vec![Token::F64(0.)],
+        0f32 => &[Token::F32(0.)],
+        0f64 => &[Token::F64(0.)],
     }
     test_char {
-        'a' => vec![Token::Char('a')],
-        'a' => vec![Token::Str("a")],
-        'a' => vec![Token::String("a".to_owned())],
+        'a' => &[Token::Char('a')],
+        'a' => &[Token::Str("a")],
+        'a' => &[Token::String("a".to_owned())],
     }
     test_string {
-        "abc".to_owned() => vec![Token::Str("abc")],
-        "abc".to_owned() => vec![Token::String("abc".to_owned())],
-        "a".to_owned() => vec![Token::Char('a')],
+        "abc".to_owned() => &[Token::Str("abc")],
+        "abc".to_owned() => &[Token::String("abc".to_owned())],
+        "a".to_owned() => &[Token::Char('a')],
     }
     test_option {
-        None::<i32> => vec![Token::Unit],
-        None::<i32> => vec![Token::Option(false)],
-        Some(1) => vec![Token::I32(1)],
-        Some(1) => vec![
+        None::<i32> => &[Token::Unit],
+        None::<i32> => &[Token::Option(false)],
+        Some(1) => &[Token::I32(1)],
+        Some(1) => &[
             Token::Option(true),
             Token::I32(1),
         ],
     }
     test_result {
-        Ok::<i32, i32>(0) => vec![
+        Ok::<i32, i32>(0) => &[
             Token::EnumStart("Result"),
             Token::Str("Ok"),
             Token::I32(0),
         ],
-        Err::<i32, i32>(1) => vec![
+        Err::<i32, i32>(1) => &[
             Token::EnumStart("Result"),
             Token::Str("Err"),
             Token::I32(1),
         ],
     }
     test_unit {
-        () => vec![Token::Unit],
-        () => vec![
+        () => &[Token::Unit],
+        () => &[
             Token::SeqStart(Some(0)),
             Token::SeqEnd,
         ],
-        () => vec![
+        () => &[
             Token::SeqStart(None),
             Token::SeqEnd,
         ],
-        () => vec![
+        () => &[
             Token::TupleStructStart("Anything", Some(0)),
             Token::SeqEnd,
         ],
     }
     test_unit_struct {
-        UnitStruct => vec![Token::Unit],
-        UnitStruct => vec![
+        UnitStruct => &[Token::Unit],
+        UnitStruct => &[
             Token::UnitStruct("UnitStruct"),
         ],
-        UnitStruct => vec![
+        UnitStruct => &[
             Token::SeqStart(Some(0)),
             Token::SeqEnd,
         ],
-        UnitStruct => vec![
+        UnitStruct => &[
             Token::SeqStart(None),
             Token::SeqEnd,
         ],
     }
     test_tuple_struct {
-        TupleStruct(1, 2, 3) => vec![
+        TupleStruct(1, 2, 3) => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::I32(1),
@@ -182,7 +228,7 @@ declare_tests! {
                 Token::I32(3),
             Token::SeqEnd,
         ],
-        TupleStruct(1, 2, 3) => vec![
+        TupleStruct(1, 2, 3) => &[
             Token::SeqStart(None),
                 Token::SeqSep,
                 Token::I32(1),
@@ -194,7 +240,7 @@ declare_tests! {
                 Token::I32(3),
             Token::SeqEnd,
         ],
-        TupleStruct(1, 2, 3) => vec![
+        TupleStruct(1, 2, 3) => &[
             Token::TupleStructStart("TupleStruct", Some(3)),
                 Token::TupleStructSep,
                 Token::I32(1),
@@ -206,7 +252,7 @@ declare_tests! {
                 Token::I32(3),
             Token::TupleStructEnd,
         ],
-        TupleStruct(1, 2, 3) => vec![
+        TupleStruct(1, 2, 3) => &[
             Token::TupleStructStart("TupleStruct", None),
                 Token::TupleStructSep,
                 Token::I32(1),
@@ -220,14 +266,14 @@ declare_tests! {
         ],
     }
     test_btreeset {
-        BTreeSet::<isize>::new() => vec![
+        BTreeSet::<isize>::new() => &[
             Token::Unit,
         ],
-        BTreeSet::<isize>::new() => vec![
+        BTreeSet::<isize>::new() => &[
             Token::SeqStart(Some(0)),
             Token::SeqEnd,
         ],
-        btreeset![btreeset![], btreeset![1], btreeset![2, 3]] => vec![
+        btreeset![btreeset![], btreeset![1], btreeset![2, 3]] => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::SeqStart(Some(0)),
@@ -249,23 +295,23 @@ declare_tests! {
                 Token::SeqEnd,
             Token::SeqEnd,
         ],
-        BTreeSet::<isize>::new() => vec![
+        BTreeSet::<isize>::new() => &[
             Token::UnitStruct("Anything"),
         ],
-        BTreeSet::<isize>::new() => vec![
+        BTreeSet::<isize>::new() => &[
             Token::TupleStructStart("Anything", Some(0)),
             Token::SeqEnd,
         ],
     }
     test_hashset {
-        HashSet::<isize>::new() => vec![
+        HashSet::<isize>::new() => &[
             Token::Unit,
         ],
-        HashSet::<isize>::new() => vec![
+        HashSet::<isize>::new() => &[
             Token::SeqStart(Some(0)),
             Token::SeqEnd,
         ],
-        hashset![1, 2, 3] => vec![
+        hashset![1, 2, 3] => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::I32(1),
@@ -277,23 +323,35 @@ declare_tests! {
                 Token::I32(3),
             Token::SeqEnd,
         ],
-        HashSet::<isize>::new() => vec![
+        HashSet::<isize>::new() => &[
             Token::UnitStruct("Anything"),
         ],
-        HashSet::<isize>::new() => vec![
+        HashSet::<isize>::new() => &[
             Token::TupleStructStart("Anything", Some(0)),
             Token::SeqEnd,
         ],
+        hashset![FnvHasher @ 1, 2, 3] => &[
+            Token::SeqStart(Some(3)),
+                Token::SeqSep,
+                Token::I32(1),
+
+                Token::SeqSep,
+                Token::I32(2),
+
+                Token::SeqSep,
+                Token::I32(3),
+            Token::SeqEnd,
+        ],
     }
     test_vec {
-        Vec::<isize>::new() => vec![
+        Vec::<isize>::new() => &[
             Token::Unit,
         ],
-        Vec::<isize>::new() => vec![
+        Vec::<isize>::new() => &[
             Token::SeqStart(Some(0)),
             Token::SeqEnd,
         ],
-        vec![vec![], vec![1], vec![2, 3]] => vec![
+        vec![vec![], vec![1], vec![2, 3]] => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::SeqStart(Some(0)),
@@ -315,27 +373,27 @@ declare_tests! {
                 Token::SeqEnd,
             Token::SeqEnd,
         ],
-        Vec::<isize>::new() => vec![
+        Vec::<isize>::new() => &[
             Token::UnitStruct("Anything"),
         ],
-        Vec::<isize>::new() => vec![
+        Vec::<isize>::new() => &[
             Token::TupleStructStart("Anything", Some(0)),
             Token::SeqEnd,
         ],
     }
     test_array {
-        [0; 0] => vec![
+        [0; 0] => &[
             Token::Unit,
         ],
-        [0; 0] => vec![
+        [0; 0] => &[
             Token::SeqStart(Some(0)),
             Token::SeqEnd,
         ],
-        [0; 0] => vec![
+        [0; 0] => &[
             Token::SeqArrayStart(0),
             Token::SeqEnd,
         ],
-        ([0; 0], [1], [2, 3]) => vec![
+        ([0; 0], [1], [2, 3]) => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::SeqStart(Some(0)),
@@ -357,7 +415,7 @@ declare_tests! {
                 Token::SeqEnd,
             Token::SeqEnd,
         ],
-        ([0; 0], [1], [2, 3]) => vec![
+        ([0; 0], [1], [2, 3]) => &[
             Token::SeqArrayStart(3),
                 Token::SeqSep,
                 Token::SeqArrayStart(0),
@@ -379,22 +437,22 @@ declare_tests! {
                 Token::SeqEnd,
             Token::SeqEnd,
         ],
-        [0; 0] => vec![
+        [0; 0] => &[
             Token::UnitStruct("Anything"),
         ],
-        [0; 0] => vec![
+        [0; 0] => &[
             Token::TupleStructStart("Anything", Some(0)),
             Token::SeqEnd,
         ],
     }
     test_tuple {
-        (1,) => vec![
+        (1,) => &[
             Token::SeqStart(Some(1)),
                 Token::SeqSep,
                 Token::I32(1),
             Token::SeqEnd,
         ],
-        (1, 2, 3) => vec![
+        (1, 2, 3) => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::I32(1),
@@ -406,13 +464,13 @@ declare_tests! {
                 Token::I32(3),
             Token::SeqEnd,
         ],
-        (1,) => vec![
+        (1,) => &[
             Token::TupleStart(1),
                 Token::TupleSep,
                 Token::I32(1),
             Token::TupleEnd,
         ],
-        (1, 2, 3) => vec![
+        (1, 2, 3) => &[
             Token::TupleStart(3),
                 Token::TupleSep,
                 Token::I32(1),
@@ -426,21 +484,21 @@ declare_tests! {
         ],
     }
     test_btreemap {
-        BTreeMap::<isize, isize>::new() => vec![
+        BTreeMap::<isize, isize>::new() => &[
             Token::Unit,
         ],
-        BTreeMap::<isize, isize>::new() => vec![
+        BTreeMap::<isize, isize>::new() => &[
             Token::MapStart(Some(0)),
             Token::MapEnd,
         ],
-        btreemap![1 => 2] => vec![
+        btreemap![1 => 2] => &[
             Token::MapStart(Some(1)),
                 Token::MapSep,
                 Token::I32(1),
                 Token::I32(2),
             Token::MapEnd,
         ],
-        btreemap![1 => 2, 3 => 4] => vec![
+        btreemap![1 => 2, 3 => 4] => &[
             Token::MapStart(Some(2)),
                 Token::MapSep,
                 Token::I32(1),
@@ -451,7 +509,7 @@ declare_tests! {
                 Token::I32(4),
             Token::MapEnd,
         ],
-        btreemap![1 => btreemap![], 2 => btreemap![3 => 4, 5 => 6]] => vec![
+        btreemap![1 => btreemap![], 2 => btreemap![3 => 4, 5 => 6]] => &[
             Token::MapStart(Some(2)),
                 Token::MapSep,
                 Token::I32(1),
@@ -471,30 +529,30 @@ declare_tests! {
                 Token::MapEnd,
             Token::MapEnd,
         ],
-        BTreeMap::<isize, isize>::new() => vec![
+        BTreeMap::<isize, isize>::new() => &[
             Token::UnitStruct("Anything"),
         ],
-        BTreeMap::<isize, isize>::new() => vec![
+        BTreeMap::<isize, isize>::new() => &[
             Token::StructStart("Anything", Some(0)),
             Token::MapEnd,
         ],
     }
     test_hashmap {
-        HashMap::<isize, isize>::new() => vec![
+        HashMap::<isize, isize>::new() => &[
             Token::Unit,
         ],
-        HashMap::<isize, isize>::new() => vec![
+        HashMap::<isize, isize>::new() => &[
             Token::MapStart(Some(0)),
             Token::MapEnd,
         ],
-        hashmap![1 => 2] => vec![
+        hashmap![1 => 2] => &[
             Token::MapStart(Some(1)),
                 Token::MapSep,
                 Token::I32(1),
                 Token::I32(2),
             Token::MapEnd,
         ],
-        hashmap![1 => 2, 3 => 4] => vec![
+        hashmap![1 => 2, 3 => 4] => &[
             Token::MapStart(Some(2)),
                 Token::MapSep,
                 Token::I32(1),
@@ -505,7 +563,7 @@ declare_tests! {
                 Token::I32(4),
             Token::MapEnd,
         ],
-        hashmap![1 => hashmap![], 2 => hashmap![3 => 4, 5 => 6]] => vec![
+        hashmap![1 => hashmap![], 2 => hashmap![3 => 4, 5 => 6]] => &[
             Token::MapStart(Some(2)),
                 Token::MapSep,
                 Token::I32(1),
@@ -525,16 +583,27 @@ declare_tests! {
                 Token::MapEnd,
             Token::MapEnd,
         ],
-        HashMap::<isize, isize>::new() => vec![
+        HashMap::<isize, isize>::new() => &[
             Token::UnitStruct("Anything"),
         ],
-        HashMap::<isize, isize>::new() => vec![
+        HashMap::<isize, isize>::new() => &[
             Token::StructStart("Anything", Some(0)),
             Token::MapEnd,
         ],
+        hashmap![FnvHasher @ 1 => 2, 3 => 4] => &[
+            Token::MapStart(Some(2)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+
+                Token::MapSep,
+                Token::I32(3),
+                Token::I32(4),
+            Token::MapEnd,
+        ],
     }
     test_struct {
-        Struct { a: 1, b: 2, c: 0 } => vec![
+        Struct { a: 1, b: 2, c: 0 } => &[
             Token::MapStart(Some(3)),
                 Token::MapSep,
                 Token::Str("a"),
@@ -545,7 +614,7 @@ declare_tests! {
                 Token::I32(2),
             Token::MapEnd,
         ],
-        Struct { a: 1, b: 2, c: 0 } => vec![
+        Struct { a: 1, b: 2, c: 0 } => &[
             Token::StructStart("Struct", Some(3)),
                 Token::StructSep,
                 Token::Str("a"),
@@ -556,7 +625,7 @@ declare_tests! {
                 Token::I32(2),
             Token::StructEnd,
         ],
-        Struct { a: 1, b: 2, c: 0 } => vec![
+        Struct { a: 1, b: 2, c: 0 } => &[
             Token::SeqStart(Some(3)),
                 Token::SeqSep,
                 Token::I32(1),
@@ -567,7 +636,7 @@ declare_tests! {
         ],
     }
     test_struct_with_skip {
-        Struct { a: 1, b: 2, c: 0 } => vec![
+        Struct { a: 1, b: 2, c: 0 } => &[
             Token::MapStart(Some(3)),
                 Token::MapSep,
                 Token::Str("a"),
@@ -586,7 +655,7 @@ declare_tests! {
                 Token::I32(4),
             Token::MapEnd,
         ],
-        Struct { a: 1, b: 2, c: 0 } => vec![
+        Struct { a: 1, b: 2, c: 0 } => &[
             Token::StructStart("Struct", Some(3)),
                 Token::StructSep,
                 Token::Str("a"),
@@ -607,18 +676,18 @@ declare_tests! {
         ],
     }
     test_enum_unit {
-        Enum::Unit => vec![
+        Enum::Unit => &[
             Token::EnumUnit("Enum", "Unit"),
         ],
     }
     test_enum_simple {
-        Enum::Simple(1) => vec![
+        Enum::Simple(1) => &[
             Token::EnumNewType("Enum", "Simple"),
             Token::I32(1),
         ],
     }
     test_enum_seq {
-        Enum::Seq(1, 2, 3) => vec![
+        Enum::Seq(1, 2, 3) => &[
             Token::EnumSeqStart("Enum", "Seq", Some(3)),
                 Token::EnumSeqSep,
                 Token::I32(1),
@@ -632,7 +701,7 @@ declare_tests! {
         ],
     }
     test_enum_map {
-        Enum::Map { a: 1, b: 2, c: 3 } => vec![
+        Enum::Map { a: 1, b: 2, c: 3 } => &[
             Token::EnumMapStart("Enum", "Map", Some(3)),
                 Token::EnumMapSep,
                 Token::Str("a"),
@@ -649,24 +718,24 @@ declare_tests! {
         ],
     }
     test_enum_unit_usize {
-        Enum::Unit => vec![
+        Enum::Unit => &[
             Token::EnumStart("Enum"),
             Token::Usize(0),
             Token::Unit,
         ],
     }
     test_enum_unit_bytes {
-        Enum::Unit => vec![
+        Enum::Unit => &[
             Token::EnumStart("Enum"),
             Token::Bytes(b"Unit"),
             Token::Unit,
         ],
     }
     test_box {
-        Box::new(0i32) => vec![Token::I32(0)],
+        Box::new(0i32) => &[Token::I32(0)],
     }
     test_boxed_slice {
-        Box::new([0, 1, 2]) => vec![
+        Box::new([0, 1, 2]) => &[
             Token::SeqStart(Some(3)),
             Token::SeqSep,
             Token::I32(0),
@@ -678,18 +747,18 @@ declare_tests! {
         ],
     }
     test_net_ipv4addr {
-        "1.2.3.4".parse::<net::Ipv4Addr>().unwrap() => vec![Token::Str("1.2.3.4")],
+        "1.2.3.4".parse::<net::Ipv4Addr>().unwrap() => &[Token::Str("1.2.3.4")],
     }
     test_net_ipv6addr {
-        "::1".parse::<net::Ipv6Addr>().unwrap() => vec![Token::Str("::1")],
+        "::1".parse::<net::Ipv6Addr>().unwrap() => &[Token::Str("::1")],
     }
     test_net_socketaddr {
-        "1.2.3.4:1234".parse::<net::SocketAddr>().unwrap() => vec![Token::Str("1.2.3.4:1234")],
-        "1.2.3.4:1234".parse::<net::SocketAddrV4>().unwrap() => vec![Token::Str("1.2.3.4:1234")],
-        "[::1]:1234".parse::<net::SocketAddrV6>().unwrap() => vec![Token::Str("[::1]:1234")],
+        "1.2.3.4:1234".parse::<net::SocketAddr>().unwrap() => &[Token::Str("1.2.3.4:1234")],
+        "1.2.3.4:1234".parse::<net::SocketAddrV4>().unwrap() => &[Token::Str("1.2.3.4:1234")],
+        "[::1]:1234".parse::<net::SocketAddrV6>().unwrap() => &[Token::Str("[::1]:1234")],
     }
     test_path_buf {
-        PathBuf::from("/usr/local/lib") => vec![
+        PathBuf::from("/usr/local/lib") => &[
             Token::String("/usr/local/lib".to_owned()),
         ],
     }
@@ -700,30 +769,28 @@ declare_tests! {
 fn test_net_ipaddr() {
     assert_de_tokens(
         "1.2.3.4".parse::<net::IpAddr>().unwrap(),
-        vec![Token::Str("1.2.3.4")],
+        &[Token::Str("1.2.3.4")],
     );
 }
 
 declare_error_tests! {
     test_unknown_variant<Enum> {
-        vec![
+        &[
             Token::EnumUnit("Enum", "Foo"),
         ],
-        Error::UnknownVariantError("Foo".to_owned()),
+        Error::UnknownVariant("Foo".to_owned()),
     }
     test_struct_seq_too_long<Struct> {
-        vec![
+        &[
             Token::SeqStart(Some(4)),
                 Token::SeqSep, Token::I32(1),
                 Token::SeqSep, Token::I32(2),
                 Token::SeqSep, Token::I32(3),
-                Token::SeqSep, Token::I32(4),
-            Token::SeqEnd,
         ],
         Error::UnexpectedToken(Token::SeqSep),
     }
     test_duplicate_field_struct<Struct> {
-        vec![
+        &[
             Token::MapStart(Some(3)),
                 Token::MapSep,
                 Token::Str("a"),
@@ -731,13 +798,11 @@ declare_error_tests! {
 
                 Token::MapSep,
                 Token::Str("a"),
-                Token::I32(3),
-            Token::MapEnd,
         ],
-        Error::DuplicateFieldError("a"),
+        Error::DuplicateField("a"),
     }
     test_duplicate_field_enum<Enum> {
-        vec![
+        &[
             Token::EnumMapStart("Enum", "Map", Some(3)),
                 Token::EnumMapSep,
                 Token::Str("a"),
@@ -745,9 +810,7 @@ declare_error_tests! {
 
                 Token::EnumMapSep,
                 Token::Str("a"),
-                Token::I32(3),
-            Token::EnumMapEnd,
         ],
-        Error::DuplicateFieldError("a"),
+        Error::DuplicateField("a"),
     }
 }

testing/tests/test_macros.rs

@@ -1,11 +1,12 @@
-use std::marker::PhantomData;
-use token::{Token, assert_tokens, assert_ser_tokens, assert_de_tokens};
+extern crate serde_test;
+use self::serde_test::{
+    Token,
+    assert_tokens,
+    assert_ser_tokens,
+    assert_de_tokens,
+};
 
-/*
-trait Trait {
-    type Type;
-}
-*/
+use std::marker::PhantomData;
 
 // That tests that the derived Serialize implementation doesn't trigger
 // any warning about `serializer` not being used, in case of empty enums.
@@ -161,7 +162,7 @@ struct DefaultTyParam<T: AssociatedType<X=i32> = i32> {
 fn test_named_unit() {
     assert_tokens(
         &NamedUnit,
-        vec![Token::UnitStruct("NamedUnit")]
+        &[Token::UnitStruct("NamedUnit")]
     );
 }
 
@@ -192,7 +193,7 @@ fn test_ser_named_tuple() {
 fn test_de_named_tuple() {
     assert_de_tokens(
         &DeNamedTuple(5, 6, 7),
-        vec![
+        &[
             Token::SeqStart(Some(3)),
             Token::SeqSep,
             Token::I32(5),
@@ -209,7 +210,7 @@ fn test_de_named_tuple() {
 
     assert_de_tokens(
         &DeNamedTuple(5, 6, 7),
-        vec![
+        &[
             Token::TupleStructStart("DeNamedTuple", Some(3)),
             Token::TupleStructSep,
             Token::I32(5),
@@ -265,7 +266,7 @@ fn test_de_named_map() {
             b: 6,
             c: 7,
         },
-        vec![
+        &[
             Token::StructStart("DeNamedMap", Some(3)),
 
             Token::StructSep,
@@ -379,7 +380,7 @@ fn test_ser_enum_map() {
 fn test_de_enum_unit() {
     assert_tokens(
         &DeEnum::Unit::<u32, u32, u32>,
-        vec![
+        &[
             Token::EnumUnit("DeEnum", "Unit"),
         ],
     );
@@ -403,7 +404,7 @@ fn test_de_enum_seq() {
             e,
             //f,
         ),
-        vec![
+        &[
             Token::EnumSeqStart("DeEnum", "Seq", Some(4)),
 
             Token::EnumSeqSep,
@@ -441,7 +442,7 @@ fn test_de_enum_map() {
             e: e,
             //f: f,
         },
-        vec![
+        &[
             Token::EnumMapStart("DeEnum", "Map", Some(4)),
 
             Token::EnumMapSep,
@@ -516,7 +517,7 @@ fn test_lifetimes() {
 fn test_generic_struct() {
     assert_tokens(
         &GenericStruct { x: 5u32 },
-        vec![
+        &[
             Token::StructStart("GenericStruct", Some(1)),
 
             Token::StructSep,
@@ -532,7 +533,7 @@ fn test_generic_struct() {
 fn test_generic_newtype_struct() {
     assert_tokens(
         &GenericNewTypeStruct(5u32),
-        vec![
+        &[
             Token::StructNewType("GenericNewTypeStruct"),
             Token::U32(5),
         ]
@@ -543,7 +544,7 @@ fn test_generic_newtype_struct() {
 fn test_generic_tuple_struct() {
     assert_tokens(
         &GenericTupleStruct(5u32, 6u32),
-        vec![
+        &[
             Token::TupleStructStart("GenericTupleStruct", Some(2)),
 
             Token::TupleStructSep,
@@ -561,7 +562,7 @@ fn test_generic_tuple_struct() {
 fn test_generic_enum_unit() {
     assert_tokens(
         &GenericEnum::Unit::<u32, u32>,
-        vec![
+        &[
             Token::EnumUnit("GenericEnum", "Unit"),
         ]
     );
@@ -571,7 +572,7 @@ fn test_generic_enum_unit() {
 fn test_generic_enum_newtype() {
     assert_tokens(
         &GenericEnum::NewType::<u32, u32>(5),
-        vec![
+        &[
             Token::EnumNewType("GenericEnum", "NewType"),
             Token::U32(5),
         ]
@@ -582,7 +583,7 @@ fn test_generic_enum_newtype() {
 fn test_generic_enum_seq() {
     assert_tokens(
         &GenericEnum::Seq::<u32, u32>(5, 6),
-        vec![
+        &[
             Token::EnumSeqStart("GenericEnum", "Seq", Some(2)),
 
             Token::EnumSeqSep,
@@ -600,7 +601,7 @@ fn test_generic_enum_seq() {
 fn test_generic_enum_map() {
     assert_tokens(
         &GenericEnum::Map::<u32, u32> { x: 5, y: 6 },
-        vec![
+        &[
             Token::EnumMapStart("GenericEnum", "Map", Some(2)),
 
             Token::EnumMapSep,
@@ -620,7 +621,7 @@ fn test_generic_enum_map() {
 fn test_default_ty_param() {
     assert_tokens(
         &DefaultTyParam::<i32> { phantom: PhantomData },
-        vec![
+        &[
             Token::StructStart("DefaultTyParam", Some(1)),
 
             Token::StructSep,

testing/tests/test_ser.rs

@@ -1,9 +1,18 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap, HashSet};
 use std::net;
 use std::path::{Path, PathBuf};
 use std::str;
 
-use token::{self, Token};
+extern crate serde_test;
+use self::serde_test::{
+    Error,
+    Token,
+    assert_ser_tokens,
+    assert_ser_tokens_error,
+};
+
+extern crate fnv;
+use self::fnv::FnvHasher;
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -144,6 +153,24 @@ declare_ser_tests! {
             Token::SeqEnd,
         ],
     }
+    test_hashset {
+        HashSet::<isize>::new() => &[
+            Token::SeqStart(Some(0)),
+            Token::SeqEnd,
+        ],
+        hashset![1] => &[
+            Token::SeqStart(Some(1)),
+                Token::SeqSep,
+                Token::I32(1),
+            Token::SeqEnd,
+        ],
+        hashset![FnvHasher @ 1] => &[
+            Token::SeqStart(Some(1)),
+                Token::SeqSep,
+                Token::I32(1),
+            Token::SeqEnd,
+        ],
+    }
     test_tuple {
         (1,) => &[
             Token::TupleStart(1),
@@ -204,6 +231,26 @@ declare_ser_tests! {
             Token::MapEnd,
         ],
     }
+    test_hashmap {
+        HashMap::<isize, isize>::new() => &[
+            Token::MapStart(Some(0)),
+            Token::MapEnd,
+        ],
+        hashmap![1 => 2] => &[
+            Token::MapStart(Some(1)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+        hashmap![FnvHasher @ 1 => 2] => &[
+            Token::MapStart(Some(1)),
+                Token::MapSep,
+                Token::I32(1),
+                Token::I32(2),
+            Token::MapEnd,
+        ],
+    }
     test_unit_struct {
         UnitStruct => &[Token::UnitStruct("UnitStruct")],
     }
@@ -314,16 +361,16 @@ fn test_cannot_serialize_paths() {
     let path = unsafe {
         str::from_utf8_unchecked(b"Hello \xF0\x90\x80World")
     };
-    token::assert_ser_tokens_error(
+    assert_ser_tokens_error(
         &Path::new(path),
-        &[Token::Str("Hello �World")],
-        token::Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
+        &[],
+        Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
 
     let mut path_buf = PathBuf::new();
     path_buf.push(path);
 
-    token::assert_ser_tokens_error(
+    assert_ser_tokens_error(
         &path_buf,
-        &[Token::Str("Hello �World")],
-        token::Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
+        &[],
+        Error::InvalidValue("Path contains invalid UTF-8 characters".to_owned()));
 }