Merge #7

7: serde-1.0 r=cuviper a=termoshtt

serde-1.0 should be the default serialization option since rustc-serialize is already obsolete.

Note: This is a breaking change. We need to bump up the version to 0.2.

Author: bors[bot]

Cargo.toml

@@ -19,14 +19,10 @@ version = "0.2.1"
 default-features = false
 features = ["std"]
 
-[dependencies.rustc-serialize]
-optional = true
-version = "0.3.19"
-
 [dependencies.serde]
 optional = true
-version = ">= 0.7.0, < 0.9.0"
+version = "1.0"
 
 [features]
-default = ["rustc-serialize"]
+default = []
 unstable = []

ci/test_full.sh

@@ -13,11 +13,7 @@ cargo build --no-default-features
 cargo test --no-default-features
 
 # Each isolated feature should also work everywhere.
-for feature in rustc-serialize serde; do
+for feature in serde; do
   cargo build --verbose --no-default-features --features="$feature"
   cargo test --verbose --no-default-features --features="$feature"
 done
-
-# Downgrade serde and build test the 0.7.0 channel as well
-cargo update -p serde --precise 0.7.0
-cargo build --verbose --no-default-features --features "serde"

src/lib.rs

@@ -18,9 +18,6 @@
 
 extern crate num_traits as traits;
 
-#[cfg(feature = "rustc-serialize")]
-extern crate rustc_serialize;
-
 #[cfg(feature = "serde")]
 extern crate serde;
 
@@ -62,7 +59,6 @@ use traits::{Zero, One, Num, Inv, Float};
 /// }
 /// ```
 #[derive(PartialEq, Eq, Copy, Clone, Hash, Debug, Default)]
-#[cfg_attr(feature = "rustc-serialize", derive(RustcEncodable, RustcDecodable))]
 #[repr(C)]
 pub struct Complex<T> {
     /// Real portion of the complex number
@@ -1077,19 +1073,19 @@ impl<T: Num + Clone> Num for Complex<T> {
 impl<T> serde::Serialize for Complex<T>
     where T: serde::Serialize
 {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where
         S: serde::Serializer
     {
         (&self.re, &self.im).serialize(serializer)
     }
 }
 
 #[cfg(feature = "serde")]
-impl<T> serde::Deserialize for Complex<T> where
-    T: serde::Deserialize + Num + Clone
+impl<'de, T> serde::Deserialize<'de> for Complex<T> where
+    T: serde::Deserialize<'de> + Num + Clone
 {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error> where
-        D: serde::Deserializer,
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where
+        D: serde::Deserializer<'de>,
     {
         let (re, im) = try!(serde::Deserialize::deserialize(deserializer));
         Ok(Complex::new(re, im))