Merge pull request #557 from rust-ndarray/remove-rustc-serialize

Remove rustc-serialize crate feature

Author: bluss

Cargo.toml

@@ -29,7 +29,6 @@ test = true
 [dependencies]
 num-traits = "0.2"
 num-complex = "0.2"
-rustc-serialize = { version = "0.3.20", optional = true }
 itertools = { version = "0.7.0", default-features = false }
 
 # Use via the `blas` crate feature!
@@ -58,7 +57,7 @@ test-blas-openblas-sys = ["blas"]
 test = ["test-blas-openblas-sys"]
 
 # This feature is used for docs
-docs = ["rustc-serialize", "serde-1"]
+docs = ["serde-1"]
 
 [profile.release]
 [profile.bench]

README.rst

@@ -47,11 +47,6 @@ Crate Feature Flags
 The following crate feature flags are available. They are configured in
 your `Cargo.toml`.
 
-- ``rustc-serialize``
-
-  - Optional, compatible with Rust stable
-  - Enables serialization support for rustc-serialize 0.3
-
 - ``serde-1``
 
   - Optional, compatible with Rust stable

serialization-tests/Cargo.toml

@@ -8,14 +8,11 @@ publish = false
 test = false
 
 [dependencies]
-ndarray = { path = "../", features = ["serde-1", "rustc-serialize"] }
+ndarray = { path = "../", features = ["serde-1"] }
 
 [features]
 default = ["ron"]
 
-[dev-dependencies.rustc-serialize]
-version = "0.3.21"
-
 [dev-dependencies.serde]
 version = "1.0"
 

serialization-tests/tests/serialize.rs

@@ -1,5 +1,3 @@
-extern crate rustc_serialize as serialize;
-
 extern crate ndarray;
 
 extern crate serde;
@@ -11,73 +9,9 @@ extern crate rmp_serde;
 #[cfg(feature = "ron")]
 extern crate ron;
 
-use serialize::json;
-
 
 use ndarray::{arr0, arr1, arr2, s, RcArray, RcArray1, RcArray2, ArrayD, IxDyn};
 
-#[test]
-fn serial_many_dim()
-{
-    {
-        let a = arr0::<f32>(2.72);
-        let serial = json::encode(&a).unwrap();
-        println!("Encode {:?} => {:?}", a, serial);
-        let res = json::decode::<RcArray<f32, _>>(&serial);
-        println!("{:?}", res);
-        assert_eq!(a, res.unwrap());
-    }
-
-    {
-        let a = arr1::<f32>(&[2.72, 1., 2.]);
-        let serial = json::encode(&a).unwrap();
-        println!("Encode {:?} => {:?}", a, serial);
-        let res = json::decode::<RcArray1<f32>>(&serial);
-        println!("{:?}", res);
-        assert_eq!(a, res.unwrap());
-    }
-
-    {
-        let a = arr2(&[[3., 1., 2.2], [3.1, 4., 7.]]);
-        let serial = json::encode(&a).unwrap();
-        println!("Encode {:?} => {:?}", a, serial);
-        let res = json::decode::<RcArray2<f32>>(&serial);
-        println!("{:?}", res);
-        assert_eq!(a, res.unwrap());
-        let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"##;
-        let b = json::decode::<RcArray2<f32>>(text);
-        assert_eq!(a, b.unwrap());
-    }
-
-
-    {
-        // Test a sliced array.
-        let mut a = RcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
-        a.slice_collapse(s![..;-1, .., .., ..2]);
-        let serial = json::encode(&a).unwrap();
-        println!("Encode {:?} => {:?}", a, serial);
-        let res = json::decode::<RcArray<f32, _>>(&serial);
-        println!("{:?}", res);
-        assert_eq!(a, res.unwrap());
-    }
-}
-
-#[test]
-fn serial_wrong_count()
-{
-    // one element too few
-    let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4]}"##;
-    let arr = json::decode::<RcArray2<f32>>(text);
-    println!("{:?}", arr);
-    assert!(arr.is_err());
-
-    // future version
-    let text = r##"{"v":200,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"##;
-    let arr = json::decode::<RcArray2<f32>>(text);
-    println!("{:?}", arr);
-    assert!(arr.is_err());
-}
-
 #[test]
 fn serial_many_dim_serde()
 {

src/array_serialize.rs

@@ -208,7 +208,7 @@ unsafe impl<S, D> Send for ArrayBase<S, D>
     where S: Send + Data, D: Send
 { }
 
-#[cfg(any(feature = "rustc-serialize", feature = "serde"))]
+#[cfg(any(feature = "serde"))]
 // Use version number so we can add a packed format later.
 pub const ARRAY_FORMAT_VERSION: u8 = 1u8;
 

src/arraytraits.rs

@@ -65,9 +65,6 @@
 //! The following crate feature flags are available. They are configured in your
 //! `Cargo.toml`.
 //!
-//! - `rustc-serialize`
-//!   - Optional, compatible with Rust stable
-//!   - Enables serialization support for rustc-serialize 0.3
 //! - `serde-1`
 //!   - Optional, compatible with Rust stable
 //!   - Enables serialization support for serde 1.0
@@ -89,8 +86,6 @@
 
 #[cfg(feature = "serde-1")]
 extern crate serde;
-#[cfg(feature = "rustc-serialize")]
-extern crate rustc_serialize as serialize;
 
 #[cfg(feature="blas")]
 extern crate cblas_sys;
@@ -143,8 +138,6 @@ mod aliases;
 mod arraytraits;
 #[cfg(feature = "serde-1")]
 mod array_serde;
-#[cfg(feature = "rustc-serialize")]
-mod array_serialize;
 mod arrayformat;
 mod data_traits;