Assume POD and re-check NotNan.

reem · Apr 3, 2023 · d513f95 · d513f95
1 parent dfbadaf
commit d513f95
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1740,26 +1740,30 @@ mod impl_rkyv {
         }
     }
 
+    #[cfg(feature = "rkyv_ck")]
+    use super::FloatIsNan;
+    #[cfg(feature = "rkyv_ck")]
+    use core::convert::Infallible;
     #[cfg(feature = "rkyv_ck")]
     use rkyv::bytecheck::CheckBytes;
 
     #[cfg(feature = "rkyv_ck")]
-    impl<C: ?Sized, T: CheckBytes<C>> CheckBytes<C> for OrderedFloat<T> {
-        type Error = T::Error;
+    impl<C: ?Sized, T: Float + CheckBytes<C>> CheckBytes<C> for OrderedFloat<T> {
+        type Error = Infallible;
 
         #[inline]
-        unsafe fn check_bytes<'a>(value: *const Self, c: &mut C) -> Result<&'a Self, Self::Error> {
-            T::check_bytes(value as *const T, c).map(|_| &*value)
+        unsafe fn check_bytes<'a>(value: *const Self, _: &mut C) -> Result<&'a Self, Self::Error> {
+            Ok(&*value)
         }
     }
 
     #[cfg(feature = "rkyv_ck")]
-    impl<C: ?Sized, T: CheckBytes<C>> CheckBytes<C> for NotNan<T> {
-        type Error = T::Error;
+    impl<C: ?Sized, T: Float + CheckBytes<C>> CheckBytes<C> for NotNan<T> {
+        type Error = FloatIsNan;
 
         #[inline]
-        unsafe fn check_bytes<'a>(value: *const Self, c: &mut C) -> Result<&'a Self, Self::Error> {
-            T::check_bytes(value as *const T, c).map(|_| &*value)
+        unsafe fn check_bytes<'a>(value: *const Self, _: &mut C) -> Result<&'a Self, Self::Error> {
+            Self::new(*(value as *const T)).map(|_| &*value)
         }
     }