Fix rustc-serialize support for Dim migration

Author: bluss

src/array_serialize.rs

@@ -11,6 +11,27 @@ use super::arraytraits::ARRAY_FORMAT_VERSION;
 
 use imp_prelude::*;
 
+use Dim;
+use dimension::DimPrivate;
+
+/// **Requires crate feature `"rustc-serialize"`**
+impl<I> Encodable for Dim<I>
+    where I: Encodable,
+{
+    fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> {
+        self.ix().encode(s)
+    }
+}
+
+/// **Requires crate feature `"rustc-serialize"`**
+impl<I> Decodable for Dim<I>
+    where I: Decodable,
+{
+    fn decode<E: Decoder>(d: &mut E) -> Result<Self, E::Error> {
+        I::decode(d).map(Dim::new)
+    }
+}
+
 /// **Requires crate feature `"rustc-serialize"`**
 impl<A, S, D> Encodable for ArrayBase<S, D>
     where A: Encodable,
@@ -43,7 +64,7 @@ impl<A, S, D> Decodable for ArrayBase<S, D>
           D: Dimension + Decodable,
           S: DataOwned<Elem = A>
 {
-    fn decode<E: Decoder>(d: &mut E) -> Result<ArrayBase<S, D>, E::Error> {
+    fn decode<E: Decoder>(d: &mut E) -> Result<Self, E::Error> {
         d.read_struct("Array", 3, |d| {
             let version: u8 = try!(d.read_struct_field("v", 0, Decodable::decode));
             if version > ARRAY_FORMAT_VERSION {

tests/serialize.rs

@@ -19,6 +19,7 @@ use ndarray::{arr0, arr1, arr2, RcArray, RcArray1, RcArray2};
 #[test]
 fn serial_many_dim()
 {
+    /* rustc-serialize does not support serializing [T; 0]
     {
         let a = arr0::<f32>(2.72);
         let serial = json::encode(&a).unwrap();
@@ -27,12 +28,13 @@ fn serial_many_dim()
         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::<RcArray<f32, _>>(&serial);
+        let res = json::decode::<RcArray1<f32>>(&serial);
         println!("{:?}", res);
         assert_eq!(a, res.unwrap());
     }
@@ -41,7 +43,7 @@ fn serial_many_dim()
         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::<RcArray<f32, _>>(&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]}"##;