Release 1.0.88

Rustfmt bails out on the original code, leaving it all on one line.

.github/ISSUE_TEMPLATE/1-problem.md

@@ -0,0 +1,7 @@
+---
+name: Problem
+about: Something does not seem right
+
+---
+
+

.github/ISSUE_TEMPLATE/2-suggestion.md

@@ -0,0 +1,7 @@
+---
+name: Suggestion
+about: Share how Serde could support your use case better
+
+---
+
+

.github/ISSUE_TEMPLATE/3-documentation.md

@@ -0,0 +1,7 @@
+---
+name: Documentation
+about: Certainly there is room for improvement
+
+---
+
+

.github/ISSUE_TEMPLATE/4-discussion.md

@@ -0,0 +1,7 @@
+---
+name: Help or discussion
+about: This is the right place
+
+---
+
+

.github/ISSUE_TEMPLATE/5-other.md

@@ -0,0 +1,7 @@
+---
+name: Anything else!
+about: Whatever is on your mind
+
+---
+
+

.gitignore

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

.travis.yml

@@ -1,17 +1,95 @@
-sudo: false
 language: rust
-cache: cargo
-
-# run builds for all the trains (and more)
-rust:
-  - 1.13.0
-  - stable
-  - beta
-  - nightly
 
 matrix:
   include:
-    - rust: nightly
-      env: CLIPPY=true
+    - rust: stable
+      script:
+        - cd "${TRAVIS_BUILD_DIR}/serde"
+        - cargo build --features rc
+        - cargo build --no-default-features
+        - cd "${TRAVIS_BUILD_DIR}/serde_test"
+        - cargo build
+        - cargo test --features serde/derive,serde/rc
 
