diff --git a/Cargo.toml b/Cargo.toml
index a80238e..4d3b35b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "euclid"
-version = "0.10.5"
+version = "0.11.0"
 authors = ["The Servo Project Developers"]
 description = "Geometry primitives"
 documentation = "http://doc.servo.org/euclid/"
@@ -15,8 +15,8 @@ heapsize = "0.3"
 rustc-serialize = "0.3.2"
 num-traits = {version = "0.1.32", default-features = false}
 log = "0.3.1"
-serde = "0.8"
+serde = "0.9"
 
 [dev-dependencies]
 rand = "0.3.7"
-serde_test = "0.8"
+serde_test = "0.9"
diff --git a/src/length.rs b/src/length.rs
index e14e710..ece8b67 100644
--- a/src/length.rs
+++ b/src/length.rs
@@ -52,14 +52,14 @@ impl<Unit, T: HeapSizeOf> HeapSizeOf for Length<T, Unit> {
 }
 
 impl<Unit, T> Deserialize for Length<T, Unit> where T: Deserialize {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Length<T, Unit>,D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Length<T, Unit>,D::Error>
                       where D: Deserializer {
         Ok(Length(try!(Deserialize::deserialize(deserializer)), PhantomData))
     }
 }
 
 impl<T, Unit> Serialize for Length<T, Unit> where T: Serialize {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(),S::Error> where S: Serializer {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
         self.0.serialize(serializer)
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 55c9852..ae820c9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -57,7 +57,7 @@
 
 extern crate heapsize;
 
-#[macro_use]
+#[cfg_attr(test, macro_use)]
 extern crate log;
 extern crate rustc_serialize;
 extern crate serde;
diff --git a/src/macros.rs b/src/macros.rs
index 26471a6..2f597cb 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -43,7 +43,7 @@ macro_rules! define_matrix {
         impl<T, $($phantom),+> ::serde::Deserialize for $name<T, $($phantom),+>
             where T: ::serde::Deserialize
         {
-            fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
                 where D: ::serde::Deserializer
             {
                 let ($($field,)+) =
@@ -58,7 +58,7 @@ macro_rules! define_matrix {
         impl<T, $($phantom),+> ::serde::Serialize for $name<T, $($phantom),+>
             where T: ::serde::Serialize
         {
-            fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                 where S: ::serde::Serializer
             {
                 ($(&self.$field,)+).serialize(serializer)
diff --git a/src/rect.rs b/src/rect.rs
index fff6a1f..a705ca2 100644
--- a/src/rect.rs
+++ b/src/rect.rs
@@ -38,7 +38,7 @@ impl<T: HeapSizeOf, U> HeapSizeOf for TypedRect<T, U> {
 }
 
 impl<T: Copy + Deserialize, U> Deserialize for TypedRect<T, U> {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer
     {
         let (origin, size) = try!(Deserialize::deserialize(deserializer));
@@ -47,7 +47,7 @@ impl<T: Copy + Deserialize, U> Deserialize for TypedRect<T, U> {
 }
 
 impl<T: Serialize, U> Serialize for TypedRect<T, U> {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         (&self.origin, &self.size).serialize(serializer)
diff --git a/src/scale_factor.rs b/src/scale_factor.rs
index d41395e..4ecfc4b 100644
--- a/src/scale_factor.rs
+++ b/src/scale_factor.rs
@@ -47,14 +47,14 @@ impl<T: HeapSizeOf, Src, Dst> HeapSizeOf for ScaleFactor<T, Src, Dst> {
 }
 
 impl<T, Src, Dst> Deserialize for ScaleFactor<T, Src, Dst> where T: Deserialize {
-    fn deserialize<D>(deserializer: &mut D) -> Result<ScaleFactor<T, Src, Dst>, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<ScaleFactor<T, Src, Dst>, D::Error>
                       where D: Deserializer {
         Ok(ScaleFactor(try!(Deserialize::deserialize(deserializer)), PhantomData))
     }
 }
 
 impl<T, Src, Dst> Serialize for ScaleFactor<T, Src, Dst> where T: Serialize {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(),S::Error> where S: Serializer {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
         self.0.serialize(serializer)
     }
 }