feat(versionable): impl Versionize for Box<[T]> and ABox<[T]>

zama-ai · Aug 2, 2024 · 781f78c · 781f78c
1 parent ebfc1ea
commit 781f78c
Showing 1 changed file with 51 additions and 3 deletions.
diff --git a/utils/tfhe-versionable/src/lib.rs b/utils/tfhe-versionable/src/lib.rs
@@ -250,6 +250,30 @@ impl<T: Unversionize> Unversionize for Box<T> {
     }
 }
 
+impl<T: VersionizeSlice + Clone> Versionize for Box<[T]> {
+    type Versioned<'vers> = T::VersionedSlice<'vers> where T: 'vers;
+
+    fn versionize(&self) -> Self::Versioned<'_> {
+        T::versionize_slice(self)
+    }
+}
+
+impl<T: VersionizeVec + Clone> VersionizeOwned for Box<[T]> {
+    type VersionedOwned = T::VersionedVec;
+
+    fn versionize_owned(self) -> Self::VersionedOwned {
+        T::versionize_vec(self.iter().cloned().collect())
+    }
+}
+
+impl<T: UnversionizeVec + Clone> Unversionize for Box<[T]> {
+    fn unversionize(versioned: Self::VersionedOwned) -> Result<Self, UnversionizeError> {
+        T::unversionize_vec(versioned).map(|unver| unver.into_boxed_slice())
+    }
+}
+
+impl<T: NotVersioned + Clone + Serialize + DeserializeOwned> NotVersioned for Box<[T]> {}
+
 impl<T: VersionizeSlice> Versionize for Vec<T> {
     type Versioned<'vers> = T::VersionedSlice<'vers> where T: 'vers;
 
@@ -447,16 +471,16 @@ impl<T: Versionize> Versionize for ABox<T> {
     }
 }
 
-impl<T: VersionizeOwned + Copy> VersionizeOwned for ABox<T> {
+impl<T: VersionizeOwned + Clone> VersionizeOwned for ABox<T> {
     // Alignment doesn't matter for versioned types
     type VersionedOwned = Box<T::VersionedOwned>;
 
     fn versionize_owned(self) -> Self::VersionedOwned {
-        Box::new(T::versionize_owned(*self))
+        Box::new(T::versionize_owned(T::clone(&self)))
     }
 }
 
-impl<T: Unversionize + Copy> Unversionize for ABox<T>
+impl<T: Unversionize + Clone> Unversionize for ABox<T>
 where
     T::VersionedOwned: Clone,
 {
@@ -465,6 +489,30 @@ where
     }
 }
 
+impl<T: VersionizeSlice + Clone> Versionize for ABox<[T]> {
+    type Versioned<'vers> = T::VersionedSlice<'vers> where T: 'vers;
+
+    fn versionize(&self) -> Self::Versioned<'_> {
+        T::versionize_slice(self)
+    }
+}
+
+impl<T: VersionizeVec + Clone> VersionizeOwned for ABox<[T]> {
+    type VersionedOwned = T::VersionedVec;
+
+    fn versionize_owned(self) -> Self::VersionedOwned {
+        T::versionize_vec(self.iter().cloned().collect())
+    }
+}
+
+impl<T: UnversionizeVec + Clone> Unversionize for ABox<[T]> {
+    fn unversionize(versioned: Self::VersionedOwned) -> Result<Self, UnversionizeError> {
+        T::unversionize_vec(versioned).map(|unver| AVec::from_iter(0, unver).into_boxed_slice())
+    }
+}
+
+impl<T: NotVersioned + Clone + Serialize + DeserializeOwned> NotVersioned for ABox<[T]> {}
+
 impl<T: VersionizeSlice> Versionize for AVec<T> {
     type Versioned<'vers> = T::VersionedSlice<'vers> where T: 'vers;