-script: ./travis.sh
+    - rust: beta
+      script:
+        - cd "${TRAVIS_BUILD_DIR}/serde"
+        - cargo build --features rc
+        - cd "${TRAVIS_BUILD_DIR}/test_suite"
+        - cargo test
+
+    - rust: nightly
+      script:
+        - cd "${TRAVIS_BUILD_DIR}/serde"
+        - cargo build
+        - cargo build --no-default-features
+        - cargo build --no-default-features --features alloc
+        - cargo build --no-default-features --features rc,alloc
+        - cargo test --features derive,rc,unstable
+        - cd "${TRAVIS_BUILD_DIR}/test_suite/deps"
+        - cargo build
+        - cd "${TRAVIS_BUILD_DIR}/test_suite"
+        - cargo test --features compiletest,unstable
+        - cd "${TRAVIS_BUILD_DIR}/test_suite/no_std"
+        - cargo build
+
+    - rust: 1.13.0
+      script:
+        - cd "${TRAVIS_BUILD_DIR}/serde"
+        - cargo build --features rc
+        - cargo build --no-default-features
+        - cd "${TRAVIS_BUILD_DIR}/serde_test"
+        - cargo build
+
+    - rust: 1.15.0
+      script:
+        - cd "${TRAVIS_BUILD_DIR}/serde_derive"
+        - cargo build
+
+    - rust: 1.20.0
+    - rust: 1.21.0
+    - rust: 1.25.0
+    - rust: 1.26.0
+
+    - rust: nightly
+      name: Clippy
+      script:
+        - rustup component add clippy-preview || travis_terminate 0
+        - cargo clippy -- -D clippy::all
+        - cd "${TRAVIS_BUILD_DIR}/serde"
+        - cargo clippy --features rc,unstable -- -D clippy::all
+        - cd "${TRAVIS_BUILD_DIR}/serde_derive"
+        - cargo clippy -- -D clippy::all
+        - cd "${TRAVIS_BUILD_DIR}/serde_test"
+        - cargo clippy -- -D clippy::all
+        - cd "${TRAVIS_BUILD_DIR}/test_suite"
+        - cargo clippy --tests --features unstable -- -D clippy::all
+        - cd "${TRAVIS_BUILD_DIR}/test_suite/no_std"
+        - cargo clippy -- -D clippy::all
+
+    - rust: nightly
+      name: Emscripten
+      script:
+        - CARGO_WEB_RELEASE=$(curl -L -s -H Accept:application/json https://github.com/koute/cargo-web/releases/latest)
+        - CARGO_WEB_VERSION=$(echo "${CARGO_WEB_RELEASE}" | jq -r .tag_name)
+        - CARGO_WEB_URL="https://github.com/koute/cargo-web/releases/download/${CARGO_WEB_VERSION}/cargo-web-x86_64-unknown-linux-gnu.gz"
+
+        - nvm install 9
+        - mkdir -p ~/.cargo/bin
+        - curl -L "${CARGO_WEB_URL}" | gzip -d > ~/.cargo/bin/cargo-web
+        - chmod +x ~/.cargo/bin/cargo-web
+
+        - cd "${TRAVIS_BUILD_DIR}/test_suite"
+        - cargo web test --target=asmjs-unknown-emscripten --nodejs
+        - cargo web test --target=wasm32-unknown-emscripten --nodejs
+
+  allow_failures:
+    - rust: nightly
+      name: Clippy
+    - rust: nightly
+      name: Emscripten
+
+script:
+  - cd "${TRAVIS_BUILD_DIR}/serde"
+  - cargo build --no-default-features
+  - cargo build

CONTRIBUTING.md

@@ -1,45 +1,66 @@
 # Contributing to Serde
 
-Serde welcomes contribution from everyone. Here are the guidelines if you are
-thinking of helping us:
+Serde welcomes contribution from everyone in the form of suggestions, bug
+reports, pull requests, and feedback. This document gives some guidance if you
+are thinking of helping us.
 
-## Contributions
+Please reach out here in a GitHub issue or in the #serde IRC channel on
+[`irc.mozilla.org`] if we can do anything to help you contribute.
 
-Contributions to Serde or its dependencies should be made in the form of GitHub
-pull requests. Each pull request will be reviewed by a core contributor
-(someone with permission to land patches) and either landed in the main tree or
-given feedback for changes that would be required. All contributions should
-follow this format, even those from core contributors.
+[`irc.mozilla.org`]: https://wiki.mozilla.org/IRC
 
-Should you wish to work on an issue, please claim it first by commenting on
-the GitHub issue that you want to work on it. This is to prevent duplicated
-efforts from contributors on the same issue.
+## Submitting bug reports and feature requests
 
-## Pull Request Checklist
+Serde development is spread across lots of repositories, but this serde-rs/serde
+repository is always a safe choice for opening any issues related to Serde.
 
-- Branch from the master branch and, if needed, rebase to the current master
-  branch before submitting your pull request. If it doesn't merge cleanly with
-  master you may be asked to rebase your changes.
+When reporting a bug or asking for help, please include enough details so that
+the people helping you can reproduce the behavior you are seeing. For some tips
+on how to approach this, read about how to produce a [Minimal, Complete, and
+Verifiable example].
 
-- Commits should be as small as possible, while ensuring that each commit is
-  correct independently (i.e., each commit should compile and pass tests). 
+[Minimal, Complete, and Verifiable example]: https://stackoverflow.com/help/mcve
 
-- If your patch is not getting reviewed or you need a specific person to review
-  it, you can @-reply a reviewer asking for a review in the pull request or a
-  comment, or you can ask for a review in `#serde` on `irc.mozilla.org`.
+When making a feature request, please make it clear what problem you intend to
+solve with the feature, any ideas for how Serde could support solving that
+problem, any possible alternatives, and any disadvantages.
 
-- Add tests relevant to the fixed bug or new feature.
+## Running the test suite
+
+We encourage you to check that the test suite passes locally before submitting a
+pull request with your changes. If anything does not pass, typically it will be
+easier to iterate and fix it locally than waiting for the CI servers to run
+tests for you.
+
+##### In the [`serde`] directory
+
+```sh
+# Test all the example code in Serde documentation
+cargo test
+```
+
+##### In the [`test_suite/deps`] directory
+
+```sh
+# This is a prerequisite for running the full test suite
+cargo clean && cargo update && cargo build
+```
+
+##### In the [`test_suite`] directory
+
+```sh
+# Run the full test suite, including tests of unstable functionality
+cargo test --features unstable
+```
+
+[`serde`]: https://github.com/serde-rs/serde/tree/master/serde
+[`test_suite/deps`]: https://github.com/serde-rs/serde/tree/master/test_suite/deps
+[`test_suite`]: https://github.com/serde-rs/serde/tree/master/test_suite
 
 ## Conduct
 
-In all Serde-related forums, we follow the [Rust Code of
-Conduct](https://www.rust-lang.org/conduct.html).  For escalation or moderation
-issues, please contact Erick (erick.tryzelaar@gmail.com) instead of the Rust
-moderation team.
+In all Serde-related forums, we follow the [Rust Code of Conduct]. For
+escalation or moderation issues please contact Erick (erick.tryzelaar@gmail.com)
+instead of the Rust moderation team.
 
-## Communication
-
-Beyond opening tickets on the
-[serde-rs/serde](https://github.com/serde-rs/serde) project, Serde contributors
-frequent the `#serde` channel on
-[`irc.mozilla.org`](https://wiki.mozilla.org/IRC).
+[Rust Code of Conduct]: https://www.rust-lang.org/conduct.html

Cargo.toml

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

LICENSE-MIT

@@ -1,5 +1,3 @@
-Copyright (c) 2014 The Rust Project Developers
-
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the

README.md

@@ -1,4 +1,11 @@
-# Serde   [![Build Status](https://api.travis-ci.org/serde-rs/serde.svg?branch=master)](https://travis-ci.org/serde-rs/serde) [![Latest Version](https://img.shields.io/crates/v/serde.svg)](https://crates.io/crates/serde)
+# Serde   [![Build Status]][travis] [![Latest Version]][crates.io] [![Rustc Version 1.13+]][rustc]
+
+[Build Status]: https://api.travis-ci.org/serde-rs/serde.svg?branch=master
+[travis]: https://travis-ci.org/serde-rs/serde
+[Latest Version]: https://img.shields.io/crates/v/serde.svg
+[crates.io]: https://crates.io/crates/serde
+[Rustc Version 1.13+]: https://img.shields.io/badge/rustc-1.13+-lightgray.svg
+[rustc]: https://blog.rust-lang.org/2016/11/10/Rust-1.13.html
 
 **Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
 
@@ -8,18 +15,38 @@ You may be looking for:
 
 - [An overview of Serde](https://serde.rs/)
 - [Data formats supported by Serde](https://serde.rs/#data-formats)
-- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/codegen.html)
+- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/derive.html)
 - [Examples](https://serde.rs/examples.html)
 - [API documentation](https://docs.serde.rs/serde/)
 - [Release notes](https://github.com/serde-rs/serde/releases)
 
 ## Serde in action
 
-```rust
-#[macro_use]
-extern crate serde_derive;
+<details>
+<summary>
+Click to show Cargo.toml.
+<a href="https://play.rust-lang.org/?edition=2018&gist=72755f28f99afc95e01d63174b28c1f5" target="_blank">Run this code in the playground.</a>
+</summary>
 
-extern crate serde_json;
+```toml
+[dependencies]
+
+# The core APIs, including the Serialize and Deserialize traits. Always
+# required when using Serde. The "derive" feature is only required when
+# using #[derive(Serialize, Deserialize)] to make Serde work with structs
+# and enums defined in your crate.
+serde = { version = "1.0", features = ["derive"] }
+
+# Each data format lives in its own crate; the sample code below uses JSON
+# but you may be using a different one.
+serde_json = "1.0"
+```
+
+</details>
+<p></p>
+
+```rust
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct Point {
@@ -46,12 +73,13 @@ fn main() {
 
 ## Getting help
 
-Serde developers live in the #serde channel on
-[`irc.mozilla.org`](https://wiki.mozilla.org/IRC). The #rust channel is also a
-good resource with generally faster response time but less specific knowledge
-about Serde. If IRC is not your thing or you don't get a good response, we are
-happy to respond to [GitHub issues](https://github.com/serde-rs/serde/issues/new)
-as well.
+Serde developers live in the #serde channel on [`irc.mozilla.org`][irc]. The
+\#rust channel is also a good resource with generally faster response time but
+less specific knowledge about Serde. If IRC is not your thing or you don't get a
+good response, we are happy to respond to [GitHub issues][issues] as well.
+
+[irc]: https://wiki.mozilla.org/IRC
+[issues]: https://github.com/serde-rs/serde/issues/new/choose
 
 ## License
 

appveyor.yml

@@ -0,0 +1,41 @@
+environment:
+  matrix:
+    - APPVEYOR_RUST_CHANNEL: stable
+    - APPVEYOR_RUST_CHANNEL: nightly
+
+install:
+  # Install rust, x86_64-pc-windows-msvc host
+  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain %APPVEYOR_RUST_CHANNEL%
+  - set PATH=C:\msys64\usr\bin;%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
+build: false
+
+for:
+  - matrix:
+      only:
+        - APPVEYOR_RUST_CHANNEL: stable
+    test_script:
+      - cd %APPVEYOR_BUILD_FOLDER%\serde
+      - cargo build --features rc
+      - cargo build --no-default-features
+      - cd %APPVEYOR_BUILD_FOLDER%\serde_test
+      - cargo build
+      - cargo test --features serde/derive,serde/rc
+
+  - matrix:
+      only:
+        - APPVEYOR_RUST_CHANNEL: nightly
+    test_script:
+      - cd %APPVEYOR_BUILD_FOLDER%\serde
+      - cargo build
+      - cargo build --no-default-features
+      - cargo build --no-default-features --features alloc
+      - cargo build --no-default-features --features rc,alloc
+      - cargo test --features derive,rc,unstable
+      - cd %APPVEYOR_BUILD_FOLDER%\test_suite\deps
+      - cargo build
+      - cd %APPVEYOR_BUILD_FOLDER%\test_suite
+      - cargo test --features compiletest,unstable

crates-io.md

@@ -0,0 +1,52 @@
+<!-- Serde readme rendered on crates.io -->
+
+**Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
+
+---
+
+You may be looking for:
+
+- [An overview of Serde](https://serde.rs/)
+- [Data formats supported by Serde](https://serde.rs/#data-formats)
+- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/derive.html)
+- [Examples](https://serde.rs/examples.html)
+- [API documentation](https://docs.serde.rs/serde/)
+- [Release notes](https://github.com/serde-rs/serde/releases)
+
+## Serde in action
+
+```rust
+use serde::{Serialize, Deserialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+fn main() {
+    let point = Point { x: 1, y: 2 };
+
+    // Convert the Point to a JSON string.
+    let serialized = serde_json::to_string(&point).unwrap();
+
+    // Prints serialized = {"x":1,"y":2}
+    println!("serialized = {}", serialized);
+
+    // Convert the JSON string back to a Point.
+    let deserialized: Point = serde_json::from_str(&serialized).unwrap();
+
+    // Prints deserialized = Point { x: 1, y: 2 }
+    println!("deserialized = {:?}", deserialized);
+}
+```
+
+## Getting help
+
+Serde developers live in the #serde channel on [`irc.mozilla.org`][irc]. The
+\#rust channel is also a good resource with generally faster response time but
+less specific knowledge about Serde. If IRC is not your thing or you don't get a
+good response, we are happy to respond to [GitHub issues][issues] as well.
+
+[irc]: https://wiki.mozilla.org/IRC
+[issues]: https://github.com/serde-rs/serde/issues/new/choose

rustfmt.toml

@@ -0,0 +1 @@
+error_on_line_overflow = false

serde/Cargo.toml

@@ -1,28 +1,60 @@
 [package]
 name = "serde"
-version = "0.9.5"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+version = "1.0.88" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
 documentation = "https://docs.serde.rs/serde/"
-readme = "../README.md"
-keywords = ["serde", "serialization"]
+keywords = ["serde", "serialization", "no_std"]
 categories = ["encoding"]
-include = ["Cargo.toml", "src/**/*.rs"]
+readme = "crates-io.md"
+include = ["Cargo.toml", "build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+build = "build.rs"
 
 [badges]
 travis-ci = { repository = "serde-rs/serde" }
+appveyor = { repository = "serde-rs/serde" }
+
+[dependencies]
+serde_derive = { version = "1.0", optional = true, path = "../serde_derive" }
+
+[dev-dependencies]
+serde_derive = { version = "1.0", path = "../serde_derive" }
+
+[package.metadata.playground]
+features = ["derive", "rc"]
+
+
+### FEATURES #################################################################
 
 [features]
 default = ["std"]
 
-std = []
-unstable = []
-alloc = ["unstable"]
-collections = ["alloc"]
-unstable-testing = ["unstable", "std"]
+# Provide derive(Serialize, Deserialize) macros.
+derive = ["serde_derive"]
 
-[dev-dependencies]
-serde_derive = "0.9"
+# Provide impls for common standard library types like Vec<T> and HashMap<K, V>.
+# Requires a dependency on the Rust standard library.
+std = []
+
+# Provide impls for types that require unstable functionality. For tracking and
+# discussion of unstable functionality please refer to this issue:
+#
+#    https://github.com/serde-rs/serde/issues/812
+unstable = []
+
+# Provide impls for types in the Rust core allocation and collections library
+# including String, Box<T>, Vec<T>, and Cow<T>. This is a subset of std but may
+# be enabled without depending on all of std.
+#
+# Requires a dependency on the unstable core allocation library:
+#
+#    https://doc.rust-lang.org/alloc/
+alloc = ["unstable"]
+
+# Opt into impls for Rc<T> and Arc<T>. Serializing and deserializing these types
+# does not preserve identity and may result in multiple copies of the same data.
+# Be sure that this is what you want before enabling this feature.
+rc = []

serde/LICENSE-APACHE

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

serde/LICENSE-MIT

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

serde/README.md

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

serde/build.rs

@@ -0,0 +1,94 @@
+use std::env;
+use std::process::Command;
+use std::str::{self, FromStr};
+
+// The rustc-cfg strings below are *not* public API. Please let us know by
+// opening a GitHub issue if your build environment requires some way to enable
+// these cfgs other than by executing our build script.
+fn main() {
+    let minor = match rustc_minor_version() {
+        Some(minor) => minor,
+        None => return,
+    };
+
+    let target = env::var("TARGET").unwrap();
+    let emscripten = target == "asmjs-unknown-emscripten" || target == "wasm32-unknown-emscripten";
+
+    // std::collections::Bound was stabilized in Rust 1.17
+    // but it was moved to core::ops later in Rust 1.26:
+    // https://doc.rust-lang.org/core/ops/enum.Bound.html
+    if minor >= 26 {
+        println!("cargo:rustc-cfg=ops_bound");
+    } else if minor >= 17 && cfg!(feature = "std") {
+        println!("cargo:rustc-cfg=collections_bound");
+    }
+
+    // CString::into_boxed_c_str stabilized in Rust 1.20:
+    // https://doc.rust-lang.org/std/ffi/struct.CString.html#method.into_boxed_c_str
+    if minor >= 20 {
+        println!("cargo:rustc-cfg=de_boxed_c_str");
+    }
+
+    // From<Box<T>> for Rc<T> / Arc<T> stabilized in Rust 1.21:
+    // https://doc.rust-lang.org/std/rc/struct.Rc.html#impl-From<Box<T>>
+    // https://doc.rust-lang.org/std/sync/struct.Arc.html#impl-From<Box<T>>
+    if minor >= 21 {
+        println!("cargo:rustc-cfg=de_rc_dst");
+    }
+
+    // Duration available in core since Rust 1.25:
+    // https://blog.rust-lang.org/2018/03/29/Rust-1.25.html#library-stabilizations
+    if minor >= 25 {
+        println!("cargo:rustc-cfg=core_duration");
+    }
+
+    // 128-bit integers stabilized in Rust 1.26:
+    // https://blog.rust-lang.org/2018/05/10/Rust-1.26.html
+    //
+    // Disabled on Emscripten targets as Emscripten doesn't
+    // currently support integers larger than 64 bits.
+    if minor >= 26 && !emscripten {
+        println!("cargo:rustc-cfg=integer128");
+    }
+
+    // Inclusive ranges methods stabilized in Rust 1.27:
+    // https://github.com/rust-lang/rust/pull/50758
+    if minor >= 27 {
+        println!("cargo:rustc-cfg=range_inclusive");
+    }
+
+    // Non-zero integers stabilized in Rust 1.28:
+    // https://github.com/rust-lang/rust/pull/50808
+    if minor >= 28 {
+        println!("cargo:rustc-cfg=num_nonzero");
+    }
+}
+
+fn rustc_minor_version() -> Option<u32> {
+    let rustc = match env::var_os("RUSTC") {
+        Some(rustc) => rustc,
+        None => return None,
+    };
+
+    let output = match Command::new(rustc).arg("--version").output() {
+        Ok(output) => output,
+        Err(_) => return None,
+    };
+
+    let version = match str::from_utf8(&output.stdout) {
+        Ok(version) => version,
+        Err(_) => return None,
+    };
+
+    let mut pieces = version.split('.');
+    if pieces.next() != Some("rustc 1") {
+        return None;
+    }
+
+    let next = match pieces.next() {
+        Some(next) => next,
+        None => return None,
+    };
+
+    u32::from_str(next).ok()
+}

serde/crates-io.md

@@ -0,0 +1 @@
+../crates-io.md

serde/src/bytes.rs

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

serde/src/de/from_primitive.rs

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

serde/src/de/ignored_any.rs

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

serde/src/de/private.rs

@@ -1,39 +0,0 @@
-use core::marker::PhantomData;
-
-use de::{Deserialize, Deserializer, Error, Visitor};
-
-/// If the missing field is of type `Option<T>` then treat is as `None`,
-/// otherwise it is an error.
-pub fn missing_field<V, E>(field: &'static str) -> Result<V, E>
-    where V: Deserialize,
-          E: Error
-{
-    struct MissingFieldDeserializer<E>(&'static str, PhantomData<E>);
-
-    impl<E> Deserializer for MissingFieldDeserializer<E>
-        where E: Error
-    {
-        type Error = E;
-
-        fn deserialize<V>(self, _visitor: V) -> Result<V::Value, E>
-            where V: Visitor
-        {
-            Err(Error::missing_field(self.0))
-        }
-
-        fn deserialize_option<V>(self, visitor: V) -> Result<V::Value, E>
-            where V: Visitor
-        {
-            visitor.visit_none()
-        }
-
-        forward_to_deserialize! {
-            bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit seq
-            seq_fixed_size bytes byte_buf map unit_struct newtype_struct
-            tuple_struct struct struct_field tuple enum ignored_any
-        }
-    }
-
-    let deserializer = MissingFieldDeserializer(field, PhantomData);
-    Deserialize::deserialize(deserializer)
-}

serde/src/de/utf8.rs

@@ -0,0 +1,46 @@
+use lib::*;
+
+const TAG_CONT: u8 = 0b1000_0000;
+const TAG_TWO_B: u8 = 0b1100_0000;
+const TAG_THREE_B: u8 = 0b1110_0000;
+const TAG_FOUR_B: u8 = 0b1111_0000;
+const MAX_ONE_B: u32 = 0x80;
+const MAX_TWO_B: u32 = 0x800;
+const MAX_THREE_B: u32 = 0x10000;
+
+#[inline]
+pub fn encode(c: char) -> Encode {
+    let code = c as u32;
+    let mut buf = [0; 4];
+    let pos = if code < MAX_ONE_B {
+        buf[3] = code as u8;
+        3
+    } else if code < MAX_TWO_B {
+        buf[2] = (code >> 6 & 0x1F) as u8 | TAG_TWO_B;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        2
+    } else if code < MAX_THREE_B {
+        buf[1] = (code >> 12 & 0x0F) as u8 | TAG_THREE_B;
+        buf[2] = (code >> 6 & 0x3F) as u8 | TAG_CONT;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        1
+    } else {
+        buf[0] = (code >> 18 & 0x07) as u8 | TAG_FOUR_B;
+        buf[1] = (code >> 12 & 0x3F) as u8 | TAG_CONT;
+        buf[2] = (code >> 6 & 0x3F) as u8 | TAG_CONT;
+        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
+        0
+    };
+    Encode { buf: buf, pos: pos }
+}
+
+pub struct Encode {
+    buf: [u8; 4],
+    pos: usize,
+}
+
+impl Encode {
+    pub fn as_str(&self) -> &str {
+        str::from_utf8(&self.buf[self.pos..]).unwrap()
+    }
+}

serde/src/error.rs

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

serde/src/export.rs

@@ -1,33 +1,36 @@
-#[cfg(all(feature = "collections", not(feature = "std")))]
-use collections::String;
+pub use lib::clone::Clone;
+pub use lib::convert::{From, Into};
+pub use lib::default::Default;
+pub use lib::fmt::{self, Formatter};
+pub use lib::marker::PhantomData;
+pub use lib::option::Option::{self, None, Some};
+pub use lib::result::Result::{self, Err, Ok};
 
-#[cfg(feature = "std")]
-use std::borrow::Cow;
-#[cfg(all(feature = "collections", not(feature = "std")))]
-use collections::borrow::Cow;
+pub use self::string::from_utf8_lossy;
 
-pub use core::default::Default;
-pub use core::fmt;
-pub use core::marker::PhantomData;
-pub use core::result::Result;
+#[cfg(any(feature = "alloc", feature = "std"))]
+pub use lib::Vec;
 
-#[cfg(any(feature = "collections", feature = "std"))]
-pub fn from_utf8_lossy(bytes: &[u8]) -> Cow<str> {
-    String::from_utf8_lossy(bytes)
-}
-
-// The generated code calls this like:
-//
-//     let value = &_serde::export::from_utf8_lossy(bytes);
-//     Err(_serde::de::Error::unknown_variant(value, VARIANTS))
-//
-// so it is okay for the return type to be different from the std case as long
-// as the above works.
-#[cfg(not(any(feature = "collections", feature = "std")))]
-pub fn from_utf8_lossy(bytes: &[u8]) -> &str {
-    use core::str;
-    // Three unicode replacement characters if it fails. They look like a
-    // white-on-black question mark. The user will recognize it as invalid
-    // UTF-8.
-    str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}")
+mod string {
+    use lib::*;
+
+    #[cfg(any(feature = "std", feature = "alloc"))]
+    pub fn from_utf8_lossy(bytes: &[u8]) -> Cow<str> {
+        String::from_utf8_lossy(bytes)
+    }
+
+    // The generated code calls this like:
+    //
+    //     let value = &_serde::export::from_utf8_lossy(bytes);
+    //     Err(_serde::de::Error::unknown_variant(value, VARIANTS))
+    //
+    // so it is okay for the return type to be different from the std case as long
+    // as the above works.
+    #[cfg(not(any(feature = "std", feature = "alloc")))]
+    pub fn from_utf8_lossy(bytes: &[u8]) -> &str {
+        // Three unicode replacement characters if it fails. They look like a
+        // white-on-black question mark. The user will recognize it as invalid
+        // UTF-8.
+        str::from_utf8(bytes).unwrap_or("\u{fffd}\u{fffd}\u{fffd}")
+    }
 }

serde/src/integer128.rs

@@ -0,0 +1,82 @@
+/// Conditional compilation depending on whether Serde is built with support for
+/// 128-bit integers.
+///
+/// Data formats that wish to support Rust compiler versions older than 1.26 may
+/// place the i128 / u128 methods of their Serializer and Deserializer behind
+/// this macro.
+///
+/// Data formats that require a minimum Rust compiler version of at least 1.26
+/// do not need to bother with this macro and may assume support for 128-bit
+/// integers.
+///
+/// ```edition2018
+/// # use serde::private::ser::Error;
+/// #
+/// # struct MySerializer;
+/// #
+/// use serde::{serde_if_integer128, Serializer};
+///
+/// impl Serializer for MySerializer {
+///     type Ok = ();
+///     type Error = Error;
+///
+///     fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
+///         /* ... */
+/// #         unimplemented!()
+///     }
+///
+///     /* ... */
+///
+///     serde_if_integer128! {
+///         fn serialize_i128(self, v: i128) -> Result<Self::Ok, Self::Error> {
+///             /* ... */
+/// #             unimplemented!()
+///         }
+///
+///         fn serialize_u128(self, v: u128) -> Result<Self::Ok, Self::Error> {
+///             /* ... */
+/// #             unimplemented!()
+///         }
+///     }
+/// #
+/// #     serde::__serialize_unimplemented! {
+/// #         bool i8 i16 i32 u8 u16 u32 u64 f32 f64 char str bytes none some
+/// #         unit unit_struct unit_variant newtype_struct newtype_variant seq
+/// #         tuple tuple_struct tuple_variant map struct struct_variant
+/// #     }
+/// }
+/// ```
+///
+/// When Serde is built with support for 128-bit integers, this macro expands
+/// transparently into just the input tokens.
+///
+/// ```edition2018
+/// macro_rules! serde_if_integer128 {
+///     ($($tt:tt)*) => {
+///         $($tt)*
+///     };
+/// }
+/// ```
+///
+/// When built without support for 128-bit integers, this macro expands to
+/// nothing.
+///
+/// ```edition2018
+/// macro_rules! serde_if_integer128 {
+///     ($($tt:tt)*) => {};
+/// }
+/// ```
+#[cfg(integer128)]
+#[macro_export]
+macro_rules! serde_if_integer128 {
+    ($($tt:tt)*) => {
+        $($tt)*
+    };
+}
+
+#[cfg(not(integer128))]
+#[macro_export]
+#[doc(hidden)]
+macro_rules! serde_if_integer128 {
+    ($($tt:tt)*) => {};
+}

serde/src/iter.rs

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

serde/src/lib.rs

@@ -9,97 +9,245 @@
 //! these two groups interact with each other, allowing any supported data
 //! structure to be serialized and deserialized using any supported data format.
 //!
-//! See the Serde website https://serde.rs/ for additional documentation and
+//! See the Serde website [https://serde.rs/] for additional documentation and
 //! usage examples.
 //!
-//! ### Design
+//! [https://serde.rs/]: https://serde.rs/
+//!
+//! ## Design
 //!
 //! Where many other languages rely on runtime reflection for serializing data,
 //! Serde is instead built on Rust's powerful trait system. A data structure
 //! that knows how to serialize and deserialize itself is one that implements
-//! Serde's `Serialize` and `Deserialize` traits (or uses Serde's code
-//! generation to automatically derive implementations at compile time). This
+//! Serde's `Serialize` and `Deserialize` traits (or uses Serde's derive
+//! attribute to automatically generate implementations at compile time). This
 //! avoids any overhead of reflection or runtime type information. In fact in
 //! many situations the interaction between data structure and data format can
 //! be completely optimized away by the Rust compiler, leaving Serde
-//! serialization to perform roughly the same speed as a handwritten serializer
-//! for the specific selection of data structure and data format.
+//! serialization to perform the same speed as a handwritten serializer for the
+//! specific selection of data structure and data format.
 //!
-//! ### Data formats
+//! ## Data formats
 //!
 //! The following is a partial list of data formats that have been implemented
 //! for Serde by the community.
 //!
-//! - [JSON](https://github.com/serde-rs/json), the ubiquitous JavaScript Object
-//!   Notation used by many HTTP APIs.
-//! - [Bincode](https://github.com/TyOverby/bincode), a compact binary format
+//! - [JSON], the ubiquitous JavaScript Object Notation used by many HTTP APIs.
+//! - [Bincode], a compact binary format
 //!   used for IPC within the Servo rendering engine.
-//! - [CBOR](https://github.com/pyfisch/cbor), a Concise Binary Object
-//!   Representation designed for small message size without the need for
-//!   version negotiation.
-//! - [YAML](https://github.com/dtolnay/serde-yaml), a popular human-friendly
-//!   configuration language that ain't markup language.
-//! - [MessagePack](https://github.com/3Hren/msgpack-rust), an efficient binary
-//!   format that resembles a compact JSON.
-//! - [TOML](https://github.com/alexcrichton/toml-rs), a minimal configuration
-//!   format used by [Cargo](http://doc.crates.io/manifest.html).
-//! - [Pickle](https://github.com/birkenfeld/serde-pickle), a format common in
-//!   the Python world.
-//! - [Hjson](https://github.com/laktak/hjson-rust), a variant of JSON designed
-//!   to be readable and writable by humans.
-//! - [BSON](https://github.com/zonyitoo/bson-rs), the data storage and network
-//!   transfer format used by MongoDB.
-//! - [URL](https://github.com/nox/serde_urlencoded), the x-www-form-urlencoded
-//!   format.
-//! - [XML](https://github.com/serde-rs/xml), the flexible machine-friendly W3C
-//!   standard. *(deserialization only)*
-//! - [Envy](https://github.com/softprops/envy), a way to deserialize
-//!   environment variables into Rust structs. *(deserialization only)*
-//! - [Redis](https://github.com/OneSignal/serde-redis), deserialize values from
-//!   Redis when using [redis-rs](https://crates.io/crates/redis).
+//! - [CBOR], a Concise Binary Object Representation designed for small message
+//!   size without the need for version negotiation.
+//! - [YAML], a popular human-friendly configuration language that ain't markup
+//!   language.
+//! - [MessagePack], an efficient binary format that resembles a compact JSON.
+//! - [TOML], a minimal configuration format used by [Cargo].
+//! - [Pickle], a format common in the Python world.
+//! - [RON], a Rusty Object Notation.
+//! - [BSON], the data storage and network transfer format used by MongoDB.
+//! - [Avro], a binary format used within Apache Hadoop, with support for schema
+//!   definition.
+//! - [Hjson], a variant of JSON designed to be readable and writable by humans.
+//! - [JSON5], A superset of JSON including some productions from ES5.
+//! - [URL], the x-www-form-urlencoded format.
+//! - [Envy], a way to deserialize environment variables into Rust structs.
 //!   *(deserialization only)*
+//! - [Envy Store], a way to deserialize [AWS Parameter Store] parameters into
+//!   Rust structs. *(deserialization only)*
+//!
+//! [JSON]: https://github.com/serde-rs/json
+//! [Bincode]: https://github.com/TyOverby/bincode
+//! [CBOR]: https://github.com/pyfisch/cbor
+//! [YAML]: https://github.com/dtolnay/serde-yaml
+//! [MessagePack]: https://github.com/3Hren/msgpack-rust
+//! [TOML]: https://github.com/alexcrichton/toml-rs
+//! [Pickle]: https://github.com/birkenfeld/serde-pickle
+//! [RON]: https://github.com/ron-rs/ron
+//! [BSON]: https://github.com/zonyitoo/bson-rs
+//! [Avro]: https://github.com/flavray/avro-rs
+//! [Hjson]: https://github.com/laktak/hjson-rust
+//! [JSON5]: https://github.com/callum-oakley/json5-rs
+//! [URL]: https://github.com/nox/serde_urlencoded
+//! [Envy]: https://github.com/softprops/envy
+//! [Envy Store]: https://github.com/softprops/envy-store
+//! [Cargo]: http://doc.crates.io/manifest.html
+//! [AWS Parameter Store]: https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-paramstore.html
 
-#![doc(html_root_url="https://docs.serde.rs")]
+////////////////////////////////////////////////////////////////////////////////
+
+// Serde types in rustdoc of other crates get linked to here.
+#![doc(html_root_url = "https://docs.rs/serde/1.0.88")]
+// Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "unstable", feature(nonzero, inclusive_range, zero_one))]
+// Unstable functionality only if the user asks for it. For tracking and
+// discussion of these features please refer to this issue:
+//
+//    https://github.com/serde-rs/serde/issues/812
+#![cfg_attr(feature = "unstable", feature(specialization, never_type))]
 #![cfg_attr(feature = "alloc", feature(alloc))]
-#![cfg_attr(feature = "collections", feature(collections, enumset))]
-#![cfg_attr(feature = "cargo-clippy", allow(linkedlist, type_complexity, doc_markdown))]
-#![deny(missing_docs)]
+#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
+#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
+// Ignored clippy and clippy_pedantic lints
+#![cfg_attr(
+    feature = "cargo-clippy",
+    allow(
+        // not available in our oldest supported compiler
+        const_static_lifetime,
+        empty_enum,
+        redundant_field_names,
+        // integer and float ser/de requires these sorts of casts
+        cast_possible_truncation,
+        cast_possible_wrap,
+        cast_precision_loss,
+        cast_sign_loss,
+        // things are often more readable this way
+        cast_lossless,
+        module_name_repetitions,
+        single_match_else,
+        type_complexity,
+        use_self,
+        zero_prefixed_literal,
+        // not practical
+        needless_pass_by_value,
+        similar_names,
+        // preference
+        doc_markdown,
+    )
+)]
+// Rustc lints.
+#![deny(missing_docs, unused_imports)]
 
-#[cfg(feature = "collections")]
-extern crate collections;
+////////////////////////////////////////////////////////////////////////////////
 
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
-#[cfg(feature = "unstable")]
-extern crate core as actual_core;
+/// A facade around all the types we need from the `std`, `core`, and `alloc`
+/// crates. This avoids elaborate import wrangling having to happen in every
+/// module.
+mod lib {
+    mod core {
+        #[cfg(not(feature = "std"))]
+        pub use core::*;
+        #[cfg(feature = "std")]
+        pub use std::*;
+    }
 
-#[cfg(feature = "std")]
-mod core {
-    pub use std::{ops, hash, fmt, cmp, marker, mem, i8, i16, i32, i64, u8, u16, u32, u64, isize,
-            usize, f32, f64, char, str, num, slice, iter, cell, default, result};
-    #[cfg(feature = "unstable")]
-    pub use actual_core::nonzero;
+    pub use self::core::{cmp, iter, mem, num, slice, str};
+    pub use self::core::{f32, f64};
+    pub use self::core::{i16, i32, i64, i8, isize};
+    pub use self::core::{u16, u32, u64, u8, usize};
+
+    pub use self::core::cell::{Cell, RefCell};
+    pub use self::core::clone::{self, Clone};
+    pub use self::core::convert::{self, From, Into};
+    pub use self::core::default::{self, Default};
+    pub use self::core::fmt::{self, Debug, Display};
+    pub use self::core::marker::{self, PhantomData};
+    pub use self::core::ops::Range;
+    pub use self::core::option::{self, Option};
+    pub use self::core::result::{self, Result};
+
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::borrow::{Cow, ToOwned};
+    #[cfg(feature = "std")]
+    pub use std::borrow::{Cow, ToOwned};
+
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::string::{String, ToString};
+    #[cfg(feature = "std")]
+    pub use std::string::String;
+
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::vec::Vec;
+    #[cfg(feature = "std")]
+    pub use std::vec::Vec;
+
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::boxed::Box;
+    #[cfg(feature = "std")]
+    pub use std::boxed::Box;
+
+    #[cfg(all(feature = "rc", feature = "alloc", not(feature = "std")))]
+    pub use alloc::rc::{Rc, Weak as RcWeak};
+    #[cfg(all(feature = "rc", feature = "std"))]
+    pub use std::rc::{Rc, Weak as RcWeak};
+
+    #[cfg(all(feature = "rc", feature = "alloc", not(feature = "std")))]
+    pub use alloc::sync::{Arc, Weak as ArcWeak};
+    #[cfg(all(feature = "rc", feature = "std"))]
+    pub use std::sync::{Arc, Weak as ArcWeak};
+
+    #[cfg(all(feature = "alloc", not(feature = "std")))]
+    pub use alloc::collections::{BTreeMap, BTreeSet, BinaryHeap, LinkedList, VecDeque};
+    #[cfg(feature = "std")]
+    pub use std::collections::{BTreeMap, BTreeSet, BinaryHeap, LinkedList, VecDeque};
+
+    #[cfg(feature = "std")]
+    pub use std::{error, net};
+
+    #[cfg(feature = "std")]
+    pub use std::collections::{HashMap, HashSet};
+    #[cfg(feature = "std")]
+    pub use std::ffi::{CStr, CString, OsStr, OsString};
+    #[cfg(feature = "std")]
+    pub use std::hash::{BuildHasher, Hash};
+    #[cfg(feature = "std")]
+    pub use std::io::Write;
+    #[cfg(feature = "std")]
+    pub use std::num::Wrapping;
+    #[cfg(feature = "std")]
+    pub use std::path::{Path, PathBuf};
+    #[cfg(feature = "std")]
+    pub use std::sync::{Mutex, RwLock};
+    #[cfg(feature = "std")]
+    pub use std::time::{SystemTime, UNIX_EPOCH};
+
+    #[cfg(any(core_duration, feature = "std"))]
+    pub use self::core::time::Duration;
+
+    #[cfg(range_inclusive)]
+    pub use self::core::ops::RangeInclusive;
+
+    #[cfg(all(feature = "std", collections_bound))]
+    pub use std::collections::Bound;
+
+    #[cfg(ops_bound)]
+    pub use self::core::ops::Bound;
 }
 
-pub use ser::{Serialize, Serializer};
-pub use de::{Deserialize, Deserializer};
+////////////////////////////////////////////////////////////////////////////////
 
 #[macro_use]
 mod macros;
 
-pub mod bytes;
+#[macro_use]
+mod integer128;
+
 pub mod de;
-#[cfg(feature = "std")]
-#[doc(hidden)]
-pub mod iter;
 pub mod ser;
-#[cfg_attr(feature = "std", doc(hidden))]
-pub mod error;
-mod utils;
+
+#[doc(inline)]
+pub use de::{Deserialize, Deserializer};
+#[doc(inline)]
+pub use ser::{Serialize, Serializer};
 
 // Generated code uses these to support no_std. Not public API.
 #[doc(hidden)]
 pub mod export;
+
+// Helpers used by generated code and doc tests. Not public API.
+#[doc(hidden)]
+pub mod private;
+
+// Re-export #[derive(Serialize, Deserialize)].
+//
+// The reason re-exporting is not enabled by default is that disabling it would
+// be annoying for crates that provide handwritten impls or data formats. They
+// would need to disable default features and then explicitly re-enable std.
+#[cfg(feature = "serde_derive")]
+#[allow(unused_imports)]
+#[macro_use]
+extern crate serde_derive;
+#[cfg(feature = "serde_derive")]
+#[doc(hidden)]
+pub use serde_derive::*;

serde/src/macros.rs

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

serde/src/private/macros.rs

@@ -0,0 +1,140 @@
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __private_serialize {
+    () => {
+        trait Serialize {
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where
+                S: $crate::Serializer;
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __private_deserialize {
+    () => {
+        trait Deserialize<'de>: Sized {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: $crate::Deserializer<'de>;
+        }
+    };
+}
+
+/// Used only by Serde doc tests. Not public API.
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! __serialize_unimplemented {
+    ($($func:ident)*) => {
+        $(
+            __serialize_unimplemented_helper!($func);
+        )*
+    };
+}
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __serialize_unimplemented_method {
+    ($func:ident $(<$t:ident>)* ($($arg:ty),*) -> $ret:ident) => {
+        fn $func $(<$t: ?Sized + $crate::Serialize>)* (self $(, _: $arg)*) -> $crate::export::Result<Self::$ret, Self::Error> {
+            unimplemented!()
+        }
+    };
+}
+
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! __serialize_unimplemented_helper {
+    (bool) => {
+        __serialize_unimplemented_method!(serialize_bool(bool) -> Ok);
+    };
+    (i8) => {
+        __serialize_unimplemented_method!(serialize_i8(i8) -> Ok);
+    };
+    (i16) => {
+        __serialize_unimplemented_method!(serialize_i16(i16) -> Ok);
+    };
+    (i32) => {
+        __serialize_unimplemented_method!(serialize_i32(i32) -> Ok);
+    };
+    (i64) => {
+        __serialize_unimplemented_method!(serialize_i64(i64) -> Ok);
+    };
+    (u8) => {
+        __serialize_unimplemented_method!(serialize_u8(u8) -> Ok);
+    };
+    (u16) => {
+        __serialize_unimplemented_method!(serialize_u16(u16) -> Ok);
+    };
+    (u32) => {
+        __serialize_unimplemented_method!(serialize_u32(u32) -> Ok);
+    };
+    (u64) => {
+        __serialize_unimplemented_method!(serialize_u64(u64) -> Ok);
+    };
+    (f32) => {
+        __serialize_unimplemented_method!(serialize_f32(f32) -> Ok);
+    };
+    (f64) => {
+        __serialize_unimplemented_method!(serialize_f64(f64) -> Ok);
+    };
+    (char) => {
+        __serialize_unimplemented_method!(serialize_char(char) -> Ok);
+    };
+    (str) => {
+        __serialize_unimplemented_method!(serialize_str(&str) -> Ok);
+    };
+    (bytes) => {
+        __serialize_unimplemented_method!(serialize_bytes(&[u8]) -> Ok);
+    };
+    (none) => {
+        __serialize_unimplemented_method!(serialize_none() -> Ok);
+    };
+    (some) => {
+        __serialize_unimplemented_method!(serialize_some<T>(&T) -> Ok);
+    };
+    (unit) => {
+        __serialize_unimplemented_method!(serialize_unit() -> Ok);
+    };
+    (unit_struct) => {
+        __serialize_unimplemented_method!(serialize_unit_struct(&str) -> Ok);
+    };
+    (unit_variant) => {
+        __serialize_unimplemented_method!(serialize_unit_variant(&str, u32, &str) -> Ok);
+    };
+    (newtype_struct) => {
+        __serialize_unimplemented_method!(serialize_newtype_struct<T>(&str, &T) -> Ok);
+    };
+    (newtype_variant) => {
+        __serialize_unimplemented_method!(serialize_newtype_variant<T>(&str, u32, &str, &T) -> Ok);
+    };
+    (seq) => {
+        type SerializeSeq = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_seq(Option<usize>) -> SerializeSeq);
+    };
+    (tuple) => {
+        type SerializeTuple = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple(usize) -> SerializeTuple);
+    };
+    (tuple_struct) => {
+        type SerializeTupleStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple_struct(&str, usize) -> SerializeTupleStruct);
+    };
+    (tuple_variant) => {
+        type SerializeTupleVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_tuple_variant(&str, u32, &str, usize) -> SerializeTupleVariant);
+    };
+    (map) => {
+        type SerializeMap = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_map(Option<usize>) -> SerializeMap);
+    };
+    (struct) => {
+        type SerializeStruct = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_struct(&str, usize) -> SerializeStruct);
+    };
+    (struct_variant) => {
+        type SerializeStructVariant = $crate::ser::Impossible<Self::Ok, Self::Error>;
+        __serialize_unimplemented_method!(serialize_struct_variant(&str, u32, &str, usize) -> SerializeStructVariant);
+    };
+}

serde/src/private/mod.rs

@@ -0,0 +1,4 @@
+mod macros;
+
+pub mod de;
+pub mod ser;

serde/src/ser/impossible.rs

@@ -1,28 +1,26 @@
 //! This module contains `Impossible` serializer and its implementations.
 
-use core::marker::PhantomData;
+use lib::*;
 
 use ser::{
-    self,
-    Serialize,
-    SerializeSeq,
-    SerializeTuple,
-    SerializeTupleStruct,
-    SerializeTupleVariant,
-    SerializeMap,
-    SerializeStruct,
-    SerializeStructVariant,
+    self, Serialize, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant,
+    SerializeTuple, SerializeTupleStruct, SerializeTupleVariant,
 };
 
 /// Helper type for implementing a `Serializer` that does not support
 /// serializing one of the compound types.
 ///
 /// This type cannot be instantiated, but implements every one of the traits
-/// corresponding to the `Serializer` compound types: `SerializeSeq`,
-/// `SerializeTuple`, `SerializeTupleStruct`, `SerializeTupleVariant`,
-/// `SerializeMap`, `SerializeStruct`, and `SerializeStructVariant`.
+/// corresponding to the [`Serializer`] compound types: [`SerializeSeq`],
+/// [`SerializeTuple`], [`SerializeTupleStruct`], [`SerializeTupleVariant`],
+/// [`SerializeMap`], [`SerializeStruct`], and [`SerializeStructVariant`].
 ///
-/// ```rust,ignore
+/// ```edition2018
+/// # use serde::ser::{Serializer, Impossible};
+/// # use serde::private::ser::Error;
+/// #
+/// # struct MySerializer;
+/// #
 /// impl Serializer for MySerializer {
 ///     type Ok = ();
 ///     type Error = Error;
@@ -36,142 +34,183 @@ use ser::{
 ///                      -> Result<Self::SerializeSeq, Error> {
 ///         // Given Impossible cannot be instantiated, the only
 ///         // thing we can do here is to return an error.
+/// #         stringify! {
 ///         Err(...)
+/// #         };
+/// #         unimplemented!()
 ///     }
 ///
 ///     /* other Serializer methods */
+/// #     serde::__serialize_unimplemented! {
+/// #         bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str bytes none some
+/// #         unit unit_struct unit_variant newtype_struct newtype_variant
+/// #         tuple tuple_struct tuple_variant map struct struct_variant
+/// #     }
 /// }
 /// ```
-pub struct Impossible<Ok, E> {
+///
+/// [`Serializer`]: trait.Serializer.html
+/// [`SerializeSeq`]: trait.SerializeSeq.html
+/// [`SerializeTuple`]: trait.SerializeTuple.html
+/// [`SerializeTupleStruct`]: trait.SerializeTupleStruct.html
+/// [`SerializeTupleVariant`]: trait.SerializeTupleVariant.html
+/// [`SerializeMap`]: trait.SerializeMap.html
+/// [`SerializeStruct`]: trait.SerializeStruct.html
+/// [`SerializeStructVariant`]: trait.SerializeStructVariant.html
+pub struct Impossible<Ok, Error> {
     void: Void,
-    _marker: PhantomData<(Ok, E)>,
+    ok: PhantomData<Ok>,
+    error: PhantomData<Error>,
 }
 
 enum Void {}
 
-impl<Ok, E> SerializeSeq for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeSeq for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_element<T: ?Sized + Serialize>(&mut self,
-                                                _value: &T)
-                                                -> Result<(), E> {
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeTuple for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeTuple for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_element<T: ?Sized + Serialize>(&mut self,
-                                                _value: &T)
-                                                -> Result<(), E> {
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeTupleStruct for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeTupleStruct for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeTupleVariant for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeTupleVariant for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeMap for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeMap for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_key<T: ?Sized + Serialize>(&mut self,
-                                                 _key: &T)
-                                            -> Result<(), E> {
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = key;
         match self.void {}
     }
 
-    fn serialize_value<T: ?Sized + Serialize>(&mut self,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeStruct for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeStruct for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                                   _key: &'static str,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = key;
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }
 
-impl<Ok, E> SerializeStructVariant for Impossible<Ok, E>
-    where E: ser::Error,
+impl<Ok, Error> SerializeStructVariant for Impossible<Ok, Error>
+where
+    Error: ser::Error,
 {
     type Ok = Ok;
-    type Error = E;
+    type Error = Error;
 
-    fn serialize_field<T: ?Sized + Serialize>(&mut self,
-                                                   _key: &'static str,
-                                              _value: &T)
-                                              -> Result<(), E> {
+    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
+    {
+        let _ = key;
+        let _ = value;
         match self.void {}
     }
 
-    fn end(self) -> Result<Ok, E> {
+    fn end(self) -> Result<Ok, Error> {
         match self.void {}
     }
 }

serde/src/utils.rs

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

serde_codegen_internals/Cargo.toml

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

serde_codegen_internals/src/ast.rs

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

serde_codegen_internals/src/attr.rs

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

serde_codegen_internals/src/ctxt.rs

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

serde_codegen_internals/src/lib.rs

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

serde_derive/Cargo.toml

@@ -1,26 +1,32 @@
 [package]
 name = "serde_derive"
-version = "0.9.5"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+version = "1.0.88" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
-documentation = "https://serde.rs/codegen.html"
-keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
-
-[features]
-unstable = []
+documentation = "https://serde.rs/derive.html"
+keywords = ["serde", "serialization", "no_std"]
+readme = "crates-io.md"
+include = ["Cargo.toml", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [badges]
 travis-ci = { repository = "serde-rs/serde" }
+appveyor = { repository = "serde-rs/serde" }
+
+[features]
+default = []
+deserialize_in_place = []
 
 [lib]
 name = "serde_derive"
 proc-macro = true
 
 [dependencies]
-quote = "0.3.8"
-serde_codegen_internals = { version = "=0.12.1", default-features = false, path = "../serde_codegen_internals" }
-syn = { version = "0.11", features = ["aster", "visit"] }
+proc-macro2 = "0.4"
+quote = "0.6.3"
+syn = { version = "0.15.22", features = ["visit"] }
+
+[dev-dependencies]
+serde = { version = "1.0", path = "../serde" }

serde_derive/LICENSE-APACHE

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

serde_derive/LICENSE-MIT

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

serde_derive/README.md

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

serde_derive/crates-io.md

@@ -0,0 +1 @@
+../crates-io.md

serde_derive/src/bound.rs

@@ -1,21 +1,32 @@
 use std::collections::HashSet;
 
-use syn::{self, aster, visit};
+use syn;
+use syn::punctuated::{Pair, Punctuated};
+use syn::visit::{self, Visit};
 
-use internals::ast::Item;
+use internals::ast::{Container, Data};
 use internals::attr;
 
+use proc_macro2::Span;
+
 // Remove the default from every type parameter because in the generated impls
 // they look like associated types: "error: associated type bindings are not
 // allowed here".
 pub fn without_defaults(generics: &syn::Generics) -> syn::Generics {
     syn::Generics {
-        ty_params: generics.ty_params.iter().map(|ty_param| {
-            syn::TyParam {
-                default: None,
-                .. ty_param.clone()
-            }}).collect(),
-        .. generics.clone()
+        params: generics
+            .params
+            .iter()
+            .map(|param| match *param {
+                syn::GenericParam::Type(ref param) => syn::GenericParam::Type(syn::TypeParam {
+                    eq_token: None,
+                    default: None,
+                    ..param.clone()
+                }),
+                _ => param.clone(),
+            })
+            .collect(),
+        ..generics.clone()
     }
 }
 
@@ -23,30 +34,57 @@ pub fn with_where_predicates(
     generics: &syn::Generics,
     predicates: &[syn::WherePredicate],
 ) -> syn::Generics {
-    aster::from_generics(generics.clone())
-        .with_predicates(predicates.to_vec())
-        .build()
+    let mut generics = generics.clone();
+    generics
+        .make_where_clause()
+        .predicates
+        .extend(predicates.iter().cloned());
+    generics
 }
 
-pub fn with_where_predicates_from_fields<F>(
-    item: &Item,
+pub fn with_where_predicates_from_fields(
+    cont: &Container,
     generics: &syn::Generics,
-    from_field: F,
-) -> syn::Generics
-    where F: Fn(&attr::Field) -> Option<&[syn::WherePredicate]>,
-{
-    aster::from_generics(generics.clone())
-        .with_predicates(
-            item.body.all_fields()
-                .flat_map(|field| from_field(&field.attrs))
-                .flat_map(|predicates| predicates.to_vec()))
-        .build()
+    from_field: fn(&attr::Field) -> Option<&[syn::WherePredicate]>,
+) -> syn::Generics {
+    let predicates = cont
+        .data
+        .all_fields()
+        .flat_map(|field| from_field(&field.attrs))
+        .flat_map(|predicates| predicates.to_vec());
+
+    let mut generics = generics.clone();
+    generics.make_where_clause().predicates.extend(predicates);
+    generics
+}
+
+pub fn with_where_predicates_from_variants(
+    cont: &Container,
+    generics: &syn::Generics,
+    from_variant: fn(&attr::Variant) -> Option<&[syn::WherePredicate]>,
+) -> syn::Generics {
+    let variants = match cont.data {
+        Data::Enum(ref variants) => variants,
+        Data::Struct(_, _) => {
+            return generics.clone();
+        }
+    };
+
+    let predicates = variants
+        .iter()
+        .flat_map(|variant| from_variant(&variant.attrs))
+        .flat_map(|predicates| predicates.to_vec());
+
+    let mut generics = generics.clone();
+    generics.make_where_clause().predicates.extend(predicates);
+    generics
 }
 
 // Puts the given bound on any generic type parameters that are used in fields
 // for which filter returns true.
 //
-// For example, the following struct needs the bound `A: Serialize, B: Serialize`.
+// For example, the following struct needs the bound `A: Serialize, B:
+// Serialize`.
 //
 //     struct S<'b, A, B: 'b, C> {
 //         a: A,
@@ -54,68 +92,226 @@ pub fn with_where_predicates_from_fields<F>(
 //         #[serde(skip_serializing)]
 //         c: C,
 //     }
-pub fn with_bound<F>(
-    item: &Item,
+pub fn with_bound(
+    cont: &Container,
     generics: &syn::Generics,
-    filter: F,
+    filter: fn(&attr::Field, Option<&attr::Variant>) -> bool,
     bound: &syn::Path,
-) -> syn::Generics
-    where F: Fn(&attr::Field) -> bool,
-{
-    struct FindTyParams {
+) -> syn::Generics {
+    struct FindTyParams<'ast> {
         // Set of all generic type parameters on the current struct (A, B, C in
         // the example). Initialized up front.
-        all_ty_params: HashSet<syn::Ident>,
+        all_type_params: HashSet<syn::Ident>,
+
         // Set of generic type parameters used in fields for which filter
         // returns true (A and B in the example). Filled in as the visitor sees
         // them.
-        relevant_ty_params: HashSet<syn::Ident>,
+        relevant_type_params: HashSet<syn::Ident>,
+
+        // Fields whose type is an associated type of one of the generic type
+        // parameters.
+        associated_type_usage: Vec<&'ast syn::TypePath>,
     }
-    impl visit::Visitor for FindTyParams {
-        fn visit_path(&mut self, path: &syn::Path) {
+    impl<'ast> Visit<'ast> for FindTyParams<'ast> {
+        fn visit_field(&mut self, field: &'ast syn::Field) {
+            if let syn::Type::Path(ref ty) = field.ty {
+                if let Some(Pair::Punctuated(ref t, _)) = ty.path.segments.first() {
+                    if self.all_type_params.contains(&t.ident) {
+                        self.associated_type_usage.push(ty);
+                    }
+                }
+            }
+            self.visit_type(&field.ty);
+        }
+
+        fn visit_path(&mut self, path: &'ast syn::Path) {
             if let Some(seg) = path.segments.last() {
-                if seg.ident == "PhantomData" {
+                if seg.into_value().ident == "PhantomData" {
                     // Hardcoded exception, because PhantomData<T> implements
                     // Serialize and Deserialize whether or not T implements it.
                     return;
                 }
             }
-            if !path.global && path.segments.len() == 1 {
-                let id = path.segments[0].ident.clone();
-                if self.all_ty_params.contains(&id) {
-                    self.relevant_ty_params.insert(id);
+            if path.leading_colon.is_none() && path.segments.len() == 1 {
+                let id = &path.segments[0].ident;
+                if self.all_type_params.contains(id) {
+                    self.relevant_type_params.insert(id.clone());
                 }
             }
-            visit::walk_path(self, path);
+            visit::visit_path(self, path);
+        }
+
+        // Type parameter should not be considered used by a macro path.
+        //
+        //     struct TypeMacro<T> {
+        //         mac: T!(),
+        //         marker: PhantomData<T>,
+        //     }
+        fn visit_macro(&mut self, _mac: &'ast syn::Macro) {}
+    }
+
+    let all_type_params = generics
+        .type_params()
+        .map(|param| param.ident.clone())
+        .collect();
+
+    let mut visitor = FindTyParams {
+        all_type_params: all_type_params,
+        relevant_type_params: HashSet::new(),
+        associated_type_usage: Vec::new(),
+    };
+    match cont.data {
+        Data::Enum(ref variants) => {
+            for variant in variants.iter() {
+                let relevant_fields = variant
+                    .fields
+                    .iter()
+                    .filter(|field| filter(&field.attrs, Some(&variant.attrs)));
+                for field in relevant_fields {
+                    visitor.visit_field(field.original);
+                }
+            }
+        }
+        Data::Struct(_, ref fields) => {
+            for field in fields.iter().filter(|field| filter(&field.attrs, None)) {
+                visitor.visit_field(field.original);
+            }
         }
     }
 
-    let all_ty_params: HashSet<_> = generics.ty_params.iter()
-        .map(|ty_param| ty_param.ident.clone())
+    let relevant_type_params = visitor.relevant_type_params;
+    let associated_type_usage = visitor.associated_type_usage;
+    let new_predicates = generics
+        .type_params()
+        .map(|param| param.ident.clone())
+        .filter(|id| relevant_type_params.contains(id))
+        .map(|id| syn::TypePath {
+            qself: None,
+            path: id.into(),
+        })
+        .chain(associated_type_usage.into_iter().cloned())
+        .map(|bounded_ty| {
+            syn::WherePredicate::Type(syn::PredicateType {
+                lifetimes: None,
+                // the type parameter that is being bounded e.g. T
+                bounded_ty: syn::Type::Path(bounded_ty),
+                colon_token: <Token![:]>::default(),
+                // the bound e.g. Serialize
+                bounds: vec![syn::TypeParamBound::Trait(syn::TraitBound {
+                    paren_token: None,
+                    modifier: syn::TraitBoundModifier::None,
+                    lifetimes: None,
+                    path: bound.clone(),
+                })]
+                .into_iter()
+                .collect(),
+            })
+        });
+
+    let mut generics = generics.clone();
+    generics
+        .make_where_clause()
+        .predicates
+        .extend(new_predicates);
+    generics
+}
+
+pub fn with_self_bound(
+    cont: &Container,
+    generics: &syn::Generics,
+    bound: &syn::Path,
+) -> syn::Generics {
+    let mut generics = generics.clone();
+    generics
+        .make_where_clause()
+        .predicates
+        .push(syn::WherePredicate::Type(syn::PredicateType {
+            lifetimes: None,
+            // the type that is being bounded e.g. MyStruct<'a, T>
+            bounded_ty: type_of_item(cont),
+            colon_token: <Token![:]>::default(),
+            // the bound e.g. Default
+            bounds: vec![syn::TypeParamBound::Trait(syn::TraitBound {
+                paren_token: None,
+                modifier: syn::TraitBoundModifier::None,
+                lifetimes: None,
+                path: bound.clone(),
+            })]
+            .into_iter()
+            .collect(),
+        }));
+    generics
+}
+
+pub fn with_lifetime_bound(generics: &syn::Generics, lifetime: &str) -> syn::Generics {
+    let bound = syn::Lifetime::new(lifetime, Span::call_site());
+    let def = syn::LifetimeDef {
+        attrs: Vec::new(),
+        lifetime: bound.clone(),
+        colon_token: None,
+        bounds: Punctuated::new(),
+    };
+
+    let params = Some(syn::GenericParam::Lifetime(def))
+        .into_iter()
+        .chain(generics.params.iter().cloned().map(|mut param| {
+            match param {
+                syn::GenericParam::Lifetime(ref mut param) => {
+                    param.bounds.push(bound.clone());
+                }
+                syn::GenericParam::Type(ref mut param) => {
+                    param
+                        .bounds
+                        .push(syn::TypeParamBound::Lifetime(bound.clone()));
+                }
+                syn::GenericParam::Const(_) => {}
+            }
+            param
+        }))
         .collect();
 
-    let relevant_tys = item.body.all_fields()
-        .filter(|&field| filter(&field.attrs))
-        .map(|field| &field.ty);
-
-    let mut visitor = FindTyParams {
-        all_ty_params: all_ty_params,
-        relevant_ty_params: HashSet::new(),
-    };
-    for ty in relevant_tys {
-        visit::walk_ty(&mut visitor, ty);
+    syn::Generics {
+        params: params,
+        ..generics.clone()
     }
-
-    aster::from_generics(generics.clone())
-        .with_predicates(
-            generics.ty_params.iter()
-                .map(|ty_param| ty_param.ident.clone())
-                .filter(|id| visitor.relevant_ty_params.contains(id))
-                .map(|id| aster::where_predicate()
-                    // the type parameter that is being bounded e.g. T
-                    .bound().build(aster::ty().id(id))
-                    // the bound e.g. Serialize
-                    .bound().trait_(bound.clone()).build()
-                    .build()))
-        .build()
+}
+
+fn type_of_item(cont: &Container) -> syn::Type {
+    syn::Type::Path(syn::TypePath {
+        qself: None,
+        path: syn::Path {
+            leading_colon: None,
+            segments: vec![syn::PathSegment {
+                ident: cont.ident.clone(),
+                arguments: syn::PathArguments::AngleBracketed(
+                    syn::AngleBracketedGenericArguments {
+                        colon2_token: None,
+                        lt_token: <Token![<]>::default(),
+                        args: cont
+                            .generics
+                            .params
+                            .iter()
+                            .map(|param| match *param {
+                                syn::GenericParam::Type(ref param) => {
+                                    syn::GenericArgument::Type(syn::Type::Path(syn::TypePath {
+                                        qself: None,
+                                        path: param.ident.clone().into(),
+                                    }))
+                                }
+                                syn::GenericParam::Lifetime(ref param) => {
+                                    syn::GenericArgument::Lifetime(param.lifetime.clone())
+                                }
+                                syn::GenericParam::Const(_) => {
+                                    panic!("Serde does not support const generics yet");
+                                }
+                            })
+                            .collect(),
+                        gt_token: <Token![>]>::default(),
+                    },
+                ),
+            }]
+            .into_iter()
+            .collect(),
+        },
+    })
 }

serde_derive/src/dummy.rs

@@ -0,0 +1,32 @@
+use proc_macro2::{Ident, Span, TokenStream};
+
+use try;
+
+pub fn wrap_in_const(trait_: &str, ty: &Ident, code: TokenStream) -> TokenStream {
+    let try_replacement = try::replacement();
+
+    let dummy_const = Ident::new(
+        &format!("_IMPL_{}_FOR_{}", trait_, unraw(ty)),
+        Span::call_site(),
+    );
+
+    quote! {
+        #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
+        const #dummy_const: () = {
+            #[allow(unknown_lints)]
+            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
+            #[allow(rust_2018_idioms)]
+            extern crate serde as _serde;
+            #try_replacement
+            #code
+        };
+    }
+}
+
+#[allow(deprecated)]
+fn unraw(ident: &Ident) -> String {
+    // str::trim_start_matches was added in 1.30, trim_left_matches deprecated
+    // in 1.33. We currently support rustc back to 1.15 so we need to continue
+    // to use the deprecated one.
+    ident.to_string().trim_left_matches("r#").to_owned()
+}

serde_derive/src/fragment.rs

@@ -0,0 +1,74 @@
+use proc_macro2::TokenStream;
+use quote::ToTokens;
+use syn::token;
+
+pub enum Fragment {
+    /// Tokens that can be used as an expression.
+    Expr(TokenStream),
+    /// Tokens that can be used inside a block. The surrounding curly braces are
+    /// not part of these tokens.
+    Block(TokenStream),
+}
+
+macro_rules! quote_expr {
+    ($($tt:tt)*) => {
+        $crate::fragment::Fragment::Expr(quote!($($tt)*))
+    }
+}
+
+macro_rules! quote_block {
+    ($($tt:tt)*) => {
+        $crate::fragment::Fragment::Block(quote!($($tt)*))
+    }
+}
+
+/// Interpolate a fragment in place of an expression. This involves surrounding
+/// Block fragments in curly braces.
+pub struct Expr(pub Fragment);
+impl ToTokens for Expr {
+    fn to_tokens(&self, out: &mut TokenStream) {
+        match self.0 {
+            Fragment::Expr(ref expr) => expr.to_tokens(out),
+            Fragment::Block(ref block) => {
+                token::Brace::default().surround(out, |out| block.to_tokens(out));
+            }
+        }
+    }
+}
+
+/// Interpolate a fragment as the statements of a block.
+pub struct Stmts(pub Fragment);
+impl ToTokens for Stmts {
+    fn to_tokens(&self, out: &mut TokenStream) {
+        match self.0 {
+            Fragment::Expr(ref expr) => expr.to_tokens(out),
+            Fragment::Block(ref block) => block.to_tokens(out),
+        }
+    }
+}
+
+/// Interpolate a fragment as the value part of a `match` expression. This
+/// involves putting a comma after expressions and curly braces around blocks.
+pub struct Match(pub Fragment);
+impl ToTokens for Match {
+    fn to_tokens(&self, out: &mut TokenStream) {
+        match self.0 {
+            Fragment::Expr(ref expr) => {
+                expr.to_tokens(out);
+                <Token![,]>::default().to_tokens(out);
+            }
+            Fragment::Block(ref block) => {
+                token::Brace::default().surround(out, |out| block.to_tokens(out));
+            }
+        }
+    }
+}
+
+impl AsRef<TokenStream> for Fragment {
+    fn as_ref(&self) -> &TokenStream {
+        match *self {
+            Fragment::Expr(ref expr) => expr,
+            Fragment::Block(ref block) => block,
+        }
+    }
+}

serde_derive/src/internals/ast.rs

@@ -0,0 +1,204 @@
+//! A Serde ast, parsed from the Syn ast and ready to generate Rust code.
+
+use internals::attr;
+use internals::check;
+use internals::{Ctxt, Derive};
+use syn;
+use syn::punctuated::Punctuated;
+
+/// A source data structure annotated with `#[derive(Serialize)]` and/or `#[derive(Deserialize)]`,
+/// parsed into an internal representation.
+pub struct Container<'a> {
+    /// The struct or enum name (without generics).
+    pub ident: syn::Ident,
+    /// Attributes on the structure, parsed for Serde.
+    pub attrs: attr::Container,
+    /// The contents of the struct or enum.
+    pub data: Data<'a>,
+    /// Any generics on the struct or enum.
+    pub generics: &'a syn::Generics,
+    /// Original input.
+    pub original: &'a syn::DeriveInput,
+}
+
+/// The fields of a struct or enum.
+///
+/// Analagous to `syn::Data`.
+pub enum Data<'a> {
+    Enum(Vec<Variant<'a>>),
+    Struct(Style, Vec<Field<'a>>),
+}
+
+/// A variant of an enum.
+pub struct Variant<'a> {
+    pub ident: syn::Ident,
+    pub attrs: attr::Variant,
+    pub style: Style,
+    pub fields: Vec<Field<'a>>,
+    pub original: &'a syn::Variant,
+}
+
+/// A field of a struct.
+pub struct Field<'a> {
+    pub member: syn::Member,
+    pub attrs: attr::Field,
+    pub ty: &'a syn::Type,
+    pub original: &'a syn::Field,
+}
+
+#[derive(Copy, Clone)]
+pub enum Style {
+    /// Named fields.
+    Struct,
+    /// Many unnamed fields.
+    Tuple,
+    /// One unnamed field.
+    Newtype,
+    /// No fields.
+    Unit,
+}
+
+impl<'a> Container<'a> {
+    /// Convert the raw Syn ast into a parsed container object, collecting errors in `cx`.
+    pub fn from_ast(
+        cx: &Ctxt,
+        item: &'a syn::DeriveInput,
+        derive: Derive,
+    ) -> Option<Container<'a>> {
+        let mut attrs = attr::Container::from_ast(cx, item);
+
+        let mut data = match item.data {
+            syn::Data::Enum(ref data) => {
+                Data::Enum(enum_from_ast(cx, &data.variants, attrs.default()))
+            }
+            syn::Data::Struct(ref data) => {
+                let (style, fields) = struct_from_ast(cx, &data.fields, None, attrs.default());
+                Data::Struct(style, fields)
+            }
+            syn::Data::Union(_) => {
+                cx.error_spanned_by(item, "Serde does not support derive for unions");
+                return None;
+            }
+        };
+
+        let mut has_flatten = false;
+        match data {
+            Data::Enum(ref mut variants) => {
+                for variant in variants {
+                    variant.attrs.rename_by_rules(attrs.rename_all_rules());
+                    for field in &mut variant.fields {
+                        if field.attrs.flatten() {
+                            has_flatten = true;
+                        }
+                        field
+                            .attrs
+                            .rename_by_rules(variant.attrs.rename_all_rules());
+                    }
+                }
+            }
+            Data::Struct(_, ref mut fields) => {
+                for field in fields {
+                    if field.attrs.flatten() {
+                        has_flatten = true;
+                    }
+                    field.attrs.rename_by_rules(attrs.rename_all_rules());
+                }
+            }
+        }
+
+        if has_flatten {
+            attrs.mark_has_flatten();
+        }
+
+        let mut item = Container {
+            ident: item.ident.clone(),
+            attrs: attrs,
+            data: data,
+            generics: &item.generics,
+            original: item,
+        };
+        check::check(cx, &mut item, derive);
+        Some(item)
+    }
+}
+
+impl<'a> Data<'a> {
+    pub fn all_fields(&'a self) -> Box<Iterator<Item = &'a Field<'a>> + 'a> {
+        match *self {
+            Data::Enum(ref variants) => {
+                Box::new(variants.iter().flat_map(|variant| variant.fields.iter()))
+            }
+            Data::Struct(_, ref fields) => Box::new(fields.iter()),
+        }
+    }
+
+    pub fn has_getter(&self) -> bool {
+        self.all_fields().any(|f| f.attrs.getter().is_some())
+    }
+}
+
+fn enum_from_ast<'a>(
+    cx: &Ctxt,
+    variants: &'a Punctuated<syn::Variant, Token![,]>,
+    container_default: &attr::Default,
+) -> Vec<Variant<'a>> {
+    variants
+        .iter()
+        .map(|variant| {
+            let attrs = attr::Variant::from_ast(cx, variant);
+            let (style, fields) =
+                struct_from_ast(cx, &variant.fields, Some(&attrs), container_default);
+            Variant {
+                ident: variant.ident.clone(),
+                attrs: attrs,
+                style: style,
+                fields: fields,
+                original: variant,
+            }
+        })
+        .collect()
+}
+
+fn struct_from_ast<'a>(
+    cx: &Ctxt,
+    fields: &'a syn::Fields,
+    attrs: Option<&attr::Variant>,
+    container_default: &attr::Default,
+) -> (Style, Vec<Field<'a>>) {
+    match *fields {
+        syn::Fields::Named(ref fields) => (
+            Style::Struct,
+            fields_from_ast(cx, &fields.named, attrs, container_default),
+        ),
+        syn::Fields::Unnamed(ref fields) if fields.unnamed.len() == 1 => (
+            Style::Newtype,
+            fields_from_ast(cx, &fields.unnamed, attrs, container_default),
+        ),
+        syn::Fields::Unnamed(ref fields) => (
+            Style::Tuple,
+            fields_from_ast(cx, &fields.unnamed, attrs, container_default),
+        ),
+        syn::Fields::Unit => (Style::Unit, Vec::new()),
+    }
+}
+
+fn fields_from_ast<'a>(
+    cx: &Ctxt,
+    fields: &'a Punctuated<syn::Field, Token![,]>,
+    attrs: Option<&attr::Variant>,
+    container_default: &attr::Default,
+) -> Vec<Field<'a>> {
+    fields
+        .iter()
+        .enumerate()
+        .map(|(i, field)| Field {
+            member: match field.ident {
+                Some(ref ident) => syn::Member::Named(ident.clone()),
+                None => syn::Member::Unnamed(i.into()),
+            },
+            attrs: attr::Field::from_ast(cx, i, field, attrs, container_default),
+            ty: &field.ty,
+            original: field,
+        })
+        .collect()
+}

serde_derive/src/internals/case.rs

@@ -0,0 +1,174 @@
+//! Code to convert the Rust-styled field/variant (e.g. `my_field`, `MyType`) to the
+//! case of the source (e.g. `my-field`, `MY_FIELD`).
+
+// See https://users.rust-lang.org/t/psa-dealing-with-warning-unused-import-std-ascii-asciiext-in-today-s-nightly/13726
+#[allow(deprecated, unused_imports)]
+use std::ascii::AsciiExt;
+
+use std::str::FromStr;
+
+use self::RenameRule::*;
+
+/// The different possible ways to change case of fields in a struct, or variants in an enum.
+#[derive(Copy, Clone, PartialEq)]
+pub enum RenameRule {
+    /// Don't apply a default rename rule.
+    None,
+    /// Rename direct children to "lowercase" style.
+    LowerCase,
+    /// Rename direct children to "UPPERCASE" style.
+    UPPERCASE,
+    /// Rename direct children to "PascalCase" style, as typically used for
+    /// enum variants.
+    PascalCase,
+    /// Rename direct children to "camelCase" style.
+    CamelCase,
+    /// Rename direct children to "snake_case" style, as commonly used for
+    /// fields.
+    SnakeCase,
+    /// Rename direct children to "SCREAMING_SNAKE_CASE" style, as commonly
+    /// used for constants.
+    ScreamingSnakeCase,
+    /// Rename direct children to "kebab-case" style.
+    KebabCase,
+    /// Rename direct children to "SCREAMING-KEBAB-CASE" style.
+    ScreamingKebabCase,
+}
+
+impl RenameRule {
+    /// Apply a renaming rule to an enum variant, returning the version expected in the source.
+    pub fn apply_to_variant(&self, variant: &str) -> String {
+        match *self {
+            None | PascalCase => variant.to_owned(),
+            LowerCase => variant.to_ascii_lowercase(),
+            UPPERCASE => variant.to_ascii_uppercase(),
+            CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..],
+            SnakeCase => {
+                let mut snake = String::new();
+                for (i, ch) in variant.char_indices() {
+                    if i > 0 && ch.is_uppercase() {
+                        snake.push('_');
+                    }
+                    snake.push(ch.to_ascii_lowercase());
+                }
+                snake
+            }
+            ScreamingSnakeCase => SnakeCase.apply_to_variant(variant).to_ascii_uppercase(),
+            KebabCase => SnakeCase.apply_to_variant(variant).replace('_', "-"),
+            ScreamingKebabCase => ScreamingSnakeCase
+                .apply_to_variant(variant)
+                .replace('_', "-"),
+        }
+    }
+
+    /// Apply a renaming rule to a struct field, returning the version expected in the source.
+    pub fn apply_to_field(&self, field: &str) -> String {
+        match *self {
+            None | LowerCase | SnakeCase => field.to_owned(),
+            UPPERCASE => field.to_ascii_uppercase(),
+            PascalCase => {
+                let mut pascal = String::new();
+                let mut capitalize = true;
+                for ch in field.chars() {
+                    if ch == '_' {
+                        capitalize = true;
+                    } else if capitalize {
+                        pascal.push(ch.to_ascii_uppercase());
+                        capitalize = false;
+                    } else {
+                        pascal.push(ch);
+                    }
+                }
+                pascal
+            }
+            CamelCase => {
+                let pascal = PascalCase.apply_to_field(field);
+                pascal[..1].to_ascii_lowercase() + &pascal[1..]
+            }
+            ScreamingSnakeCase => field.to_ascii_uppercase(),
+            KebabCase => field.replace('_', "-"),
+            ScreamingKebabCase => ScreamingSnakeCase.apply_to_field(field).replace('_', "-"),
+        }
+    }
+}
+
+impl FromStr for RenameRule {
+    type Err = ();
+
+    fn from_str(rename_all_str: &str) -> Result<Self, Self::Err> {
+        match rename_all_str {
+            "lowercase" => Ok(LowerCase),
+            "UPPERCASE" => Ok(UPPERCASE),
+            "PascalCase" => Ok(PascalCase),
+            "camelCase" => Ok(CamelCase),
+            "snake_case" => Ok(SnakeCase),
+            "SCREAMING_SNAKE_CASE" => Ok(ScreamingSnakeCase),
+            "kebab-case" => Ok(KebabCase),
+            "SCREAMING-KEBAB-CASE" => Ok(ScreamingKebabCase),
+            _ => Err(()),
+        }
+    }
+}
+
+#[test]
+fn rename_variants() {
+    for &(original, lower, upper, camel, snake, screaming, kebab, screaming_kebab) in &[
+        (
+            "Outcome", "outcome", "OUTCOME", "outcome", "outcome", "OUTCOME", "outcome", "OUTCOME",
+        ),
+        (
+            "VeryTasty",
+            "verytasty",
+            "VERYTASTY",
+            "veryTasty",
+            "very_tasty",
+            "VERY_TASTY",
+            "very-tasty",
+            "VERY-TASTY",
+        ),
+        ("A", "a", "A", "a", "a", "A", "a", "A"),
+        ("Z42", "z42", "Z42", "z42", "z42", "Z42", "z42", "Z42"),
+    ] {
+        assert_eq!(None.apply_to_variant(original), original);
+        assert_eq!(LowerCase.apply_to_variant(original), lower);
+        assert_eq!(UPPERCASE.apply_to_variant(original), upper);
+        assert_eq!(PascalCase.apply_to_variant(original), original);
+        assert_eq!(CamelCase.apply_to_variant(original), camel);
+        assert_eq!(SnakeCase.apply_to_variant(original), snake);
+        assert_eq!(ScreamingSnakeCase.apply_to_variant(original), screaming);
+        assert_eq!(KebabCase.apply_to_variant(original), kebab);
+        assert_eq!(
+            ScreamingKebabCase.apply_to_variant(original),
+            screaming_kebab
+        );
+    }
+}
+
+#[test]
+fn rename_fields() {
+    for &(original, upper, pascal, camel, screaming, kebab, screaming_kebab) in &[
+        (
+            "outcome", "OUTCOME", "Outcome", "outcome", "OUTCOME", "outcome", "OUTCOME",
+        ),
+        (
+            "very_tasty",
+            "VERY_TASTY",
+            "VeryTasty",
+            "veryTasty",
+            "VERY_TASTY",
+            "very-tasty",
+            "VERY-TASTY",
+        ),
+        ("a", "A", "A", "a", "A", "a", "A"),
+        ("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42"),
+    ] {
+        assert_eq!(None.apply_to_field(original), original);
+        assert_eq!(UPPERCASE.apply_to_field(original), upper);
+        assert_eq!(PascalCase.apply_to_field(original), pascal);
+        assert_eq!(CamelCase.apply_to_field(original), camel);
+        assert_eq!(SnakeCase.apply_to_field(original), original);
+        assert_eq!(ScreamingSnakeCase.apply_to_field(original), screaming);
+        assert_eq!(KebabCase.apply_to_field(original), kebab);
+        assert_eq!(ScreamingKebabCase.apply_to_field(original), screaming_kebab);
+    }
+}

serde_derive/src/internals/check.rs

@@ -0,0 +1,412 @@
+use internals::ast::{Container, Data, Field, Style};
+use internals::attr::{Identifier, TagType};
+use internals::{Ctxt, Derive};
+use syn::{Member, Type};
+
+/// Cross-cutting checks that require looking at more than a single attrs
+/// object. Simpler checks should happen when parsing and building the attrs.
+pub fn check(cx: &Ctxt, cont: &mut Container, derive: Derive) {
+    check_getter(cx, cont);
+    check_flatten(cx, cont);
+    check_identifier(cx, cont);
+    check_variant_skip_attrs(cx, cont);
+    check_internal_tag_field_name_conflict(cx, cont);
+    check_adjacent_tag_conflict(cx, cont);
+    check_transparent(cx, cont, derive);
+}
+
+/// Getters are only allowed inside structs (not enums) with the `remote`
+/// attribute.
+fn check_getter(cx: &Ctxt, cont: &Container) {
+    match cont.data {
+        Data::Enum(_) => {
+            if cont.data.has_getter() {
+                cx.error_spanned_by(
+                    cont.original,
+                    "#[serde(getter = \"...\")] is not allowed in an enum",
+                );
+            }
+        }
+        Data::Struct(_, _) => {
+            if cont.data.has_getter() && cont.attrs.remote().is_none() {
+                cx.error_spanned_by(
+                    cont.original,
+                    "#[serde(getter = \"...\")] can only be used in structs \
+                     that have #[serde(remote = \"...\")]",
+                );
+            }
+        }
+    }
+}
+
+/// Flattening has some restrictions we can test.
+fn check_flatten(cx: &Ctxt, cont: &Container) {
+    match cont.data {
+        Data::Enum(ref variants) => {
+            for variant in variants {
+                for field in &variant.fields {
+                    check_flatten_field(cx, variant.style, field);
+                }
+            }
+        }
+        Data::Struct(style, ref fields) => {
+            for field in fields {
+                check_flatten_field(cx, style, field);
+            }
+        }
+    }
+}
+
+fn check_flatten_field(cx: &Ctxt, style: Style, field: &Field) {
+    if !field.attrs.flatten() {
+        return;
+    }
+    match style {
+        Style::Tuple => {
+            cx.error_spanned_by(
+                field.original,
+                "#[serde(flatten)] cannot be used on tuple structs",
+            );
+        }
+        Style::Newtype => {
+            cx.error_spanned_by(
+                field.original,
+                "#[serde(flatten)] cannot be used on newtype structs",
+            );
+        }
+        _ => {}
+    }
+}
+
+/// The `other` attribute must be used at most once and it must be the last
+/// variant of an enum.
+///
+/// Inside a `variant_identifier` all variants must be unit variants. Inside a
+/// `field_identifier` all but possibly one variant must be unit variants. The
+/// last variant may be a newtype variant which is an implicit "other" case.
+fn check_identifier(cx: &Ctxt, cont: &Container) {
+    let variants = match cont.data {
+        Data::Enum(ref variants) => variants,
+        Data::Struct(_, _) => {
+            return;
+        }
+    };
+
+    for (i, variant) in variants.iter().enumerate() {
+        match (
+            variant.style,
+            cont.attrs.identifier(),
+            variant.attrs.other(),
+            cont.attrs.tag(),
+        ) {
+            // The `other` attribute may not be used in a variant_identifier.
+            (_, Identifier::Variant, true, _) => {
+                cx.error_spanned_by(
+                    variant.original,
+                    "#[serde(other)] may not be used on a variant identifier",
+                );
+            }
+
+            // Variant with `other` attribute cannot appear in untagged enum
+            (_, Identifier::No, true, &TagType::None) => {
+                cx.error_spanned_by(
+                    variant.original,
+                    "#[serde(other)] cannot appear on untagged enum",
+                );
+            }
+
+            // Variant with `other` attribute must be the last one.
+            (Style::Unit, Identifier::Field, true, _) | (Style::Unit, Identifier::No, true, _) => {
+                if i < variants.len() - 1 {
+                    cx.error_spanned_by(
+                        variant.original,
+                        "#[serde(other)] must be on the last variant",
+                    );
+                }
+            }
+
+            // Variant with `other` attribute must be a unit variant.
+            (_, Identifier::Field, true, _) | (_, Identifier::No, true, _) => {
+                cx.error_spanned_by(
+                    variant.original,
+                    "#[serde(other)] must be on a unit variant",
+                );
+            }
+
+            // Any sort of variant is allowed if this is not an identifier.
+            (_, Identifier::No, false, _) => {}
+
+            // Unit variant without `other` attribute is always fine.
+            (Style::Unit, _, false, _) => {}
+
+            // The last field is allowed to be a newtype catch-all.
+            (Style::Newtype, Identifier::Field, false, _) => {
+                if i < variants.len() - 1 {
+                    cx.error_spanned_by(
+                        variant.original,
+                        format!("`{}` must be the last variant", variant.ident),
+                    );
+                }
+            }
+
+            (_, Identifier::Field, false, _) => {
+                cx.error_spanned_by(
+                    variant.original,
+                    "#[serde(field_identifier)] may only contain unit variants",
+                );
+            }
+
+            (_, Identifier::Variant, false, _) => {
+                cx.error_spanned_by(
+                    variant.original,
+                    "#[serde(variant_identifier)] may only contain unit variants",
+                );
+            }
+        }
+    }
+}
+
+/// Skip-(de)serializing attributes are not allowed on variants marked
+/// (de)serialize_with.
+fn check_variant_skip_attrs(cx: &Ctxt, cont: &Container) {
+    let variants = match cont.data {
+        Data::Enum(ref variants) => variants,
+        Data::Struct(_, _) => {
+            return;
+        }
+    };
+
+    for variant in variants.iter() {
+        if variant.attrs.serialize_with().is_some() {
+            if variant.attrs.skip_serializing() {
+                cx.error_spanned_by(
+                    variant.original,
+                    format!(
+                        "variant `{}` cannot have both #[serde(serialize_with)] and \
+                         #[serde(skip_serializing)]",
+                        variant.ident
+                    ),
+                );
+            }
+
+            for field in &variant.fields {
+                let member = member_message(&field.member);
+
+                if field.attrs.skip_serializing() {
+                    cx.error_spanned_by(
+                        variant.original,
+                        format!(
+                            "variant `{}` cannot have both #[serde(serialize_with)] and \
+                             a field {} marked with #[serde(skip_serializing)]",
+                            variant.ident, member
+                        ),
+                    );
+                }
+
+                if field.attrs.skip_serializing_if().is_some() {
+                    cx.error_spanned_by(
+                        variant.original,
+                        format!(
+                            "variant `{}` cannot have both #[serde(serialize_with)] and \
+                             a field {} marked with #[serde(skip_serializing_if)]",
+                            variant.ident, member
+                        ),
+                    );
+                }
+            }
+        }
+
+        if variant.attrs.deserialize_with().is_some() {
+            if variant.attrs.skip_deserializing() {
+                cx.error_spanned_by(
+                    variant.original,
+                    format!(
+                        "variant `{}` cannot have both #[serde(deserialize_with)] and \
+                         #[serde(skip_deserializing)]",
+                        variant.ident
+                    ),
+                );
+            }
+
+            for field in &variant.fields {
+                if field.attrs.skip_deserializing() {
+                    let member = member_message(&field.member);
+
+                    cx.error_spanned_by(
+                        variant.original,
+                        format!(
+                            "variant `{}` cannot have both #[serde(deserialize_with)] \
+                             and a field {} marked with #[serde(skip_deserializing)]",
+                            variant.ident, member
+                        ),
+                    );
+                }
+            }
+        }
+    }
+}
+
+/// The tag of an internally-tagged struct variant must not be
+/// the same as either one of its fields, as this would result in
+/// duplicate keys in the serialized output and/or ambiguity in
+/// the to-be-deserialized input.
+fn check_internal_tag_field_name_conflict(cx: &Ctxt, cont: &Container) {
+    let variants = match cont.data {
+        Data::Enum(ref variants) => variants,
+        Data::Struct(_, _) => return,
+    };
+
+    let tag = match *cont.attrs.tag() {
+        TagType::Internal { ref tag } => tag.as_str(),
+        TagType::External | TagType::Adjacent { .. } | TagType::None => return,
+    };
+
+    let diagnose_conflict = || {
+        cx.error_spanned_by(
+            cont.original,
+            format!("variant field name `{}` conflicts with internal tag", tag),
+        )
+    };
+
+    for variant in variants {
+        match variant.style {
+            Style::Struct => {
+                for field in &variant.fields {
+                    let check_ser = !field.attrs.skip_serializing();
+                    let check_de = !field.attrs.skip_deserializing();
+                    let name = field.attrs.name();
+                    let ser_name = name.serialize_name();
+
+                    if check_ser && ser_name == tag {
+                        diagnose_conflict();
+                        return;
+                    }
+
+                    for de_name in field.attrs.aliases() {
+                        if check_de && de_name == tag {
+                            diagnose_conflict();
+                            return;
+                        }
+                    }
+                }
+            }
+            Style::Unit | Style::Newtype | Style::Tuple => {}
+        }
+    }
+}
+
+/// In the case of adjacently-tagged enums, the type and the
+/// contents tag must differ, for the same reason.
+fn check_adjacent_tag_conflict(cx: &Ctxt, cont: &Container) {
+    let (type_tag, content_tag) = match *cont.attrs.tag() {
+        TagType::Adjacent {
+            ref tag,
+            ref content,
+        } => (tag, content),
+        TagType::Internal { .. } | TagType::External | TagType::None => return,
+    };
+
+    if type_tag == content_tag {
+        cx.error_spanned_by(
+            cont.original,
+            format!(
+                "enum tags `{}` for type and content conflict with each other",
+                type_tag
+            ),
+        );
+    }
+}
+
+/// Enums and unit structs cannot be transparent.
+fn check_transparent(cx: &Ctxt, cont: &mut Container, derive: Derive) {
+    if !cont.attrs.transparent() {
+        return;
+    }
+
+    if cont.attrs.type_from().is_some() {
+        cx.error_spanned_by(
+            cont.original,
+            "#[serde(transparent)] is not allowed with #[serde(from = \"...\")]",
+        );
+    }
+
+    if cont.attrs.type_into().is_some() {
+        cx.error_spanned_by(
+            cont.original,
+            "#[serde(transparent)] is not allowed with #[serde(into = \"...\")]",
+        );
+    }
+
+    let fields = match cont.data {
+        Data::Enum(_) => {
+            cx.error_spanned_by(
+                cont.original,
+                "#[serde(transparent)] is not allowed on an enum",
+            );
+            return;
+        }
+        Data::Struct(Style::Unit, _) => {
+            cx.error_spanned_by(
+                cont.original,
+                "#[serde(transparent)] is not allowed on a unit struct",
+            );
+            return;
+        }
+        Data::Struct(_, ref mut fields) => fields,
+    };
+
+    let mut transparent_field = None;
+
+    for field in fields {
+        if allow_transparent(field, derive) {
+            if transparent_field.is_some() {
+                cx.error_spanned_by(
+                    cont.original,
+                    "#[serde(transparent)] requires struct to have at most one transparent field",
+                );
+                return;
+            }
+            transparent_field = Some(field);
+        }
+    }
+
+    match transparent_field {
+        Some(transparent_field) => transparent_field.attrs.mark_transparent(),
+        None => match derive {
+            Derive::Serialize => {
+                cx.error_spanned_by(
+                    cont.original,
+                    "#[serde(transparent)] requires at least one field that is not skipped",
+                );
+            }
+            Derive::Deserialize => {
+                cx.error_spanned_by(
+                    cont.original,
+                    "#[serde(transparent)] requires at least one field that is neither skipped nor has a default",
+                );
+            }
+        },
+    }
+}
+
+fn member_message(member: &Member) -> String {
+    match *member {
+        Member::Named(ref ident) => format!("`{}`", ident),
+        Member::Unnamed(ref i) => format!("#{}", i.index),
+    }
+}
+
+fn allow_transparent(field: &Field, derive: Derive) -> bool {
+    if let Type::Path(ref ty) = *field.ty {
+        if let Some(seg) = ty.path.segments.last() {
+            if seg.into_value().ident == "PhantomData" {
+                return false;
+            }
+        }
+    }
+
+    match derive {
+        Derive::Serialize => !field.attrs.skip_serializing(),
+        Derive::Deserialize => !field.attrs.skip_deserializing() && field.attrs.default().is_none(),
+    }
+}

serde_derive/src/internals/ctxt.rs

@@ -0,0 +1,57 @@
+use quote::ToTokens;
+use std::cell::RefCell;
+use std::fmt::Display;
+use std::thread;
+use syn;
+
+/// A type to collect errors together and format them.
+///
+/// Dropping this object will cause a panic. It must be consumed using `check`.
+///
+/// References can be shared since this type uses run-time exclusive mut checking.
+#[derive(Default)]
+pub struct Ctxt {
+    // The contents will be set to `None` during checking. This is so that checking can be
+    // enforced.
+    errors: RefCell<Option<Vec<syn::Error>>>,
+}
+
+impl Ctxt {
+    /// Create a new context object.
+    ///
+    /// This object contains no errors, but will still trigger a panic if it is not `check`ed.
+    pub fn new() -> Self {
+        Ctxt {
+            errors: RefCell::new(Some(Vec::new())),
+        }
+    }
+
+    /// Add an error to the context object with a tokenenizable object.
+    ///
+    /// The object is used for spanning in error messages.
+    pub fn error_spanned_by<A: ToTokens, T: Display>(&self, obj: A, msg: T) {
+        self.errors
+            .borrow_mut()
+            .as_mut()
+            .unwrap()
+            // Curb monomorphization from generating too many identical methods.
+            .push(syn::Error::new_spanned(obj.into_token_stream(), msg));
+    }
+
+    /// Consume this object, producing a formatted error string if there are errors.
+    pub fn check(self) -> Result<(), Vec<syn::Error>> {
+        let errors = self.errors.borrow_mut().take().unwrap();
+        match errors.len() {
+            0 => Ok(()),
+            _ => Err(errors),
+        }
+    }
+}
+
+impl Drop for Ctxt {
+    fn drop(&mut self) {
+        if !thread::panicking() && self.errors.borrow().is_some() {
+            panic!("forgot to check for errors");
+        }
+    }
+}

serde_derive/src/internals/mod.rs

@@ -0,0 +1,14 @@
+pub mod ast;
+pub mod attr;
+
+mod ctxt;
+pub use self::ctxt::Ctxt;
+
+mod case;
+mod check;
+
+#[derive(Copy, Clone)]
+pub enum Derive {
+    Serialize,
+    Deserialize,
+}

serde_derive/src/lib.rs

@@ -1,36 +1,96 @@
-#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
-#![cfg_attr(feature = "cargo-clippy", allow(used_underscore_binding))]
+//! This crate provides Serde's two derive macros.
+//!
+//! ```edition2018
+//! # use serde_derive::{Serialize, Deserialize};
+//! #
+//! #[derive(Serialize, Deserialize)]
+//! # struct S;
+//! #
+//! # fn main() {}
+//! ```
+//!
+//! Please refer to [https://serde.rs/derive.html] for how to set this up.
+//!
+//! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.88")]
+#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
+#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
+// Ignored clippy lints
+#![cfg_attr(
+    feature = "cargo-clippy",
+    allow(
+        cyclomatic_complexity,
+        enum_variant_names,
+        needless_pass_by_value,
+        redundant_field_names,
+        too_many_arguments,
+        trivially_copy_pass_by_ref,
+        used_underscore_binding,
+    )
+)]
+// Ignored clippy_pedantic lints
+#![cfg_attr(
+    feature = "cargo-clippy",
+    allow(
+        cast_possible_truncation,
+        doc_markdown,
+        enum_glob_use,
+        filter_map,
+        indexing_slicing,
+        items_after_statements,
+        match_same_arms,
+        module_name_repetitions,
+        similar_names,
+        single_match_else,
+        unseparated_literal_suffix,
+        use_self,
+    )
+)]
 // The `quote!` macro requires deep recursion.
-#![recursion_limit = "192"]
+#![recursion_limit = "512"]
 
-extern crate syn;
 #[macro_use]
 extern crate quote;
-
-extern crate serde_codegen_internals as internals;
+#[macro_use]
+extern crate syn;
 
 extern crate proc_macro;
-use proc_macro::TokenStream;
+extern crate proc_macro2;
 
+mod internals;
+
+use proc_macro::TokenStream;
+use syn::DeriveInput;
+
+#[macro_use]
 mod bound;
+#[macro_use]
+mod fragment;
+
 mod de;
+mod dummy;
+mod pretend;
 mod ser;
+mod try;
 
 #[proc_macro_derive(Serialize, attributes(serde))]
 pub fn derive_serialize(input: TokenStream) -> TokenStream {
-    let input = syn::parse_derive_input(&input.to_string()).unwrap();
-    match ser::expand_derive_serialize(&input) {
-        Ok(expanded) => expanded.parse().unwrap(),
-        Err(msg) => panic!(msg),
-    }
+    let input = parse_macro_input!(input as DeriveInput);
+    ser::expand_derive_serialize(&input)
+        .unwrap_or_else(to_compile_errors)
+        .into()
 }
 
 #[proc_macro_derive(Deserialize, attributes(serde))]
 pub fn derive_deserialize(input: TokenStream) -> TokenStream {
-    let input = syn::parse_derive_input(&input.to_string()).unwrap();
-    match de::expand_derive_deserialize(&input) {
-        Ok(expanded) => expanded.parse().unwrap(),
-        Err(msg) => panic!(msg),
-    }
+    let input = parse_macro_input!(input as DeriveInput);
+    de::expand_derive_deserialize(&input)
+        .unwrap_or_else(to_compile_errors)
+        .into()
+}
+
+fn to_compile_errors(errors: Vec<syn::Error>) -> proc_macro2::TokenStream {
+    let compile_errors = errors.iter().map(syn::Error::to_compile_error);
+    quote!(#(#compile_errors)*)
 }

serde_derive/src/pretend.rs

@@ -0,0 +1,140 @@
+use proc_macro2::{Span, TokenStream};
+use syn::Ident;
+
+use internals::ast::{Container, Data, Field, Style};
+
+// Suppress dead_code warnings that would otherwise appear when using a remote
+// derive. Other than this pretend code, a struct annotated with remote derive
+// never has its fields referenced and an enum annotated with remote derive
+// never has its variants constructed.
+//
+//     warning: field is never used: `i`
+//      --> src/main.rs:4:20
+//       |
+//     4 | struct StructDef { i: i32 }
+//       |                    ^^^^^^
+//
+//     warning: variant is never constructed: `V`
+//      --> src/main.rs:8:16
+//       |
+//     8 | enum EnumDef { V }
+//       |                ^
+//
+pub fn pretend_used(cont: &Container) -> TokenStream {
+    let pretend_fields = pretend_fields_used(cont);
+    let pretend_variants = pretend_variants_used(cont);
+
+    quote! {
+        #pretend_fields
+        #pretend_variants
+    }
+}
+
+// For structs with named fields, expands to:
+//
+//     match None::<T> {
+//         Some(T { a: ref __v0, b: ref __v1 }) => {}
+//         _ => {}
+//     }
+//
+// For enums, expands to the following but only including struct variants:
+//
+//     match None::<T> {
+//         Some(T::A { a: ref __v0 }) => {}
+//         Some(T::B { b: ref __v0 }) => {}
+//         _ => {}
+//     }
+//
+// The `ref` is important in case the user has written a Drop impl on their
+// type. Rust does not allow destructuring a struct or enum that has a Drop
+// impl.
+fn pretend_fields_used(cont: &Container) -> TokenStream {
+    let type_ident = &cont.ident;
+    let (_, ty_generics, _) = cont.generics.split_for_impl();
+
+    let patterns = match cont.data {
+        Data::Enum(ref variants) => variants
+            .iter()
+            .filter_map(|variant| match variant.style {
+                Style::Struct => {
+                    let variant_ident = &variant.ident;
+                    let pat = struct_pattern(&variant.fields);
+                    Some(quote!(#type_ident::#variant_ident #pat))
+                }
+                _ => None,
+            })
+            .collect::<Vec<_>>(),
+        Data::Struct(Style::Struct, ref fields) => {
+            let pat = struct_pattern(fields);
+            vec![quote!(#type_ident #pat)]
+        }
+        Data::Struct(_, _) => {
+            return quote!();
+        }
+    };
+
+    quote! {
+        match _serde::export::None::<#type_ident #ty_generics> {
+            #(
+                _serde::export::Some(#patterns) => {}
+            )*
+            _ => {}
+        }
+    }
+}
+
+// Expands to one of these per enum variant:
+//
+//     match None {
+//         Some((__v0, __v1,)) => {
+//             let _ = E::V { a: __v0, b: __v1 };
+//         }
+//         _ => {}
+//     }
+//
+fn pretend_variants_used(cont: &Container) -> TokenStream {
+    let variants = match cont.data {
+        Data::Enum(ref variants) => variants,
+        Data::Struct(_, _) => {
+            return quote!();
+        }
+    };
+
+    let type_ident = &cont.ident;
+    let (_, ty_generics, _) = cont.generics.split_for_impl();
+    let turbofish = ty_generics.as_turbofish();
+
+    let cases = variants.iter().map(|variant| {
+        let variant_ident = &variant.ident;
+        let placeholders = &(0..variant.fields.len())
+            .map(|i| Ident::new(&format!("__v{}", i), Span::call_site()))
+            .collect::<Vec<_>>();
+
+        let pat = match variant.style {
+            Style::Struct => {
+                let members = variant.fields.iter().map(|field| &field.member);
+                quote!({ #(#members: #placeholders),* })
+            }
+            Style::Tuple | Style::Newtype => quote!(( #(#placeholders),* )),
+            Style::Unit => quote!(),
+        };
+
+        quote! {
+            match _serde::export::None {
+                _serde::export::Some((#(#placeholders,)*)) => {
+                    let _ = #type_ident::#variant_ident #turbofish #pat;
+                }
+                _ => {}
+            }
+        }
+    });
+
+    quote!(#(#cases)*)
+}
+
+fn struct_pattern(fields: &[Field]) -> TokenStream {
+    let members = fields.iter().map(|field| &field.member);
+    let placeholders =
+        (0..fields.len()).map(|i| Ident::new(&format!("__v{}", i), Span::call_site()));
+    quote!({ #(#members: ref #placeholders),* })
+}

serde_derive/src/try.rs

@@ -0,0 +1,24 @@
+use proc_macro2::{Punct, Spacing, TokenStream};
+
+// None of our generated code requires the `From::from` error conversion
+// performed by the standard library's `try!` macro. With this simplified macro
+// we see a significant improvement in type checking and borrow checking time of
+// the generated code and a slight improvement in binary size.
+pub fn replacement() -> TokenStream {
+    // Cannot pass `$expr` to `quote!` prior to Rust 1.17.0 so interpolate it.
+    let dollar = Punct::new('$', Spacing::Alone);
+
+    quote! {
+        #[allow(unused_macros)]
+        macro_rules! try {
+            (#dollar __expr:expr) => {
+                match #dollar __expr {
+                    _serde::export::Ok(__val) => __val,
+                    _serde::export::Err(__err) => {
+                        return _serde::export::Err(__err);
+                    }
+                }
+            }
+        }
+    }
+}

serde_derive_internals/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "serde_derive_internals"
+version = "0.24.1" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
+license = "MIT/Apache-2.0"
+description = "AST representation used by Serde derive macros. Unstable."
+homepage = "https://serde.rs"
+repository = "https://github.com/serde-rs/serde"
+documentation = "https://docs.rs/serde_derive_internals"
+keywords = ["serde", "serialization"]
+include = ["Cargo.toml", "lib.rs", "src/**/*.rs", "LICENSE-APACHE", "LICENSE-MIT"]
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+proc-macro2 = "0.4"
+quote = "0.6.3"
+syn = { version = "0.15", default-features = false, features = ["derive", "parsing", "printing", "clone-impls"] }
+
+[badges]
+travis-ci = { repository = "serde-rs/serde" }
+appveyor = { repository = "serde-rs/serde" }

serde_derive_internals/LICENSE-APACHE

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

serde_derive_internals/LICENSE-MIT

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

serde_derive_internals/lib.rs

@@ -0,0 +1,21 @@
+#![doc(html_root_url = "https://docs.rs/serde_derive_internals/0.24.1")]
+#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
+#![cfg_attr(
+    feature = "cargo-clippy",
+    allow(
+        cyclomatic_complexity,
+        redundant_field_names,
+        trivially_copy_pass_by_ref
+    )
+)]
+
+#[macro_use]
+extern crate syn;
+
+extern crate proc_macro2;
+extern crate quote;
+
+#[path = "src/mod.rs"]
+mod internals;
+
+pub use internals::*;

serde_derive_internals/src

@@ -0,0 +1 @@
+../serde_derive/src/internals/

serde_test/Cargo.toml

@@ -1,18 +1,23 @@
 [package]
 name = "serde_test"
-version = "0.9.5"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
+version = "1.0.88" # remember to update html_root_url
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"
 homepage = "https://serde.rs"
 repository = "https://github.com/serde-rs/serde"
 documentation = "https://docs.serde.rs/serde_test/"
-readme = "../README.md"
 keywords = ["serde", "serialization"]
-include = ["Cargo.toml", "src/**/*.rs"]
+readme = "crates-io.md"
+include = ["Cargo.toml", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [dependencies]
-serde = { version = "0.9", path = "../serde" }
+serde = { version = "1.0.60", path = "../serde" }
+
+[dev-dependencies]
+serde = { version = "1.0", path = "../serde" }
+serde_derive = { version = "1.0", path = "../serde_derive" }
 
 [badges]
 travis-ci = { repository = "serde-rs/serde" }
+appveyor = { repository = "serde-rs/serde" }

serde_test/LICENSE-APACHE

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

serde_test/LICENSE-MIT

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

serde_test/README.md

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

serde_test/crates-io.md

@@ -0,0 +1 @@
+../crates-io.md

serde_test/src/assert.rs

@@ -1,54 +1,226 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use de::Deserializer;
-use error::Error;
 use ser::Serializer;
 use token::Token;
 
 use std::fmt::Debug;
 
-pub fn assert_tokens<T>(value: &T, tokens: &[Token<'static>])
-    where T: Serialize + Deserialize + PartialEq + Debug,
+/// Runs both `assert_ser_tokens` and `assert_de_tokens`.
+///
+/// ```edition2018
+/// # use serde::{Serialize, Deserialize};
+/// # use serde_test::{assert_tokens, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// let s = S { a: 0, b: 0 };
+/// assert_tokens(&s, &[
+///     Token::Struct { name: "S", len: 2 },
+///     Token::Str("a"),
+///     Token::U8(0),
+///     Token::Str("b"),
+///     Token::U8(0),
+///     Token::StructEnd,
+/// ]);
+/// # }
+/// ```
+pub fn assert_tokens<'de, T>(value: &T, tokens: &'de [Token])
+where
+    T: Serialize + Deserialize<'de> + PartialEq + Debug,
 {
     assert_ser_tokens(value, tokens);
     assert_de_tokens(value, tokens);
 }
 
+/// Asserts that `value` serializes to the given `tokens`.
+///
+/// ```edition2018
+/// # use serde::{Serialize, Deserialize};
+/// # use serde_test::{assert_ser_tokens, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// let s = S { a: 0, b: 0 };
+/// assert_ser_tokens(&s, &[
+///     Token::Struct { name: "S", len: 2 },
+///     Token::Str("a"),
+///     Token::U8(0),
+///     Token::Str("b"),
+///     Token::U8(0),
+///     Token::StructEnd,
+/// ]);
+/// # }
+/// ```
 pub fn assert_ser_tokens<T>(value: &T, tokens: &[Token])
-    where T: Serialize,
+where
+    T: Serialize,
 {
-    let mut ser = Serializer::new(tokens.iter());
-    assert_eq!(Serialize::serialize(value, &mut ser), Ok(()));
-    assert_eq!(ser.next_token(), None);
+    let mut ser = Serializer::new(tokens);
+    match value.serialize(&mut ser) {
+        Ok(_) => {}
+        Err(err) => panic!("value failed to serialize: {}", err),
+    }
+
+    if ser.remaining() > 0 {
+        panic!("{} remaining tokens", ser.remaining());
+    }
 }
 
-/// Expect an error serializing `T`.
-pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: Error)
-    where T: Serialize + PartialEq + Debug,
+/// Asserts that `value` serializes to the given `tokens`, and then yields
+/// `error`.
+///
+/// ```edition2018
+/// use std::sync::{Arc, Mutex};
+/// use std::thread;
+///
+/// use serde::Serialize;
+/// use serde_test::{assert_ser_tokens_error, Token};
+///
+/// #[derive(Serialize)]
+/// struct Example {
+///     lock: Arc<Mutex<u32>>,
+/// }
+///
+/// fn main() {
+///     let example = Example { lock: Arc::new(Mutex::new(0)) };
+///     let lock = example.lock.clone();
+///
+///     let _ = thread::spawn(move || {
+///         // This thread will acquire the mutex first, unwrapping the result
+///         // of `lock` because the lock has not been poisoned.
+///         let _guard = lock.lock().unwrap();
+///
+///         // This panic while holding the lock (`_guard` is in scope) will
+///         // poison the mutex.
+///         panic!()
+///     }).join();
+///
+///     let expected = &[
+///         Token::Struct { name: "Example", len: 1 },
+///         Token::Str("lock"),
+///     ];
+///     let error = "lock poison error while serializing";
+///     assert_ser_tokens_error(&example, expected, error);
+/// }
+/// ```
+pub fn assert_ser_tokens_error<T>(value: &T, tokens: &[Token], error: &str)
+where
+    T: Serialize,
 {
-    let mut ser = Serializer::new(tokens.iter());
-    let v: Result<(), Error> = Serialize::serialize(value, &mut ser);
-    assert_eq!(v.as_ref(), Err(&error));
-    assert_eq!(ser.next_token(), None);
+    let mut ser = Serializer::new(tokens);
+    match value.serialize(&mut ser) {
+        Ok(_) => panic!("value serialized successfully"),
+        Err(e) => assert_eq!(e, *error),
+    }
+
+    if ser.remaining() > 0 {
+        panic!("{} remaining tokens", ser.remaining());
+    }
 }
 
-pub fn assert_de_tokens<T>(value: &T, tokens: &[Token<'static>])
-    where T: Deserialize + PartialEq + Debug,
+/// Asserts that the given `tokens` deserialize into `value`.
+///
+/// ```edition2018
+/// # use serde::{Serialize, Deserialize};
+/// # use serde_test::{assert_de_tokens, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// let s = S { a: 0, b: 0 };
+/// assert_de_tokens(&s, &[
+///     Token::Struct { name: "S", len: 2 },
+///     Token::Str("a"),
+///     Token::U8(0),
+///     Token::Str("b"),
+///     Token::U8(0),
+///     Token::StructEnd,
+/// ]);
+/// # }
+/// ```
+pub fn assert_de_tokens<'de, T>(value: &T, tokens: &'de [Token])
+where
+    T: Deserialize<'de> + PartialEq + Debug,
 {
-    let mut de = Deserializer::new(tokens.to_vec().into_iter());
-    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
-    assert_eq!(v.as_ref(), Ok(value));
-    assert_eq!(de.next_token(), None);
+    let mut de = Deserializer::new(tokens);
+    let mut deserialized_val = match T::deserialize(&mut de) {
+        Ok(v) => {
+            assert_eq!(v, *value);
+            v
+        }
+        Err(e) => panic!("tokens failed to deserialize: {}", e),
+    };
+    if de.remaining() > 0 {
+        panic!("{} remaining tokens", de.remaining());
+    }
+
+    // Do the same thing for deserialize_in_place. This isn't *great* because a
+    // no-op impl of deserialize_in_place can technically succeed here. Still,
+    // this should catch a lot of junk.
+    let mut de = Deserializer::new(tokens);
+    match T::deserialize_in_place(&mut de, &mut deserialized_val) {
+        Ok(()) => {
+            assert_eq!(deserialized_val, *value);
+        }
+        Err(e) => panic!("tokens failed to deserialize_in_place: {}", e),
+    }
+    if de.remaining() > 0 {
+        panic!("{} remaining tokens", de.remaining());
+    }
 }
 
-/// Expect an error deserializing tokens into a `T`.
-pub fn assert_de_tokens_error<T>(tokens: &[Token<'static>], error: Error)
-    where T: Deserialize + PartialEq + Debug,
+/// Asserts that the given `tokens` yield `error` when deserializing.
+///
+/// ```edition2018
+/// # use serde::{Serialize, Deserialize};
+/// # use serde_test::{assert_de_tokens_error, Token};
+/// #
+/// # fn main() {
+/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// #[serde(deny_unknown_fields)]
+/// struct S {
+///     a: u8,
+///     b: u8,
+/// }
+///
+/// assert_de_tokens_error::<S>(
+///     &[
+///         Token::Struct { name: "S", len: 2 },
+///         Token::Str("x"),
+///     ],
+///     "unknown field `x`, expected `a` or `b`",
+/// );
+/// # }
+/// ```
+pub fn assert_de_tokens_error<'de, T>(tokens: &'de [Token], error: &str)
+where
+    T: Deserialize<'de>,
 {
-    let mut de = Deserializer::new(tokens.to_vec().into_iter());
-    let v: Result<T, Error> = Deserialize::deserialize(&mut de);
-    assert_eq!(v, Err(error));
+    let mut de = Deserializer::new(tokens);
+    match T::deserialize(&mut de) {
+        Ok(_) => panic!("tokens deserialized successfully"),
+        Err(e) => assert_eq!(e, *error),
+    }
+
     // There may be one token left if a peek caused the error
-    de.next_token();
-    assert_eq!(de.next_token(), None);
+    de.next_token_opt();
+
+    if de.remaining() > 0 {
+        panic!("{} remaining tokens", de.remaining());
+    }
 }

serde_test/src/configure.rs

@@ -0,0 +1,836 @@
+use std::fmt;
+
+use serde::ser::{
+    SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,
+    SerializeTupleStruct, SerializeTupleVariant,
+};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Readable<T: ?Sized>(T);
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Compact<T: ?Sized>(T);
+
+/// Trait to determine whether a value is represented in human-readable or
+/// compact form.
+///
+/// ```edition2018
+/// use serde::{Deserialize, Deserializer, Serialize, Serializer};
+/// use serde_test::{assert_tokens, Configure, Token};
+///
+/// #[derive(Debug, PartialEq)]
+/// struct Example(u8, u8);
+///
+/// impl Serialize for Example {
+///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+///     where
+///         S: Serializer,
+///     {
+///         if serializer.is_human_readable() {
+///             format!("{}.{}", self.0, self.1).serialize(serializer)
+///         } else {
+///             (self.0, self.1).serialize(serializer)
+///         }
+///     }
+/// }
+///
+/// impl<'de> Deserialize<'de> for Example {
+///     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+///     where
+///         D: Deserializer<'de>,
+///     {
+///         use serde::de::Error;
+///         if deserializer.is_human_readable() {
+///             let s = String::deserialize(deserializer)?;
+///             let parts: Vec<_> = s.split('.').collect();
+///             Ok(Example(
+///                 parts[0].parse().map_err(D::Error::custom)?,
+///                 parts[1].parse().map_err(D::Error::custom)?,
+///             ))
+///         } else {
+///             let (x, y) = Deserialize::deserialize(deserializer)?;
+///             Ok(Example(x, y))
+///         }
+///     }
+/// }
+///
+/// fn main() {
+///     assert_tokens(
+///         &Example(1, 0).compact(),
+///         &[
+///             Token::Tuple { len: 2 },
+///             Token::U8(1),
+///             Token::U8(0),
+///             Token::TupleEnd,
+///         ],
+///     );
+///     assert_tokens(&Example(1, 0).readable(), &[Token::Str("1.0")]);
+/// }
+/// ```
+pub trait Configure {
+    /// Marks `self` as using `is_human_readable == true`
+    fn readable(self) -> Readable<Self>
+    where
+        Self: Sized,
+    {
+        Readable(self)
+    }
+    /// Marks `self` as using `is_human_readable == false`
+    fn compact(self) -> Compact<Self>
+    where
+        Self: Sized,
+    {
+        Compact(self)
+    }
+}
+
+impl<T: ?Sized> Configure for T {}
+
+impl<T: ?Sized> Serialize for Readable<T>
+where
+    T: Serialize,
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.0.serialize(Readable(serializer))
+    }
+}
+impl<T: ?Sized> Serialize for Compact<T>
+where
+    T: Serialize,
+{
+    #[inline]
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.0.serialize(Compact(serializer))
+    }
+}
+impl<'de, T> Deserialize<'de> for Readable<T>
+where
+    T: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        T::deserialize(Readable(deserializer)).map(Readable)
+    }
+}
+impl<'de, T> Deserialize<'de> for Compact<T>
+where
+    T: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        T::deserialize(Compact(deserializer)).map(Compact)
+    }
+}
+
+impl<'de, T> DeserializeSeed<'de> for Readable<T>
+where
+    T: DeserializeSeed<'de>,
+{
+    type Value = T::Value;
+
+    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        self.0.deserialize(Readable(deserializer))
+    }
+}
+impl<'de, T> DeserializeSeed<'de> for Compact<T>
+where
+    T: DeserializeSeed<'de>,
+{
+    type Value = T::Value;
+
+    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        self.0.deserialize(Compact(deserializer))
+    }
+}
+
+macro_rules! forward_method {
+    ($name: ident (self $(, $arg: ident : $arg_type: ty)* ) -> $return_type: ty) => {
+        fn $name (self $(, $arg : $arg_type)* ) -> $return_type {
+            (self.0).$name( $($arg),* )
+        }
+    };
+}
+
+macro_rules! forward_serialize_methods {
+    ( $( $name: ident $arg_type: ty ),* ) => {
+        $(
+            forward_method!($name(self, v : $arg_type) -> Result<Self::Ok, Self::Error>);
+        )*
+    };
+}
+
+macro_rules! impl_serializer {
+    ($wrapper:ident, $is_human_readable:expr) => {
+        impl<S> Serializer for $wrapper<S>
+        where
+            S: Serializer,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+
+            type SerializeSeq = $wrapper<S::SerializeSeq>;
+            type SerializeTuple = $wrapper<S::SerializeTuple>;
+            type SerializeTupleStruct = $wrapper<S::SerializeTupleStruct>;
+            type SerializeTupleVariant = $wrapper<S::SerializeTupleVariant>;
+            type SerializeMap = $wrapper<S::SerializeMap>;
+            type SerializeStruct = $wrapper<S::SerializeStruct>;
+            type SerializeStructVariant = $wrapper<S::SerializeStructVariant>;
+
+            fn is_human_readable(&self) -> bool {
+                $is_human_readable
+            }
+
+            forward_serialize_methods! {
+                serialize_bool bool,
+                serialize_i8 i8,
+                serialize_i16 i16,
+                serialize_i32 i32,
+                serialize_i64 i64,
+                serialize_u8 u8,
+                serialize_u16 u16,
+                serialize_u32 u32,
+                serialize_u64 u64,
+                serialize_f32 f32,
+                serialize_f64 f64,
+                serialize_char char,
+                serialize_str &str,
+                serialize_bytes &[u8],
+                serialize_unit_struct &'static str
+
+            }
+
+            fn serialize_unit(self) -> Result<S::Ok, S::Error> {
+                self.0.serialize_unit()
+            }
+
+            fn serialize_unit_variant(
+                self,
+                name: &'static str,
+                variant_index: u32,
+                variant: &'static str,
+            ) -> Result<S::Ok, S::Error> {
+                self.0.serialize_unit_variant(name, variant_index, variant)
+            }
+
+            fn serialize_newtype_struct<T: ?Sized>(
+                self,
+                name: &'static str,
+                value: &T,
+            ) -> Result<S::Ok, S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_newtype_struct(name, &$wrapper(value))
+            }
+
+            fn serialize_newtype_variant<T: ?Sized>(
+                self,
+                name: &'static str,
+                variant_index: u32,
+                variant: &'static str,
+                value: &T,
+            ) -> Result<S::Ok, S::Error>
+            where
+                T: Serialize,
+            {
+                self.0
+                    .serialize_newtype_variant(name, variant_index, variant, &$wrapper(value))
+            }
+
+            fn serialize_none(self) -> Result<S::Ok, Self::Error> {
+                self.0.serialize_none()
+            }
+
+            fn serialize_some<T: ?Sized>(self, value: &T) -> Result<S::Ok, Self::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_some(&$wrapper(value))
+            }
+
+            fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+                self.0.serialize_seq(len).map($wrapper)
+            }
+
+            fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {
+                self.0.serialize_tuple(len).map($wrapper)
+            }
+
+            fn serialize_tuple_struct(
+                self,
+                name: &'static str,
+                len: usize,
+            ) -> Result<Self::SerializeTupleStruct, Self::Error> {
+                self.0.serialize_tuple_struct(name, len).map($wrapper)
+            }
+
+            fn serialize_tuple_variant(
+                self,
+                name: &'static str,
+                variant_index: u32,
+                variant: &'static str,
+                len: usize,
+            ) -> Result<Self::SerializeTupleVariant, Self::Error> {
+                self.0
+                    .serialize_tuple_variant(name, variant_index, variant, len)
+                    .map($wrapper)
+            }
+
+            fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
+                self.0.serialize_map(len).map($wrapper)
+            }
+
+            fn serialize_struct(
+                self,
+                name: &'static str,
+                len: usize,
+            ) -> Result<Self::SerializeStruct, Self::Error> {
+                self.0.serialize_struct(name, len).map($wrapper)
+            }
+
+            fn serialize_struct_variant(
+                self,
+                name: &'static str,
+                variant_index: u32,
+                variant: &'static str,
+                len: usize,
+            ) -> Result<Self::SerializeStructVariant, Self::Error> {
+                self.0
+                    .serialize_struct_variant(name, variant_index, variant, len)
+                    .map($wrapper)
+            }
+        }
+
+        impl<S> SerializeSeq for $wrapper<S>
+        where
+            S: SerializeSeq,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_element(&$wrapper(value))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+
+        impl<S> SerializeTuple for $wrapper<S>
+        where
+            S: SerializeTuple,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_element(&$wrapper(value))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+
+        impl<S> SerializeTupleStruct for $wrapper<S>
+        where
+            S: SerializeTupleStruct,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_field(&$wrapper(value))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+
+        impl<S> SerializeTupleVariant for $wrapper<S>
+        where
+            S: SerializeTupleVariant,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_field(&$wrapper(value))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+
+        impl<S> SerializeMap for $wrapper<S>
+        where
+            S: SerializeMap,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_key(&$wrapper(key))
+            }
+            fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_value(&$wrapper(value))
+            }
+            fn serialize_entry<K: ?Sized, V: ?Sized>(
+                &mut self,
+                key: &K,
+                value: &V,
+            ) -> Result<(), S::Error>
+            where
+                K: Serialize,
+                V: Serialize,
+            {
+                self.0.serialize_entry(key, &$wrapper(value))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+
+        impl<S> SerializeStruct for $wrapper<S>
+        where
+            S: SerializeStruct,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_field<T: ?Sized>(
+                &mut self,
+                name: &'static str,
+                field: &T,
+            ) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_field(name, &$wrapper(field))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+
+        impl<S> SerializeStructVariant for $wrapper<S>
+        where
+            S: SerializeStructVariant,
+        {
+            type Ok = S::Ok;
+            type Error = S::Error;
+            fn serialize_field<T: ?Sized>(
+                &mut self,
+                name: &'static str,
+                field: &T,
+            ) -> Result<(), S::Error>
+            where
+                T: Serialize,
+            {
+                self.0.serialize_field(name, &$wrapper(field))
+            }
+            fn end(self) -> Result<S::Ok, S::Error> {
+                self.0.end()
+            }
+        }
+    };
+}
+
+impl_serializer!(Readable, true);
+impl_serializer!(Compact, false);
+
+use serde::de::{DeserializeSeed, EnumAccess, Error, MapAccess, SeqAccess, VariantAccess, Visitor};
+
+macro_rules! forward_deserialize_methods {
+    ( $wrapper : ident ( $( $name: ident ),* ) ) => {
+        $(
+            fn $name<V>(self, visitor: V) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                (self.0).$name($wrapper(visitor))
+            }
+        )*
+    };
+}
+
+macro_rules! impl_deserializer {
+    ($wrapper:ident, $is_human_readable:expr) => {
+        impl<'de, D> Deserializer<'de> for $wrapper<D>
+        where
+            D: Deserializer<'de>,
+        {
+            type Error = D::Error;
+
+            forward_deserialize_methods! {
+                $wrapper (
+                    deserialize_any,
+                    deserialize_bool,
+                    deserialize_u8,
+                    deserialize_u16,
+                    deserialize_u32,
+                    deserialize_u64,
+                    deserialize_i8,
+                    deserialize_i16,
+                    deserialize_i32,
+                    deserialize_i64,
+                    deserialize_f32,
+                    deserialize_f64,
+                    deserialize_char,
+                    deserialize_str,
+                    deserialize_string,
+                    deserialize_bytes,
+                    deserialize_byte_buf,
+                    deserialize_option,
+                    deserialize_unit,
+                    deserialize_seq,
+                    deserialize_map,
+                    deserialize_identifier,
+                    deserialize_ignored_any
+                )
+            }
+
+            fn deserialize_unit_struct<V>(
+                self,
+                name: &'static str,
+                visitor: V,
+            ) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.deserialize_unit_struct(name, $wrapper(visitor))
+            }
+            fn deserialize_newtype_struct<V>(
+                self,
+                name: &'static str,
+                visitor: V,
+            ) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.deserialize_newtype_struct(name, $wrapper(visitor))
+            }
+            fn deserialize_tuple<V>(self, len: usize, visitor: V) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.deserialize_tuple(len, $wrapper(visitor))
+            }
+            fn deserialize_tuple_struct<V>(
+                self,
+                name: &'static str,
+                len: usize,
+                visitor: V,
+            ) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0
+                    .deserialize_tuple_struct(name, len, $wrapper(visitor))
+            }
+            fn deserialize_struct<V>(
+                self,
+                name: &'static str,
+                fields: &'static [&'static str],
+                visitor: V,
+            ) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.deserialize_struct(name, fields, $wrapper(visitor))
+            }
+            fn deserialize_enum<V>(
+                self,
+                name: &'static str,
+                variants: &'static [&'static str],
+                visitor: V,
+            ) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.deserialize_enum(name, variants, $wrapper(visitor))
+            }
+
+            fn is_human_readable(&self) -> bool {
+                $is_human_readable
+            }
+        }
+
+        impl<'de, D> Visitor<'de> for $wrapper<D>
+        where
+            D: Visitor<'de>,
+        {
+            type Value = D::Value;
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                self.0.expecting(formatter)
+            }
+            fn visit_bool<E>(self, v: bool) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_bool(v)
+            }
+            fn visit_i8<E>(self, v: i8) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_i8(v)
+            }
+            fn visit_i16<E>(self, v: i16) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_i16(v)
+            }
+            fn visit_i32<E>(self, v: i32) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_i32(v)
+            }
+            fn visit_i64<E>(self, v: i64) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_i64(v)
+            }
+            fn visit_u8<E>(self, v: u8) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_u8(v)
+            }
+            fn visit_u16<E>(self, v: u16) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_u16(v)
+            }
+            fn visit_u32<E>(self, v: u32) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_u32(v)
+            }
+            fn visit_u64<E>(self, v: u64) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_u64(v)
+            }
+            fn visit_f32<E>(self, v: f32) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_f32(v)
+            }
+            fn visit_f64<E>(self, v: f64) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_f64(v)
+            }
+            fn visit_char<E>(self, v: char) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_char(v)
+            }
+            fn visit_str<E>(self, v: &str) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_str(v)
+            }
+            fn visit_borrowed_str<E>(self, v: &'de str) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_borrowed_str(v)
+            }
+            fn visit_string<E>(self, v: String) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_string(v)
+            }
+            fn visit_bytes<E>(self, v: &[u8]) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_bytes(v)
+            }
+            fn visit_borrowed_bytes<E>(self, v: &'de [u8]) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_borrowed_bytes(v)
+            }
+            fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_byte_buf(v)
+            }
+            fn visit_none<E>(self) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_none()
+            }
+            fn visit_some<D2>(self, deserializer: D2) -> Result<Self::Value, D2::Error>
+            where
+                D2: Deserializer<'de>,
+            {
+                self.0.visit_some($wrapper(deserializer))
+            }
+            fn visit_unit<E>(self) -> Result<D::Value, E>
+            where
+                E: Error,
+            {
+                self.0.visit_unit()
+            }
+            fn visit_newtype_struct<D2>(self, deserializer: D2) -> Result<Self::Value, D2::Error>
+            where
+                D2: Deserializer<'de>,
+            {
+                self.0.visit_newtype_struct($wrapper(deserializer))
+            }
+            fn visit_seq<V>(self, seq: V) -> Result<D::Value, V::Error>
+            where
+                V: SeqAccess<'de>,
+            {
+                self.0.visit_seq($wrapper(seq))
+            }
+            fn visit_map<V>(self, map: V) -> Result<D::Value, V::Error>
+            where
+                V: MapAccess<'de>,
+            {
+                self.0.visit_map($wrapper(map))
+            }
+            fn visit_enum<V>(self, data: V) -> Result<D::Value, V::Error>
+            where
+                V: EnumAccess<'de>,
+            {
+                self.0.visit_enum($wrapper(data))
+            }
+        }
+
+        impl<'de, D> SeqAccess<'de> for $wrapper<D>
+        where
+            D: SeqAccess<'de>,
+        {
+            type Error = D::Error;
+            fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, D::Error>
+            where
+                T: DeserializeSeed<'de>,
+            {
+                self.0.next_element_seed($wrapper(seed))
+            }
+            fn size_hint(&self) -> Option<usize> {
+                self.0.size_hint()
+            }
+        }
+
+        impl<'de, D> MapAccess<'de> for $wrapper<D>
+        where
+            D: MapAccess<'de>,
+        {
+            type Error = D::Error;
+            fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, D::Error>
+            where
+                K: DeserializeSeed<'de>,
+            {
+                self.0.next_key_seed($wrapper(seed))
+            }
+            fn next_value_seed<V>(&mut self, seed: V) -> Result<V::Value, D::Error>
+            where
+                V: DeserializeSeed<'de>,
+            {
+                self.0.next_value_seed($wrapper(seed))
+            }
+            fn size_hint(&self) -> Option<usize> {
+                self.0.size_hint()
+            }
+        }
+
+        impl<'de, D> EnumAccess<'de> for $wrapper<D>
+        where
+            D: EnumAccess<'de>,
+        {
+            type Error = D::Error;
+            type Variant = $wrapper<D::Variant>;
+            fn variant_seed<V>(self, seed: V) -> Result<(V::Value, Self::Variant), Self::Error>
+            where
+                V: DeserializeSeed<'de>,
+            {
+                self.0
+                    .variant_seed($wrapper(seed))
+                    .map(|(value, variant)| (value, $wrapper(variant)))
+            }
+        }
+
+        impl<'de, D> VariantAccess<'de> for $wrapper<D>
+        where
+            D: VariantAccess<'de>,
+        {
+            type Error = D::Error;
+            fn unit_variant(self) -> Result<(), D::Error> {
+                self.0.unit_variant()
+            }
+            fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value, D::Error>
+            where
+                T: DeserializeSeed<'de>,
+            {
+                self.0.newtype_variant_seed($wrapper(seed))
+            }
+            fn tuple_variant<V>(self, len: usize, visitor: V) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.tuple_variant(len, $wrapper(visitor))
+            }
+            fn struct_variant<V>(
+                self,
+                fields: &'static [&'static str],
+                visitor: V,
+            ) -> Result<V::Value, D::Error>
+            where
+                V: Visitor<'de>,
+            {
+                self.0.struct_variant(fields, $wrapper(visitor))
+            }
+        }
+    };
+}
+
+impl_deserializer!(Readable, true);
+impl_deserializer!(Compact, false);

