Update serde to 0.9 (fixes #15325)

1 files changed, 21 insertions, 4 deletions

diff --git a/components/url/lib.rs b/components/url/lib.rs
index d9f69497aba..85933a509c7 100644
--- a/components/url/lib.rs
+++ b/components/url/lib.rs
@@ -7,11 +7,10 @@
 #![crate_name = "servo_url"]
 #![crate_type = "rlib"]
 
-#![cfg_attr(feature = "servo", feature(plugin))]
-
-#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
 #[cfg(feature = "servo")] extern crate heapsize;
 #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
+#[cfg(feature = "servo")] extern crate serde;
+#[cfg(feature = "servo")] extern crate url_serde;
 
 extern crate url;
 
@@ -23,7 +22,7 @@ use std::sync::Arc;
 use url::{Url, Origin, Position};
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[cfg_attr(feature = "servo", derive(HeapSizeOf, Serialize, Deserialize))]
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
 pub struct ServoUrl(Arc<Url>);
 
 impl ServoUrl {
@@ -196,3 +195,21 @@ impl From<Url> for ServoUrl {
         ServoUrl::from_url(url)
     }
 }
+
+#[cfg(feature = "servo")]
+impl serde::Serialize for ServoUrl {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where S: serde::Serializer,
+    {
+        url_serde::serialize(&*self.0, serializer)
+    }
+}
+
+#[cfg(feature = "servo")]
+impl serde::Deserialize for ServoUrl {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where D: serde::Deserializer,
+    {
+        url_serde::deserialize(deserializer).map(Self::from_url)
+    }
+}