Remove use of serde_macros

Author: nox

Cargo.toml

@@ -21,8 +21,7 @@ encoding = "0.2"
 heapsize = {version = ">=0.1.1, <0.4.0", optional = true}
 matches = "0.1"
 serde = {version = ">=0.6.6, <0.8", optional = true}
-serde_macros = {version = ">=0.6.5, <0.8", optional = true}
 
 [features]
-serde-serialization = [ "serde", "serde_macros" ]
+serde-serialization = [ "serde" ]
 heap_size = [ "heapsize" ]

src/color.rs

@@ -6,10 +6,11 @@ use std::fmt;
 
 use super::{Token, Parser, ToCss};
 
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 /// A color with red, green, blue, and alpha components.
 #[derive(Clone, Copy, PartialEq, Debug)]
-#[cfg_attr(feature = "serde-serialization", derive(Deserialize, Serialize))]
 pub struct RGBA {
     /// The red channel. Nominally in 0.0 ... 1.0.
     pub red: f32,
@@ -21,6 +22,31 @@ pub struct RGBA {
     pub alpha: f32,
 }
 
+#[cfg(feature = "serde")]
+impl Serialize for RGBA {
+    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+        where S: Serializer
+    {
+        (self.red, self.green, self.blue, self.alpha).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl Deserialize for RGBA {
+    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+        where D: Deserializer
+    {
+        let (red, green, blue, alpha) =
+            try!(Deserialize::deserialize(deserializer));
+        Ok(RGBA {
+            red: red,
+            green: green,
+            blue: blue,
+            alpha: alpha,
+        })
+    }
+}
+
 #[cfg(feature = "heapsize")]
 known_heap_size!(0, RGBA);
 

src/lib.rs

@@ -6,9 +6,6 @@
 #![crate_type = "rlib"]
 
 #![deny(missing_docs)]
-#![cfg_attr(feature = "serde-serialization", feature(custom_derive))]
-#![cfg_attr(feature = "serde-serialization", feature(plugin))]
-#![cfg_attr(feature = "serde-serialization", plugin(serde_macros))]
 
 /*!
 
@@ -72,7 +69,7 @@ extern crate encoding;
 #[macro_use] extern crate matches;
 #[cfg(test)] extern crate tempdir;
 #[cfg(test)] extern crate rustc_serialize;
-#[cfg(feature = "serde-serialization")] extern crate serde;
+#[cfg(feature = "serde")] extern crate serde;
 #[cfg(feature = "heapsize")] #[macro_use] extern crate heapsize;
 
 pub use tokenizer::{Token, NumericValue, PercentageValue, SourceLocation};