serde_test/src/error.rs

@@ -1,48 +1,43 @@
 use std::error;
 use std::fmt::{self, Display};
 
-use serde::{ser, de};
+use serde::{de, ser};
 
-use token::Token;
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum Error {
-    Message(String),
-    InvalidName(&'static str),
-    UnexpectedToken(Token<'static>),
-    EndOfTokens,
+#[derive(Clone, Debug)]
+pub struct Error {
+    msg: String,
 }
 
 impl ser::Error for Error {
-    fn custom<T: Display>(msg: T) -> Error {
-        Error::Message(msg.to_string())
+    fn custom<T: Display>(msg: T) -> Self {
+        Error {
+            msg: msg.to_string(),
+        }
     }
 }
 
 impl de::Error for Error {
-    fn custom<T: Display>(msg: T) -> Error {
-        Error::Message(msg.to_string())
+    fn custom<T: Display>(msg: T) -> Self {
+        Error {
+            msg: msg.to_string(),
+        }
     }
 }
 
 impl fmt::Display for Error {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Error::Message(ref msg) => formatter.write_str(msg),
-            Error::InvalidName(name) => write!(formatter, "invalid name `{}`", name),
-            Error::UnexpectedToken(_) => formatter.write_str("unexpected token"),
-            Error::EndOfTokens => formatter.write_str("end of tokens"),
-        }
+        formatter.write_str(&self.msg)
     }
 }
 
 impl error::Error for Error {
     fn description(&self) -> &str {
-        match *self {
-            Error::Message(ref msg) => msg,
-            Error::InvalidName(_) => "invalid name",
-            Error::UnexpectedToken(_) => "unexpected token",
-            Error::EndOfTokens => "end of tokens",
-        }
+        &self.msg
+    }
+}
+
+impl PartialEq<str> for Error {
+    fn eq(&self, other: &str) -> bool {
+        self.msg == other
     }
 }

serde_test/src/lib.rs

@@ -1,22 +1,186 @@
+//! This crate provides a convenient concise way to write unit tests for
+//! implementations of [`Serialize`] and [`Deserialize`].
+//!
+//! [`Serialize`]: https://docs.serde.rs/serde/ser/trait.Serialize.html
+//! [`Deserialize`]: https://docs.serde.rs/serde/de/trait.Deserialize.html
+//!
+//! The `Serialize` impl for a value can be characterized by the sequence of
+//! [`Serializer`] calls that are made in the course of serializing the value,
+//! so `serde_test` provides a [`Token`] abstraction which corresponds roughly
+//! to `Serializer` method calls. There is an [`assert_ser_tokens`] function to
+//! test that a value serializes to a particular sequence of method calls, an
+//! [`assert_de_tokens`] function to test that a value can be deserialized from
+//! a particular sequence of method calls, and an [`assert_tokens`] function to
+//! test both directions. There are also functions to test expected failure
+//! conditions.
+//!
+//! [`Serializer`]: https://docs.serde.rs/serde/ser/trait.Serializer.html
+//! [`Token`]: https://docs.serde.rs/serde_test/enum.Token.html
+//! [`assert_ser_tokens`]: https://docs.serde.rs/serde_test/fn.assert_ser_tokens.html
+//! [`assert_de_tokens`]: https://docs.serde.rs/serde_test/fn.assert_de_tokens.html
+//! [`assert_tokens`]: https://docs.serde.rs/serde_test/fn.assert_tokens.html
+//!
+//! Here is an example from the [`linked-hash-map`] crate.
+//!
+//! [`linked-hash-map`]: https://github.com/contain-rs/linked-hash-map
+//!
+//! ```edition2018
+//! # const IGNORE: &str = stringify! {
+//! use linked_hash_map::LinkedHashMap;
+//! # };
+//! use serde_test::{Token, assert_tokens};
+//!
+//! # use std::fmt;
+//! # use std::marker::PhantomData;
+//! #
+//! # use serde::ser::{Serialize, Serializer, SerializeMap};
+//! # use serde::de::{Deserialize, Deserializer, Visitor, MapAccess};
+//! #
+//! # // Dumb imitation of LinkedHashMap.
+//! # #[derive(PartialEq, Debug)]
+//! # struct LinkedHashMap<K, V>(Vec<(K, V)>);
+//! #
+//! # impl<K, V> LinkedHashMap<K, V> {
+//! #     fn new() -> Self {
+//! #         LinkedHashMap(Vec::new())
+//! #     }
+//! #
+//! #     fn insert(&mut self, k: K, v: V) {
+//! #         self.0.push((k, v));
+//! #     }
+//! # }
+//! #
+//! # impl<K, V> Serialize for LinkedHashMap<K, V>
+//! # where
+//! #     K: Serialize,
+//! #     V: Serialize,
+//! # {
+//! #     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+//! #     where
+//! #         S: Serializer,
+//! #     {
+//! #         let mut map = serializer.serialize_map(Some(self.0.len()))?;
+//! #         for &(ref k, ref v) in &self.0 {
+//! #             map.serialize_entry(k, v)?;
+//! #         }
+//! #         map.end()
+//! #     }
+//! # }
+//! #
+//! # struct LinkedHashMapVisitor<K, V>(PhantomData<(K, V)>);
+//! #
+//! # impl<'de, K, V> Visitor<'de> for LinkedHashMapVisitor<K, V>
+//! # where
+//! #     K: Deserialize<'de>,
+//! #     V: Deserialize<'de>,
+//! # {
+//! #     type Value = LinkedHashMap<K, V>;
+//! #
+//! #     fn expecting(&self, _: &mut fmt::Formatter) -> fmt::Result {
+//! #         unimplemented!()
+//! #     }
+//! #
+//! #     fn visit_map<M>(self, mut access: M) -> Result<Self::Value, M::Error>
+//! #     where
+//! #         M: MapAccess<'de>,
+//! #     {
+//! #         let mut map = LinkedHashMap::new();
+//! #         while let Some((key, value)) = access.next_entry()? {
+//! #             map.insert(key, value);
+//! #         }
+//! #         Ok(map)
+//! #     }
+//! # }
+//! #
+//! # impl<'de, K, V> Deserialize<'de> for LinkedHashMap<K, V>
+//! # where
+//! #     K: Deserialize<'de>,
+//! #     V: Deserialize<'de>,
+//! # {
+//! #     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+//! #     where
+//! #         D: Deserializer<'de>,
+//! #     {
+//! #         deserializer.deserialize_map(LinkedHashMapVisitor(PhantomData))
+//! #     }
+//! # }
+//! #
+//! #[test]
+//! # fn not_a_test_ser_de_empty() {}
+//! fn test_ser_de_empty() {
+//!     let map = LinkedHashMap::<char, u32>::new();
+//!
+//!     assert_tokens(&map, &[
+//!         Token::Map { len: Some(0) },
+//!         Token::MapEnd,
+//!     ]);
+//! }
+//!
+//! #[test]
+//! # fn not_a_test_ser_de() {}
+//! fn test_ser_de() {
+//!     let mut map = LinkedHashMap::new();
+//!     map.insert('b', 20);
+//!     map.insert('a', 10);
+//!     map.insert('c', 30);
+//!
+//!     assert_tokens(&map, &[
+//!         Token::Map { len: Some(3) },
+//!         Token::Char('b'),
+//!         Token::I32(20),
+//!
+//!         Token::Char('a'),
+//!         Token::I32(10),
+//!
+//!         Token::Char('c'),
+//!         Token::I32(30),
+//!         Token::MapEnd,
+//!     ]);
+//! }
+//! #
+//! # fn main() {
+//! #     test_ser_de_empty();
+//! #     test_ser_de();
+//! # }
+//! ```
+
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.88")]
+#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
+#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
+// Ignored clippy lints
+#![cfg_attr(feature = "cargo-clippy", allow(float_cmp))]
+// Ignored clippy_pedantic lints
+#![cfg_attr(
+    feature = "cargo-clippy",
+    allow(
+        empty_line_after_outer_attr,
+        missing_docs_in_private_items,
+        module_name_repetitions,
+        redundant_field_names,
+        use_debug,
+        use_self
+    )
+)]
+
+#[macro_use]
 extern crate serde;
 
-mod assert;
-pub use assert::{
-    assert_tokens,
-    assert_ser_tokens,
-    assert_ser_tokens_error,
-    assert_de_tokens,
-    assert_de_tokens_error,
-};
-
-mod ser;
-pub use ser::Serializer;
-
 mod de;
-pub use de::Deserializer;
+mod error;
+mod ser;
 
+mod assert;
+mod configure;
 mod token;
+
+pub use assert::{
+    assert_de_tokens, assert_de_tokens_error, assert_ser_tokens, assert_ser_tokens_error,
+    assert_tokens,
+};
 pub use token::Token;
 
-mod error;
-pub use error::Error;
+pub use configure::{Compact, Configure, Readable};
+
+// Not public API.
+#[doc(hidden)]
+pub use de::Deserializer;

serde_test/src/ser.rs

@@ -1,346 +1,464 @@
-use std::marker::PhantomData;
-
 use serde::{ser, Serialize};
 
 use error::Error;
 use token::Token;
 
-pub struct Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
-    tokens: I,
-    phantom: PhantomData<&'a Token<'a>>,
+/// A `Serializer` that ensures that a value serializes to a given list of
+/// tokens.
+#[derive(Debug)]
+pub struct Serializer<'a> {
+    tokens: &'a [Token],
 }
 
