heavy WIP ; rust error E0210 difficult to analyze

Author: ThierryBerger

src/base/array_storage.rs

@@ -30,11 +30,9 @@ use std::mem;
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(
-        as = ArrayStorage<T::Archived, R, C>,
+    rkyv(compare(PartialEq),
         archive_bounds(
             T: rkyv::Archive,
-            [[T; R]; C]: rkyv::Archive<Archived = [[T::Archived; R]; C]>
         )
     )
 )]

src/base/matrix.rs

@@ -159,11 +159,15 @@ pub type MatrixCross<T, R1, C1, R2, C2> =
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Matrix<T::Archived, R, C, S::Archived>,
+    rkyv(
+        compare(PartialEq, PartialOrd),
+        derive(Debug),
         archive_bounds(
-            T: Archive,
+            <S as Archive>::Archived: core::fmt::Debug,
+            <PhantomData<(T, R, C)> as Archive>::Archived: core::fmt::Debug,
+            T: PartialEq,
             S: Archive,
-            With<PhantomData<(T, R, C)>, CustomPhantom<(Archived<T>, R, C)>>: Archive<Archived = PhantomData<(Archived<T>, R, C)>>
+            S: core::fmt::Debug,
         )
     )
 )]
@@ -203,7 +207,6 @@ pub struct Matrix<T, R, C, S> {
     //       of the `RawStorage` trait. However, because we don't have
     //       specialization, this is not possible because these `T, R, C`
     //       allows us to desambiguate a lot of configurations.
-    #[cfg_attr(feature = "rkyv-serialize-no-std", rkyv(with = CustomPhantom<(T::Archived, R, C)>))]
     _phantoms: PhantomData<(T, R, C)>,
 }
 

src/base/unit.rs

@@ -24,11 +24,10 @@ use crate::{Dim, Matrix, OMatrix, RealField, Scalar, SimdComplexField, SimdRealF
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Unit<T::Archived>,
-        archive_bounds(
-            T: rkyv::Archive,
-        )
-    )
+    rkyv(
+        // This will generate a PartialEq impl between our unarchived
+        // and archived types
+        compare(PartialEq),)
 )]
 pub struct Unit<T> {
     pub(crate) value: T,

src/geometry/dual_quaternion.rs

@@ -45,13 +45,7 @@ use simba::scalar::{ClosedNeg, RealField};
 #[derive(Debug, Copy, Clone)]
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
-    derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = DualQuaternion<T::Archived>,
-        archive_bounds(
-            T: rkyv::Archive,
-            Quaternion<T>: rkyv::Archive<Archived = Quaternion<T::Archived>>
-        )
-    )
+    derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)
 )]
 pub struct DualQuaternion<T> {
     /// The real component of the quaternion

src/geometry/isometry.rs

@@ -74,13 +74,9 @@ use rkyv::bytecheck;
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Isometry<T::Archived, R::Archived, D>,
-        archive_bounds(
-            T: rkyv::Archive,
-            R: rkyv::Archive,
-            Translation<T, D>: rkyv::Archive<Archived = Translation<T::Archived, D>>
-        )
-    )
+    // This will generate a PartialEq impl between our unarchived
+    // and archived types
+    rkyv(compare(PartialEq),)
 )]
 pub struct Isometry<T, R, const D: usize> {
     /// The pure rotational part of this isometry.

src/geometry/orthographic.rs

@@ -25,11 +25,10 @@ use rkyv::bytecheck;
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Orthographic3<T::Archived>,
-        archive_bounds(
-            T: rkyv::Archive,
-            Matrix4<T>: rkyv::Archive<Archived = Matrix4<T::Archived>>
-        )
+    rkyv(
+        // This will generate a PartialEq impl between our unarchived
+        // and archived types
+        compare(PartialEq),
     )
 )]
 #[derive(Copy, Clone)]

src/geometry/perspective.rs

@@ -25,13 +25,7 @@ use rkyv::{bytecheck, rancor};
 #[repr(C)]
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
-    derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Perspective3<T::Archived>,
-        archive_bounds(
-            T: rkyv::Archive,
-            Matrix4<T>: rkyv::Archive<Archived = Matrix4<T::Archived>>
-        )
-    )
+    derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)
 )]
 #[derive(Copy, Clone)]
 pub struct Perspective3<T> {

src/geometry/point.rs

@@ -42,12 +42,11 @@ use std::mem::MaybeUninit;
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = OPoint<T::Archived, D>,
-        archive_bounds(T: rkyv::Archive,
-            T::Archived: Scalar,
-            OVector<T, D>: rkyv::Archive<Archived = OVector<T::Archived, D>>,
-            DefaultAllocator: Allocator<D>,
-        )
+
+    rkyv(
+        // This will generate a PartialEq impl between our unarchived
+        // and archived types
+        compare(PartialEq),
     )
 )]
 pub struct OPoint<T: Scalar, D: DimName>

src/geometry/quaternion.rs

@@ -29,11 +29,11 @@ use rkyv::bytecheck;
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Quaternion<T::Archived>,
-        archive_bounds(
-            T: rkyv::Archive,
-            Vector4<T>: rkyv::Archive<Archived = Vector4<T::Archived>>
-        )
+
+    rkyv(
+        // This will generate a PartialEq impl between our unarchived
+        // and archived types
+        compare(PartialEq),
     )
 )]
 pub struct Quaternion<T> {

src/geometry/rotation.rs

@@ -55,12 +55,14 @@ use rkyv::bytecheck;
 #[cfg_attr(
     feature = "rkyv-serialize-no-std",
     derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize),
-    rkyv(as = Rotation<T::Archived, D>,
-        archive_bounds(
-            T: rkyv::Archive,
-            SMatrix<T, D, D>: rkyv::Archive<Archived = SMatrix<T::Archived, D, D>>
-        )
-    )
+    // This will generate a PartialEq impl between our unarchived
+    // and archived types
+    //rkyv(archive_bounds(
+        //T: rkyv::Archive,
+        //<T as rkyv::Archive>::Archived: core::fmt::Debug,
+    //),
+//    compare(PartialEq)
+//)
 )]
 #[derive(Copy, Clone)]
 pub struct Rotation<T, const D: usize> {