Deserialize from bytes

Tim DuBois · Tim DuBois · commit 3231b1f8dcf3 · 2017-08-22T17:31:30.000+02:00
diff --git a/serialization-tests/Cargo.toml b/serialization-tests/Cargo.toml
@@ -22,3 +22,5 @@ version = "1.0"
 [dev-dependencies.rmp-serde]
 version = "0.13.1"
 
+[dev-dependencies.ron]
+version = "0.1.1"
diff --git a/serialization-tests/tests/serialize.rs b/serialization-tests/tests/serialize.rs
@@ -8,8 +8,13 @@ extern crate serde_json;
 
 extern crate rmp_serde;
 
+extern crate ron;
+
 use serialize::json;
 
+use ron::ser::to_string as ron_serialize;
+use ron::de::from_str as ron_deserialize;
+
 use ndarray::{arr0, arr1, arr2, RcArray, RcArray1, RcArray2};
 
 #[test]
@@ -188,3 +193,49 @@ fn serial_many_dim_serde_msgpack()
         assert_eq!(a, a_de);
     }
 }
+
+#[test]
+fn serial_many_dim_ron()
+{
+    {
+        let a = arr0::<f32>(2.72);
+
+        let a_s = ron_serialize(&a).unwrap();
+
+        let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
+
+        assert_eq!(a, a_de);
+    }
+
+    {
+        let a = arr1::<f32>(&[2.72, 1., 2.]);
+
+        let a_s = ron_serialize(&a).unwrap();
+
+        let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
+
+        assert_eq!(a, a_de);
+    }
+
+    {
+        let a = arr2(&[[3., 1., 2.2], [3.1, 4., 7.]]);
+
+        let a_s = ron_serialize(&a).unwrap();
+
+        let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
+
+        assert_eq!(a, a_de);
+    }
+
+    {
+        // Test a sliced array.
+        let mut a = RcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
+        a.islice(s![..;-1, .., .., ..2]);
+
+        let a_s = ron_serialize(&a).unwrap();
+
+        let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
+
+        assert_eq!(a, a_de);
+    }
+}
diff --git a/src/array_serde.rs b/src/array_serde.rs
@@ -144,6 +144,17 @@ impl<'de> Deserialize<'de> for ArrayField {
                     other => Err(de::Error::unknown_field(other, ARRAY_FIELDS)),
                 }
             }
+
+            fn visit_bytes<E>(self, value: &[u8]) -> Result<ArrayField, E>
+                where E: de::Error
+            {
+                match value {
+                    b"v" => Ok(ArrayField::Version),
+                    b"dim" => Ok(ArrayField::Dim),
+                    b"data" => Ok(ArrayField::Data),
+                    other => Err(de::Error::unknown_field(&format!("{:?}",other), ARRAY_FIELDS)),
+                }
+            }
         }
 
         deserializer.deserialize_identifier(ArrayFieldVisitor)

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,17 @@ impl<'de> Deserialize<'de> for ArrayField {`
`144`	`144`	`other => Err(de::Error::unknown_field(other, ARRAY_FIELDS)),`
`145`	`145`	`}`
`146`	`146`	`}`
	`147`	`+`
	`148`	`+ fn visit_bytes<E>(self, value: &[u8]) -> Result<ArrayField, E>`
	`149`	`+ where E: de::Error`
	`150`	`+ {`
	`151`	`+ match value {`
	`152`	`+ b"v" => Ok(ArrayField::Version),`
	`153`	`+ b"dim" => Ok(ArrayField::Dim),`
	`154`	`+ b"data" => Ok(ArrayField::Data),`
	`155`	`+ other => Err(de::Error::unknown_field(&format!("{:?}",other), ARRAY_FIELDS)),`
	`156`	`+ }`
	`157`	`+ }`
`147`	`158`	`}`
`148`	`159`
`149`	`160`	`deserializer.deserialize_identifier(ArrayFieldVisitor)`