Implement rkyv endianess (#136)

Signed-off-by: MucTepDayH16 <denisdrozhzhin1999@gmail.com>
reem · Aug 18, 2023 · 2b9f190 · 2b9f190
1 parent d7768e7
commit 2b9f190
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 28 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1917,59 +1917,101 @@ mod impl_rkyv {
     use num_traits::Float;
     #[cfg(test)]
     use rkyv::{archived_root, ser::Serializer};
-    use rkyv::{from_archived, Archive, Deserialize, Fallible, Serialize};
+    use rkyv::{Archive, Deserialize, Fallible, Serialize};
 
     #[cfg(test)]
     type DefaultSerializer = rkyv::ser::serializers::CoreSerializer<16, 16>;
     #[cfg(test)]
     type DefaultDeserializer = rkyv::Infallible;
 
     impl<T: Float + Archive> Archive for OrderedFloat<T> {
-        type Archived = OrderedFloat<T>;
+        type Archived = OrderedFloat<T::Archived>;
 
-        type Resolver = ();
+        type Resolver = T::Resolver;
 
-        unsafe fn resolve(&self, _: usize, _: Self::Resolver, out: *mut Self::Archived) {
-            out.write(*self);
+        unsafe fn resolve(&self, pos: usize, resolver: Self::Resolver, out: *mut Self::Archived) {
+            self.0.resolve(pos, resolver, out.cast())
         }
     }
 
     impl<T: Float + Serialize<S>, S: Fallible + ?Sized> Serialize<S> for OrderedFloat<T> {
-        fn serialize(&self, _: &mut S) -> Result<Self::Resolver, S::Error> {
-            Ok(())
+        fn serialize(&self, s: &mut S) -> Result<Self::Resolver, S::Error> {
+            self.0.serialize(s)
         }
     }
 
-    impl<T: Float + Deserialize<T, D>, D: Fallible + ?Sized> Deserialize<OrderedFloat<T>, D>
-        for OrderedFloat<T>
+    impl<T: Float, AT: Deserialize<T, D>, D: Fallible + ?Sized> Deserialize<OrderedFloat<T>, D>
+        for OrderedFloat<AT>
     {
-        fn deserialize(&self, _: &mut D) -> Result<OrderedFloat<T>, D::Error> {
-            Ok(from_archived!(*self))
+        fn deserialize(&self, d: &mut D) -> Result<OrderedFloat<T>, D::Error> {
+            self.0.deserialize(d).map(OrderedFloat)
         }
     }
 
     impl<T: Float + Archive> Archive for NotNan<T> {
-        type Archived = NotNan<T>;
+        type Archived = NotNan<T::Archived>;
 
-        type Resolver = ();
+        type Resolver = T::Resolver;
 
-        unsafe fn resolve(&self, _: usize, _: Self::Resolver, out: *mut Self::Archived) {
-            out.write(*self);
+        unsafe fn resolve(&self, pos: usize, resolver: Self::Resolver, out: *mut Self::Archived) {
+            self.0.resolve(pos, resolver, out.cast())
         }
     }
 
     impl<T: Float + Serialize<S>, S: Fallible + ?Sized> Serialize<S> for NotNan<T> {
-        fn serialize(&self, _: &mut S) -> Result<Self::Resolver, S::Error> {
-            Ok(())
+        fn serialize(&self, s: &mut S) -> Result<Self::Resolver, S::Error> {
+            self.0.serialize(s)
         }
     }
 
-    impl<T: Float + Deserialize<T, D>, D: Fallible + ?Sized> Deserialize<NotNan<T>, D> for NotNan<T> {
-        fn deserialize(&self, _: &mut D) -> Result<NotNan<T>, D::Error> {
-            Ok(from_archived!(*self))
+    impl<T: Float, AT: Deserialize<T, D>, D: Fallible + ?Sized> Deserialize<NotNan<T>, D>
+        for NotNan<AT>
+    {
+        fn deserialize(&self, d: &mut D) -> Result<NotNan<T>, D::Error> {
+            self.0.deserialize(d).map(NotNan)
         }
     }
 
+    macro_rules! rkyv_eq_ord {
+        ($main:ident, $float:ty, $rend:ty) => {
+            impl PartialEq<$main<$float>> for $main<$rend> {
+                fn eq(&self, other: &$main<$float>) -> bool {
+                    other.eq(&self.0.value())
+                }
+            }
+            impl PartialEq<$main<$rend>> for $main<$float> {
+                fn eq(&self, other: &$main<$rend>) -> bool {
+                    self.eq(&other.0.value())
+                }
+            }
+
+            impl PartialOrd<$main<$float>> for $main<$rend> {
+                fn partial_cmp(&self, other: &$main<$float>) -> Option<core::cmp::Ordering> {
+                    self.0.value().partial_cmp(other)
+                }
+            }
+
+            impl PartialOrd<$main<$rend>> for $main<$float> {
+                fn partial_cmp(&self, other: &$main<$rend>) -> Option<core::cmp::Ordering> {
+                    other
+                        .0
+                        .value()
+                        .partial_cmp(self)
+                        .map(core::cmp::Ordering::reverse)
+                }
+            }
+        };
+    }
+
+    rkyv_eq_ord! { OrderedFloat, f32, rkyv::rend::f32_le }
+    rkyv_eq_ord! { OrderedFloat, f32, rkyv::rend::f32_be }
+    rkyv_eq_ord! { OrderedFloat, f64, rkyv::rend::f64_le }
+    rkyv_eq_ord! { OrderedFloat, f64, rkyv::rend::f64_be }
+    rkyv_eq_ord! { NotNan, f32, rkyv::rend::f32_le }
+    rkyv_eq_ord! { NotNan, f32, rkyv::rend::f32_be }
+    rkyv_eq_ord! { NotNan, f64, rkyv::rend::f64_le }
+    rkyv_eq_ord! { NotNan, f64, rkyv::rend::f64_be }
+
     #[cfg(feature = "rkyv_ck")]
     use super::FloatIsNan;
     #[cfg(feature = "rkyv_ck")]

diff --git a/tests/test.rs b/tests/test.rs
@@ -67,10 +67,10 @@ fn ordered_f32_compare_nan_op() {
     assert!(f32_nan >= OrderedFloat(-100000.0f32));
     assert!(OrderedFloat(-100.0f32) < f32_nan);
     assert!(OrderedFloat(-100.0f32) <= f32_nan);
-    assert!(f32_nan > OrderedFloat(Float::infinity()));
-    assert!(f32_nan >= OrderedFloat(Float::infinity()));
-    assert!(f32_nan > OrderedFloat(Float::neg_infinity()));
-    assert!(f32_nan >= OrderedFloat(Float::neg_infinity()));
+    assert!(f32_nan > OrderedFloat(f32::infinity()));
+    assert!(f32_nan >= OrderedFloat(f32::infinity()));
+    assert!(f32_nan > OrderedFloat(f32::neg_infinity()));
+    assert!(f32_nan >= OrderedFloat(f32::neg_infinity()));
 }
 
 #[test]
@@ -198,10 +198,10 @@ fn ordered_f64_compare_nan_op() {
     assert!(f64_nan >= OrderedFloat(-100000.0));
     assert!(OrderedFloat(-100.0) < f64_nan);
     assert!(OrderedFloat(-100.0) <= f64_nan);
-    assert!(f64_nan > OrderedFloat(Float::infinity()));
-    assert!(f64_nan >= OrderedFloat(Float::infinity()));
-    assert!(f64_nan > OrderedFloat(Float::neg_infinity()));
-    assert!(f64_nan >= OrderedFloat(Float::neg_infinity()));
+    assert!(f64_nan > OrderedFloat(f64::infinity()));
+    assert!(f64_nan >= OrderedFloat(f64::infinity()));
+    assert!(f64_nan > OrderedFloat(f64::neg_infinity()));
+    assert!(f64_nan >= OrderedFloat(f64::neg_infinity()));
 }
 
 #[test]