16.4

Author: avl

README.md

@@ -65,6 +65,10 @@ fn main() {
 
 # Changelog
 
+## 0.16.4
+
+Support for boxed slices. I.e, Savefile can now serialize data of type ```Box<[T]>```.
+
 ## 0.16.3
 
 Just some fixes to the test suite, needed to make github actions CI work. 

savefile-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "savefile-derive"
-version = "0.16.3"
+version = "0.16.4"
 authors = ["Anders Musikka <[email protected]>"]
 
 description = "Custom derive macros for savefile crate - simple, convenient, fast, versioned, binary serialization/deserialization library."

savefile-test/Cargo.toml

@@ -12,7 +12,7 @@ nightly=["savefile/nightly"]
 
 [dependencies]
 savefile = { path = "../savefile", features = ["size_sanity_checks", "encryption", "compression","bit-set","bit-vec","rustc-hash"]}
-savefile-derive = { path = "../savefile-derive", version = "=0.16.3" }
+savefile-derive = { path = "../savefile-derive", version = "=0.16.4" }
 bit-vec = "0.6"
 arrayvec="0.7"
 smallvec="*"

savefile-test/src/lib.rs

@@ -1178,13 +1178,21 @@ pub fn fuzz_regression2() {
 
 
 #[test]
-pub fn test_roundtrip_arc_array() {
+pub fn test_roundtrip_arc_slice() {
     let a1: Arc<[u32]> = vec![1,2,3,4].into();
     assert_roundtrip(a1);
     let a2: Arc<[String]> = vec!["Hello".to_string()].into();
     assert_roundtrip(a2);
 }
 
+#[test]
+pub fn test_roundtrip_boxed_slice() {
+    let a1: Box<[u32]> = vec![1,2,3,4].into_boxed_slice();
+    assert_roundtrip(a1);
+    let a2: Box<[String]> = vec!["Hello".to_string()].into_boxed_slice();
+    assert_roundtrip(a2);
+}
+
 #[test]
 pub fn test_serialize_btreemap() {
     let mut bm = BTreeMap::new();

savefile/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "savefile"
-version = "0.16.3"
+version = "0.16.4"
 authors = ["Anders Musikka <[email protected]>"]
 documentation = "https://docs.rs/savefile/"
 homepage = "https://github.com/avl/savefile/"
@@ -52,10 +52,10 @@ bit-set = {version = "0.5", optional = true}
 rustc-hash = {version = "1.1", optional = true}
 memoffset = "0.9"
 byteorder = "1.4"
-savefile-derive = {path="../savefile-derive", version = "=0.16.3", optional = true }
+savefile-derive = {path="../savefile-derive", version = "=0.16.4", optional = true }
 
 [dev-dependencies]
-savefile-derive = { path="../savefile-derive", version = "=0.16.3" }
+savefile-derive = { path="../savefile-derive", version = "=0.16.4" }
 
 [build-dependencies]
 rustc_version="0.2"

savefile/src/lib.rs

@@ -4021,11 +4021,32 @@ fn regular_serialize_vec<T: Serialize>(items: &[T], serializer: &mut Serializer<
     }
 }
 
+impl<T: WithSchema> WithSchema for Box<[T]> {
+    fn schema(version: u32) -> Schema {
+        Schema::Vector(Box::new(T::schema(version)))
+    }
+}
 impl<T: WithSchema> WithSchema for Arc<[T]> {
     fn schema(version: u32) -> Schema {
         Schema::Vector(Box::new(T::schema(version)))
     }
 }
+impl<T: Introspect> Introspect for Box<[T]> {
+    fn introspect_value(&self) -> String {
+        return "Box[]".to_string();
+    }
+
+    fn introspect_child(&self, index: usize) -> Option<Box<dyn IntrospectItem + '_>> {
+        if index >= self.len() {
+            return None;
+        }
+        return Some(introspect_item(index.to_string(), &self[index]));
+    }
+    fn introspect_len(&self) -> usize {
+        self.len()
+    }
+}
+
 impl<T: Introspect> Introspect for Arc<[T]> {
     fn introspect_value(&self) -> String {
         return "Arc[]".to_string();
@@ -4082,6 +4103,25 @@ impl Deserialize for Arc<str> {
     }
 }
 
+impl<T: Serialize + ReprC> Serialize for Box<[T]> {
+    fn serialize(&self, serializer: &mut Serializer<impl Write>) -> Result<(), SavefileError> {
+        unsafe {
+            if T::repr_c_optimization_safe(serializer.version).is_false() {
+                regular_serialize_vec(&*self, serializer)
+            } else {
+                let l = self.len();
+                serializer.write_usize(l)?;
+                serializer.write_buf(std::slice::from_raw_parts(
+                    (*self).as_ptr() as *const u8,
+                    std::mem::size_of::<T>() * l,
+                ))
+            }
+        }
+    }
+}
+impl<T: ReprC> ReprC for Box<[T]> { }
+
+
 impl<T: Serialize + ReprC> Serialize for Arc<[T]> {
     fn serialize(&self, serializer: &mut Serializer<impl Write>) -> Result<(), SavefileError> {
         unsafe {
@@ -4105,6 +4145,11 @@ impl<T: Deserialize+ReprC> Deserialize for Arc<[T]> {
         Ok(Vec::<T>::deserialize(deserializer)?.into())
     }
 }
+impl<T: Deserialize+ReprC> Deserialize for Box<[T]> {
+    fn deserialize(deserializer: &mut Deserializer<impl Read>) -> Result<Self, SavefileError> {
+        Ok(Vec::<T>::deserialize(deserializer)?.into_boxed_slice())
+    }
+}
 
 impl<T> ReprC for Vec<T> {}