-impl<'a, I> Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
-    pub fn new(tokens: I) -> Serializer<'a, I> {
-        Serializer {
-            tokens: tokens,
-            phantom: PhantomData,
+impl<'a> Serializer<'a> {
+    /// Creates the serializer.
+    pub fn new(tokens: &'a [Token]) -> Self {
+        Serializer { tokens: tokens }
+    }
+
+    /// Pulls the next token off of the serializer, ignoring it.
+    fn next_token(&mut self) -> Option<Token> {
+        if let Some((&first, rest)) = self.tokens.split_first() {
+            self.tokens = rest;
+            Some(first)
+        } else {
+            None
         }
     }
 
-    pub fn next_token(&mut self) -> Option<&'a Token<'a>> {
-        self.tokens.next()
+    pub fn remaining(&self) -> usize {
+        self.tokens.len()
     }
 }
 
-impl<'s, 'a, I> ser::Serializer for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+macro_rules! assert_next_token {
+    ($ser:expr, $expected:ident) => {
+        assert_next_token!($ser, stringify!($expected), Token::$expected, true);
+    };
+    ($ser:expr, $expected:ident($v:expr)) => {
+        assert_next_token!(
+            $ser,
+            format_args!(concat!(stringify!($expected), "({:?})"), $v),
+            Token::$expected(v),
+            v == $v
+        );
+    };
+    ($ser:expr, $expected:ident { $($k:ident),* }) => {
+        let compare = ($($k,)*);
+        let field_format = || {
+            use std::fmt::Write;
+            let mut buffer = String::new();
+            $(
+                write!(&mut buffer, concat!(stringify!($k), ": {:?}, "), $k).unwrap();
+            )*
+            buffer
+        };
+        assert_next_token!(
+            $ser,
+            format_args!(concat!(stringify!($expected), " {{ {}}}"), field_format()),
+            Token::$expected { $($k),* },
+            ($($k,)*) == compare
+        );
+    };
+    ($ser:expr, $expected:expr, $pat:pat, $guard:expr) => {
+        match $ser.next_token() {
+            Some($pat) if $guard => {}
+            Some(other) => {
+                panic!("expected Token::{} but serialized as {}",
+                       $expected, other);
+            }
+            None => {
+                panic!("expected Token::{} after end of serialized tokens",
+                       $expected);
+            }
+        }
+    };
+}
+
+impl<'s, 'a> ser::Serializer for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     type SerializeSeq = Self;
     type SerializeTuple = Self;
     type SerializeTupleStruct = Self;
-    type SerializeTupleVariant = Self;
+    type SerializeTupleVariant = Variant<'s, 'a>;
     type SerializeMap = Self;
     type SerializeStruct = Self;
-    type SerializeStructVariant = Self;
+    type SerializeStructVariant = Variant<'s, 'a>;
 
     fn serialize_bool(self, v: bool) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Bool(v)));
