Fully remove num-traits

Signed-off-by: Nico Burns <[email protected]>

Cargo.toml

@@ -18,7 +18,6 @@ license = "MIT"
 [dependencies]
 arrayvec = { version = "0.7", default-features = false }
 document-features = { version = "0.2.7", optional = true }
-num-traits = { version = "0.2", default-features = false }
 serde = { version = "1.0", default-features = false, optional = true, features = [
     "serde_derive",
 ] }
@@ -66,7 +65,7 @@ taffy_tree = ["dep:slotmap"]
 ## Add [`serde`] derives to Style structs
 serde = ["dep:serde"]
 ## Allow Taffy to depend on the [`Rust Standard Library`](std)
-std = ["num-traits/std", "grid?/std", "serde?/std", "slotmap?/std"]
+std = ["grid?/std", "serde?/std", "slotmap?/std"]
 ## Allow Taffy to depend on the alloc library
 alloc = ["serde?/alloc"]
 ## Internal feature for debugging

src/compute/grid/explicit_grid.rs

@@ -4,14 +4,11 @@ use super::types::{GridTrack, TrackCounts};
 use crate::geometry::{AbsoluteAxis, Size};
 use crate::style::{GridTrackRepetition, LengthPercentage, NonRepeatedTrackSizingFunction, TrackSizingFunction};
 use crate::style_helpers::TaffyAuto;
-use crate::util::sys::Vec;
+use crate::util::sys::{ceil, floor, Vec};
 use crate::util::MaybeMath;
 use crate::util::ResolveOrZero;
 use crate::{GridContainerStyle, MaybeResolve};
 
-#[cfg(not(feature = "std"))]
-use num_traits::float::FloatCore;
-
 /// Compute the number of rows and columns in the explicit grid
 pub(crate) fn compute_explicit_grid_size_in_axis(
     style: &impl GridContainerStyle,
@@ -161,9 +158,9 @@ pub(crate) fn compute_explicit_grid_size_in_axis(
                 //
                 // In all cases we add the additional repetition that was already accounted for in the special-case computation above
                 if size_is_maximum {
-                    (num_repetition_that_fit.floor() as u16) + 1
+                    (floor(num_repetition_that_fit) as u16) + 1
                 } else {
-                    (num_repetition_that_fit.ceil() as u16) + 1
+                    (ceil(num_repetition_that_fit) as u16) + 1
                 }
             }
         }

src/util/sys.rs

@@ -36,6 +36,20 @@ mod std {
         value.round()
     }
 
+    /// Rounds up to the nearest whole number
+    #[must_use]
+    #[inline(always)]
+    pub(crate) fn ceil(value: f32) -> f32 {
+        value.ceil()
+    }
+
+    /// Rounds down to the nearest whole number
+    #[must_use]
+    #[inline(always)]
+    pub(crate) fn floor(value: f32) -> f32 {
+        value.floor()
+    }
+
     /// Computes the absolute value
     #[must_use]
     #[inline(always)]
@@ -79,6 +93,12 @@ mod alloc {
     /// Rounds to the nearest whole number
     pub(crate) use super::polyfill::round;
 
+    /// Rounds up to the nearest whole number
+    pub(crate) use super::polyfill::ceil;
+
+    /// Rounds down to the nearest whole number
+    pub(crate) use super::polyfill::floor;
+
     /// Computes the absolute value
     pub(crate) use super::polyfill::abs;
 
@@ -145,9 +165,10 @@ mod core {
 
 /// Implementations of float functions for no_std and alloc builds
 /// Copied from `num-traits` crate
+#[cfg(not(feature = "std"))]
 mod polyfill {
+    #[must_use]
     #[inline(always)]
-    #[cfg(not(feature = "std"))]
     fn fract(value: f32) -> f32 {
         if value == 0.0 {
             0.0
@@ -158,7 +179,6 @@ mod polyfill {
 
     #[must_use]
     #[inline(always)]
-    #[cfg(not(feature = "std"))]
     pub(crate) fn round(value: f32) -> f32 {
         let f = fract(value);
         if f.is_nan() || f == 0.0 {
@@ -176,10 +196,35 @@ mod polyfill {
         }
     }
 
+    #[must_use]
+    #[inline(always)]
+    pub(crate) fn floor(value: f32) -> f32 {
+        let f = fract(value);
+        if f.is_nan() || f == 0.0 {
+            value
+        } else if value < 0.0 {
+            value - f - 1.0
+        } else {
+            value - f
+        }
+    }
+
+    #[must_use]
+    #[inline(always)]
+    pub(crate) fn ceil(value: f32) -> f32 {
+        let f = fract(value);
+        if f.is_nan() || f == 0.0 {
+            value
+        } else if value > 0.0 {
+            value - f + 1.0
+        } else {
+            value - f
+        }
+    }
+
     /// Computes the absolute value
     #[must_use]
     #[inline(always)]
-    #[cfg(not(feature = "std"))]
     pub(crate) fn abs(value: f32) -> f32 {
         if value.is_sign_positive() {
             return value;