From 8b7b886036c5a58aa9b30e777612ef0f1c4f6d7a Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 28 Sep 2016 11:19:27 -0700
Subject: [PATCH] Test serde_derive instead of serde_macros

---
 .travis.yml                               |  2 +-
 examples/serde-syntex-example/Cargo.toml  |  4 ++--
 examples/serde-syntex-example/build.rs    |  4 ++--
 examples/serde-syntex-example/src/main.rs | 11 +++++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1140ebdc..825b6a07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ script:
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
 - (cd testing && travis-cargo --skip nightly test)
 - (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
-- (cd serde_macros && travis-cargo --only nightly test -- --features unstable-testing)
+- (cd serde_derive && travis-cargo --only nightly test)
 - (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
 - (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
 - (cd serde && travis-cargo --only stable doc)
diff --git a/examples/serde-syntex-example/Cargo.toml b/examples/serde-syntex-example/Cargo.toml
index 97de0a37..9a150821 100644
--- a/examples/serde-syntex-example/Cargo.toml
+++ b/examples/serde-syntex-example/Cargo.toml
@@ -6,12 +6,12 @@ build = "build.rs"
 
 [features]
 default = ["serde_codegen"]
-unstable = ["serde_macros"]
+unstable = ["serde_derive"]
 
 [build-dependencies]
 serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" }
 
 [dependencies]
 serde = "^0.8"
+serde_derive = { version = "^0.8", optional = true, path = "../../serde_derive" }
 serde_json = "^0.8"
-serde_macros = { version = "^0.8", optional = true, path = "../../serde_macros" }
diff --git a/examples/serde-syntex-example/build.rs b/examples/serde-syntex-example/build.rs
index 48728b8b..c775d665 100644
--- a/examples/serde-syntex-example/build.rs
+++ b/examples/serde-syntex-example/build.rs
@@ -1,4 +1,4 @@
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 mod inner {
     extern crate serde_codegen;
 
@@ -15,7 +15,7 @@ mod inner {
     }
 }
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 mod inner {
     pub fn main() {}
 }
diff --git a/examples/serde-syntex-example/src/main.rs b/examples/serde-syntex-example/src/main.rs
index 0a8804ab..46e7d1dc 100644
--- a/examples/serde-syntex-example/src/main.rs
+++ b/examples/serde-syntex-example/src/main.rs
@@ -1,11 +1,14 @@
-#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))]
-#![cfg_attr(feature = "serde_macros", plugin(serde_macros))]
+#![cfg_attr(feature = "serde_derive", feature(rustc_macro))]
+
+#[cfg(feature = "serde_derive")]
+#[macro_use]
+extern crate serde_derive;
 
 extern crate serde;
 extern crate serde_json;
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 include!("main.rs.in");
 
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 include!(concat!(env!("OUT_DIR"), "/main.rs"));