+        assert_next_token!(self, Bool(v));
         Ok(())
     }
 
     fn serialize_i8(self, v: i8) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I8(v)));
+        assert_next_token!(self, I8(v));
         Ok(())
     }
 
     fn serialize_i16(self, v: i16) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I16(v)));
+        assert_next_token!(self, I16(v));
         Ok(())
     }
 
     fn serialize_i32(self, v: i32) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I32(v)));
+        assert_next_token!(self, I32(v));
         Ok(())
     }
 
     fn serialize_i64(self, v: i64) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::I64(v)));
+        assert_next_token!(self, I64(v));
         Ok(())
     }
 
     fn serialize_u8(self, v: u8) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U8(v)));
+        assert_next_token!(self, U8(v));
         Ok(())
     }
 
     fn serialize_u16(self, v: u16) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U16(v)));
+        assert_next_token!(self, U16(v));
         Ok(())
     }
 
     fn serialize_u32(self, v: u32) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U32(v)));
+        assert_next_token!(self, U32(v));
         Ok(())
     }
 
     fn serialize_u64(self, v: u64) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::U64(v)));
+        assert_next_token!(self, U64(v));
         Ok(())
     }
 
     fn serialize_f32(self, v: f32) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::F32(v)));
+        assert_next_token!(self, F32(v));
         Ok(())
     }
 
     fn serialize_f64(self, v: f64) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::F64(v)));
