Switch from serde_macros to serde_derive

Also run `cargo update` to update dependencies and purge unused
dependencies.

Cargo.toml

@@ -12,16 +12,16 @@ exclude = [".travis.yml"]
 
 [features]
 default = ["serde_codegen"]
-unstable = ["serde_macros"]
+unstable = ["serde_derive"]
 
 [dependencies]
 clap = "2.5"
 hyper = "0.9"
 mime = "0.2"
 quick-error = "1.0"
 serde = "0.8"
+serde_derive = { version = "0.8", optional = true }
 serde_json = "0.8"
-serde_macros = { version = "0.8", optional = true }
 serde_yaml = "0.4"
 syndication = "0.3"
 url = { version = "1.2", features = ["serde"] }

build.rs

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

src/main.rs

@@ -6,8 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))]
-#![cfg_attr(feature = "serde_macros", plugin(serde_macros))]
+#![cfg_attr(feature = "serde_derive", feature(proc_macro))]
 
 #![allow(unknown_lints)]
 
@@ -18,13 +17,16 @@ extern crate mime;
 #[macro_use]
 extern crate quick_error;
 extern crate serde;
+#[cfg(feature = "serde_derive")]
+#[macro_use]
+extern crate serde_derive;
 extern crate serde_json;
 extern crate serde_yaml;
 extern crate syndication;
 extern crate url;
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 include!("main.rs.in");
 
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(feature = "serde_codegen")]
 include!(concat!(env!("OUT_DIR"), "/main.rs"));