Merge pull request #14 from arthurprs/master

Update serde

Cargo.toml

@@ -13,23 +13,19 @@ version = "0.5.4"
 
 [build-dependencies.serde_codegen]
 optional = true
-version = "0.7.12"
-
-[build-dependencies.syntex]
-optional = true
-version = "0.33.0"
+version = "0.8"
 
 [dependencies]
 hyper = "0.8.1"
 openssl = "0.7.13"
-serde = "0.7.7"
-serde_json = "0.7.1"
+serde = "0.8"
+serde_json = "0.8"
 url = "0.5.9"
 
-[dependencies.serde_macros]
+[dependencies.serde_derive]
 optional = true
-version = "0.7.7"
+version = "0.8"
 
 [features]
-default = ["serde_codegen", "syntex"]
-nightly = ["serde_macros"]
+default = ["serde_codegen"]
+nightly = ["serde_derive"]

build.rs

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

src/error.rs

@@ -1,7 +1,7 @@
 //! Contains etcd error types.
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 include!("error_gen.rs");
 
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 include!(concat!(env!("OUT_DIR"), "/error.rs"));

src/keys.rs

@@ -1,7 +1,7 @@
 //! Types for the primary key space operations.
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 include!("keys_gen.rs");
 
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 include!(concat!(env!("OUT_DIR"), "/keys.rs"));

src/lib.rs

@@ -55,14 +55,15 @@
 //!     assert_eq!(value, "bar".to_owned());
 //! }
 //! ```
-
-#![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))]
 #![deny(missing_docs)]
 
 extern crate hyper;
 extern crate openssl;
 extern crate serde;
+#[cfg(feature = "serde_derive")]
+#[macro_use]
+extern crate serde_derive;
 extern crate serde_json;
 extern crate url;
 

src/stats.rs

@@ -1,7 +1,7 @@
 //! Types for statistics operations.
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 include!("stats_gen.rs");
 
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 include!(concat!(env!("OUT_DIR"), "/stats.rs"));

src/version.rs

@@ -1,7 +1,7 @@
 //! Types for the version endpoint.
 
-#[cfg(feature = "serde_macros")]
+#[cfg(feature = "serde_derive")]
 include!("version_gen.rs");
 
-#[cfg(not(feature = "serde_macros"))]
+#[cfg(not(feature = "serde_derive"))]
 include!(concat!(env!("OUT_DIR"), "/version.rs"));