+        assert_next_token!(self, F64(v));
         Ok(())
     }
 
     fn serialize_char(self, v: char) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Char(v)));
+        assert_next_token!(self, Char(v));
         Ok(())
     }
 
     fn serialize_str(self, v: &str) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Str(v)));
+        match self.tokens.first() {
+            Some(&Token::BorrowedStr(_)) => assert_next_token!(self, BorrowedStr(v)),
+            Some(&Token::String(_)) => assert_next_token!(self, String(v)),
+            _ => assert_next_token!(self, Str(v)),
+        }
         Ok(())
     }
 
-    fn serialize_bytes(self, value: &[u8]) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Bytes(value)));
+    fn serialize_bytes(self, v: &[u8]) -> Result<(), Self::Error> {
+        match self.tokens.first() {
+            Some(&Token::BorrowedBytes(_)) => assert_next_token!(self, BorrowedBytes(v)),
+            Some(&Token::ByteBuf(_)) => assert_next_token!(self, ByteBuf(v)),
+            _ => assert_next_token!(self, Bytes(v)),
+        }
         Ok(())
     }
 
     fn serialize_unit(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Unit));
+        assert_next_token!(self, Unit);
         Ok(())
     }
 
-    fn serialize_unit_struct(self, name: &str) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::UnitStruct(name)));
+    fn serialize_unit_struct(self, name: &'static str) -> Result<(), Error> {
+        assert_next_token!(self, UnitStruct { name });
         Ok(())
     }
 
