format float.rs for clarity (#50)

tguichaoua · Dec 18, 2023 · 71126d6 · 71126d6
1 parent f941398
commit 71126d6
Showing 1 changed file with 49 additions and 41 deletions.
diff --git a/src/float.rs b/src/float.rs
@@ -100,6 +100,10 @@ pub trait FloatMath: private::Sealed + Sized {
     fn sin_cos(self) -> (Self, Self);
 }
 
+//-------------------------------------------------------------------
+// F32
+//-------------------------------------------------------------------
+
 impl Float for f32 {
     const ZERO: Self = 0.0f32;
     const ONE: Self = 1.0f32;
@@ -129,35 +133,6 @@ impl Float for f32 {
     }
 }
 
-impl Float for f64 {
-    const ZERO: Self = 0.0f64;
-    const ONE: Self = 1.0f64;
-    const EPSILON: Self = f64::EPSILON;
-    const DOUBLE_EPSILON: Self = 2.0 * Self::EPSILON;
-
-    const TAU: Self = core::f64::consts::TAU;
-    const PI: Self = core::f64::consts::PI;
-    const FRAC_PI_2: Self = core::f64::consts::FRAC_PI_2;
-    const FRAC_PI_3: Self = core::f64::consts::FRAC_PI_3;
-    const FRAC_PI_4: Self = core::f64::consts::FRAC_PI_4;
-    const FRAC_PI_6: Self = core::f64::consts::FRAC_PI_6;
-    const FRAC_PI_8: Self = core::f64::consts::FRAC_PI_8;
-
-    const DEG_TO_RAD: Self = core::f64::consts::PI / 180.0;
-    const RAD_TO_DEG: Self = 180.0 / core::f64::consts::PI;
-
-    const TURNS_TO_RAD: Self = core::f64::consts::TAU;
-    const RAD_TO_TURNS: Self = 1.0 / core::f64::consts::TAU;
-
-    const GRAD_TO_RAD: Self = core::f64::consts::PI / 200.0;
-    const RAD_TO_GRAD: Self = 200.0 / core::f64::consts::PI;
-
-    #[inline]
-    fn is_nan(self) -> bool {
-        self.is_nan()
-    }
-}
-
 #[cfg(feature = "std")]
 impl FloatMath for f32 {
     #[inline]
@@ -181,49 +156,82 @@ impl FloatMath for f32 {
     }
 }
 
-#[cfg(feature = "std")]
-impl FloatMath for f64 {
+#[cfg(all(not(feature = "std"), feature = "libm"))]
+impl FloatMath for f32 {
     #[inline]
     fn sin(self) -> Self {
-        self.sin()
+        libm::sinf(self)
     }
 
     #[inline]
     fn cos(self) -> Self {
-        self.cos()
+        libm::cosf(self)
     }
 
     #[inline]
     fn tan(self) -> Self {
-        self.tan()
+        libm::tanf(self)
     }
 
     #[inline]
     fn sin_cos(self) -> (Self, Self) {
-        self.sin_cos()
+        (libm::sinf(self), libm::cosf(self))
     }
 }
 
-#[cfg(all(not(feature = "std"), feature = "libm"))]
-impl FloatMath for f32 {
+//-------------------------------------------------------------------
+// F64
+//-------------------------------------------------------------------
+
+impl Float for f64 {
+    const ZERO: Self = 0.0f64;
+    const ONE: Self = 1.0f64;
+    const EPSILON: Self = f64::EPSILON;
+    const DOUBLE_EPSILON: Self = 2.0 * Self::EPSILON;
+
+    const TAU: Self = core::f64::consts::TAU;
+    const PI: Self = core::f64::consts::PI;
+    const FRAC_PI_2: Self = core::f64::consts::FRAC_PI_2;
+    const FRAC_PI_3: Self = core::f64::consts::FRAC_PI_3;
+    const FRAC_PI_4: Self = core::f64::consts::FRAC_PI_4;
+    const FRAC_PI_6: Self = core::f64::consts::FRAC_PI_6;
+    const FRAC_PI_8: Self = core::f64::consts::FRAC_PI_8;
+
+    const DEG_TO_RAD: Self = core::f64::consts::PI / 180.0;
+    const RAD_TO_DEG: Self = 180.0 / core::f64::consts::PI;
+
+    const TURNS_TO_RAD: Self = core::f64::consts::TAU;
+    const RAD_TO_TURNS: Self = 1.0 / core::f64::consts::TAU;
+
+    const GRAD_TO_RAD: Self = core::f64::consts::PI / 200.0;
+    const RAD_TO_GRAD: Self = 200.0 / core::f64::consts::PI;
+
+    #[inline]
+    fn is_nan(self) -> bool {
+        self.is_nan()
+    }
+}
+
+#[cfg(feature = "std")]
+impl FloatMath for f64 {
     #[inline]
     fn sin(self) -> Self {
-        libm::sinf(self)
+        self.sin()
     }
 
     #[inline]
     fn cos(self) -> Self {
-        libm::cosf(self)
+        self.cos()
     }
 
     #[inline]
     fn tan(self) -> Self {
-        libm::tanf(self)
+        self.tan()
     }
 
     #[inline]
     fn sin_cos(self) -> (Self, Self) {
-        (libm::sinf(self), libm::cosf(self))
+        self.sin_cos()
     }
 }