-    fn serialize_unit_variant(self,
-                              name: &str,
-                              _variant_index: usize,
-                              variant: &str) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumUnit(name, variant)));
+    fn serialize_unit_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+    ) -> Result<(), Error> {
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+            assert_next_token!(self, Unit);
+        } else {
+            assert_next_token!(self, UnitVariant { name, variant });
+        }
         Ok(())
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(self,
-                                           name: &'static str,
-                                           value: &T) -> Result<(), Error>
-        where T: Serialize,
+    fn serialize_newtype_struct<T: ?Sized>(self, name: &'static str, value: &T) -> Result<(), Error>
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::StructNewType(name)));
+        assert_next_token!(self, NewtypeStruct { name });
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(self,
-                                            name: &str,
-                                            _variant_index: usize,
-                                            variant: &str,
-                                            value: &T) -> Result<(), Error>
-        where T: Serialize,
+    fn serialize_newtype_variant<T: ?Sized>(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        value: &T,
+    ) -> Result<(), Error>
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumNewType(name, variant)));
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+        } else {
+            assert_next_token!(self, NewtypeVariant { name, variant });
+        }
         value.serialize(self)
     }
 
     fn serialize_none(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::Option(false)));
+        assert_next_token!(self, None);
         Ok(())
     }
 
     fn serialize_some<T: ?Sized>(self, value: &T) -> Result<(), Error>
-        where T: Serialize,
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::Option(true)));
+        assert_next_token!(self, Some);
         value.serialize(self)
     }
 
     fn serialize_seq(self, len: Option<usize>) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::SeqStart(len)));
-        Ok(self)
-    }
-
-    fn serialize_seq_fixed_size(self, len: usize) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::SeqArrayStart(len)));
+        assert_next_token!(self, Seq { len });
         Ok(self)
     }
 
     fn serialize_tuple(self, len: usize) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleStart(len)));
+        assert_next_token!(self, Tuple { len });
         Ok(self)
     }
 
     fn serialize_tuple_struct(self, name: &'static str, len: usize) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleStructStart(name, len)));
+        assert_next_token!(self, TupleStruct { name, len });
         Ok(self)
     }
 
-    fn serialize_tuple_variant(self,
-                               name: &str,
-                               _variant_index: usize,
-                               variant: &str,
-                               len: usize) -> Result<Self, Error>
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqStart(name, variant, len)));
-        Ok(self)
+    fn serialize_tuple_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeTupleVariant, Error> {
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+            let len = Some(len);
+            assert_next_token!(self, Seq { len });
+            Ok(Variant {
+                ser: self,
+                end: Token::SeqEnd,
+            })
+        } else {
+            assert_next_token!(self, TupleVariant { name, variant, len });
+            Ok(Variant {
+                ser: self,
+                end: Token::TupleVariantEnd,
+            })
+        }
     }
 
     fn serialize_map(self, len: Option<usize>) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::MapStart(len)));
+        assert_next_token!(self, Map { len });
         Ok(self)
     }
 
-    fn serialize_struct(self, name: &str, len: usize) -> Result<Self, Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::StructStart(name, len)));
+    fn serialize_struct(self, name: &'static str, len: usize) -> Result<Self, Error> {
+        assert_next_token!(self, Struct { name, len });
         Ok(self)
     }
 
-    fn serialize_struct_variant(self,
-                                name: &str,
-                                _variant_index: usize,
-                                variant: &str,
-                                len: usize) -> Result<Self, Error>
-    {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumMapStart(name, variant, len)));
-        Ok(self)
+    fn serialize_struct_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeStructVariant, Error> {
+        if self.tokens.first() == Some(&Token::Enum { name: name }) {
+            self.next_token();
+            assert_next_token!(self, Str(variant));
+            let len = Some(len);
+            assert_next_token!(self, Map { len });
+            Ok(Variant {
+                ser: self,
+                end: Token::MapEnd,
+            })
+        } else {
+            assert_next_token!(self, StructVariant { name, variant, len });
+            Ok(Variant {
+                ser: self,
+                end: Token::StructVariantEnd,
+            })
+        }
+    }
+
+    fn is_human_readable(&self) -> bool {
+        panic!(
+            "Types which have different human-readable and compact representations \
+             must explicitly mark their test cases with `serde_test::Configure`"
+        );
     }
 }
 
-impl<'s, 'a, I> ser::SerializeSeq for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+pub struct Variant<'s, 'a: 's> {
+    ser: &'s mut Serializer<'a>,
+    end: Token,
+}
+
+impl<'s, 'a> ser::SerializeSeq for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::SeqSep));
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::SeqEnd));
+        assert_next_token!(self, SeqEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeTuple for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeTuple for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleSep));
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleEnd));
+        assert_next_token!(self, TupleEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeTupleStruct for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeTupleStruct for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleStructSep));
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::TupleStructEnd));
+        assert_next_token!(self, TupleStructEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeTupleVariant for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeTupleVariant for Variant<'s, 'a> {
     type Ok = ();
     type Error = Error;
 
     fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
-        where T: Serialize
+    where
+        T: Serialize,
     {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqSep));
-        value.serialize(&mut **self)
+        value.serialize(&mut *self.ser)
     }
 
     fn end(self) -> Result<(), Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumSeqEnd));
+        match self.end {
+            Token::TupleVariantEnd => assert_next_token!(self.ser, TupleVariantEnd),
+            Token::SeqEnd => assert_next_token!(self.ser, SeqEnd),
+            _ => unreachable!(),
+        }
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeMap for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeMap for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error> where T: Serialize {
-        assert_eq!(self.tokens.next(), Some(&Token::MapSep));
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
         key.serialize(&mut **self)
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error> where T: Serialize {
+    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::MapEnd));
+        assert_next_token!(self, MapEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeStruct for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeStruct for &'s mut Serializer<'a> {
     type Ok = ();
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error> where T: Serialize {
-        assert_eq!(self.tokens.next(), Some(&Token::StructSep));
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
         try!(key.serialize(&mut **self));
         value.serialize(&mut **self)
     }
 
     fn end(self) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::StructEnd));
+        assert_next_token!(self, StructEnd);
         Ok(())
     }
 }
 
-impl<'s, 'a, I> ser::SerializeStructVariant for &'s mut Serializer<'a, I>
-    where I: Iterator<Item=&'a Token<'a>>,
-{
+impl<'s, 'a> ser::SerializeStructVariant for Variant<'s, 'a> {
     type Ok = ();
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error> where T: Serialize {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumMapSep));
-        try!(key.serialize(&mut **self));
-        value.serialize(&mut **self)
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        try!(key.serialize(&mut *self.ser));
+        value.serialize(&mut *self.ser)
     }
 
     fn end(self) -> Result<(), Self::Error> {
-        assert_eq!(self.tokens.next(), Some(&Token::EnumMapEnd));
+        match self.end {
+            Token::StructVariantEnd => assert_next_token!(self.ser, StructVariantEnd),
+            Token::MapEnd => assert_next_token!(self.ser, MapEnd),
+            _ => unreachable!(),
+        }
         Ok(())
     }
 }

serde_test/src/token.rs

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

test_suite/Cargo.toml

@@ -1,32 +1,20 @@
 [package]
 name = "serde_test_suite"
 version = "0.0.0"
-authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
-license = "MIT/Apache-2.0"
-description = "A generic serialization/deserialization framework"
-homepage = "https://serde.rs"
-repository = "https://github.com/serde-rs/serde"
-documentation = "https://docs.serde.rs/serde/"
-readme = "README.md"
-keywords = ["serialization"]
+authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
+edition = "2018"
 publish = false
 
 [features]
-unstable-testing = [
-    "compiletest_rs",
-    "serde/unstable-testing",
-]
+unstable = ["serde/unstable"]
+compiletest = ["compiletest_rs"]
 
 [dev-dependencies]
 fnv = "1.0"
 rustc-serialize = "0.3.16"
-serde = { path = "../serde" }
-serde_derive = { path = "../serde_derive" }
+serde = { path = "../serde", features = ["rc", "derive"] }
+serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
 serde_test = { path = "../serde_test" }
 
 [dependencies]
-compiletest_rs = { version = "0.2", optional = true }
-
-[[test]]
-name = "test"
-path = "tests/test.rs"
+compiletest_rs = { version = "0.3", optional = true, features = ["stable"] }

test_suite/deps/src/lib.rs

@@ -0,0 +1,3 @@
+#![feature(/*=============================================]
+#![===  Serde test suite requires a nightly compiler.  ===]
+#![====================================================*/)]

test_suite/no_std/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 name = "serde_derive_tests_no_std"
 version = "0.0.0"
+edition = "2018"
 publish = false
 
 [dependencies]
-serde = { path = "../../serde", default-features = false }
-serde_derive = { path = "../../serde_derive" }
+libc = { version = "0.2", default-features = false }
+serde = { path = "../../serde", default-features = false, features = ["derive"] }
+
+[workspace]

test_suite/no_std/src/main.rs

@@ -1,8 +1,6 @@
-#![feature(lang_items, start, libc)]
+#![feature(lang_items, start)]
 #![no_std]
 
-extern crate libc;
-
 #[start]
 fn start(_argc: isize, _argv: *const *const u8) -> isize {
     0
@@ -10,26 +8,18 @@ fn start(_argc: isize, _argv: *const *const u8) -> isize {
 
 #[lang = "eh_personality"]
 #[no_mangle]
-pub extern fn rust_eh_personality() {}
+pub extern "C" fn rust_eh_personality() {}
 
-#[lang = "eh_unwind_resume"]
-#[no_mangle]
-pub extern fn rust_eh_unwind_resume() {}
-
-#[lang = "panic_fmt"]
-#[no_mangle]
-pub extern fn rust_begin_panic(_msg: core::fmt::Arguments,
-                               _file: &'static str,
-                               _line: u32) -> ! {
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
     unsafe {
-        libc::abort()
+        libc::abort();
     }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-#[macro_use]
-extern crate serde_derive;
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize)]
 struct Unit;
@@ -41,7 +31,9 @@ struct Newtype(u8);
 struct Tuple(u8, u8);
 
 #[derive(Serialize, Deserialize)]
-struct Struct { f: u8 }
+struct Struct {
+    f: u8,
+}
 
 #[derive(Serialize, Deserialize)]
 enum Enum {

test_suite/tests/bytes/mod.rs

@@ -0,0 +1,58 @@
+use serde::de::{Deserializer, Error, SeqAccess, Visitor};
+use std::fmt;
+
+pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    deserializer.deserialize_byte_buf(ByteBufVisitor)
+}
+
+struct ByteBufVisitor;
+
+impl<'de> Visitor<'de> for ByteBufVisitor {
+    type Value = Vec<u8>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("byte array")
+    }
+
+    fn visit_seq<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
+    where
+        V: SeqAccess<'de>,
+    {
+        let mut values = Vec::new();
+        while let Some(value) = visitor.next_element()? {
+            values.push(value);
+        }
+        Ok(values)
+    }
+
+    fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(v.to_vec())
+    }
+
+    fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(v)
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(v.as_bytes().to_vec())
+    }
+
+    fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(v.into_bytes())
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

test_suite/tests/compile-fail/str_ref_deser.rs

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

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

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

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

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

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

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

test_suite/tests/compiletest.rs

@@ -1,26 +1,20 @@
-extern crate compiletest_rs as compiletest;
+#![cfg(feature = "compiletest")]
 
-use std::env;
-
-fn run_mode(mode: &'static str) {
-    let mut config = compiletest::default_config();
-
-    config.mode = mode.parse().expect("invalid mode");
-    config.target_rustcflags = Some("-L deps/target/debug/deps".to_owned());
-    if let Ok(name) = env::var("TESTNAME") {
-        config.filter = Some(name);
-    }
-    config.src_base = format!("tests/{}", mode).into();
-
-    compiletest::run_tests(&config);
-}
+use compiletest_rs as compiletest;
 
 #[test]
-fn compile_fail() {
-    run_mode("compile-fail");
-}
-
-#[test]
-fn run_pass() {
-    run_mode("run-pass");
+fn ui() {
+    compiletest::run_tests(&compiletest::Config {
+        mode: compiletest::common::Mode::Ui,
+        src_base: std::path::PathBuf::from("tests/ui"),
+        target_rustcflags: Some(String::from(
+            "\
+             --edition=2018 \
+             -L deps/target/debug/deps \
+             -Z unstable-options \
+             --extern serde_derive \
+             ",
+        )),
+        ..Default::default()
+    });
 }

test_suite/tests/macros/mod.rs

@@ -65,3 +65,29 @@ macro_rules! hashmap {
         }
     }
 }
+
+macro_rules! seq_impl {
+    (seq $first:expr,) => {
+        seq_impl!(seq $first)
+    };
+    ($first:expr,) => {
+        seq_impl!($first)
+    };
+    (seq $first:expr) => {
+        $first.into_iter()
+    };
+    ($first:expr) => {
+        Some($first).into_iter()
+    };
+    (seq $first:expr , $( $elem: tt)*) => {
+        $first.into_iter().chain(seq!( $($elem)* ))
+    };
+    ($first:expr , $($elem: tt)*) => {
+        Some($first).into_iter().chain(seq!( $($elem)* ))
+    }
+}
+macro_rules! seq {
+    ($($tt: tt)*) => {
+        seq_impl!($($tt)*).collect::<Vec<_>>()
+    };
+}