Upgraded ordered-float

u1roh · Jan 30, 2024 · a9ac79a · a9ac79a
1 parent 587ab92
commit a9ac79a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 
 [dependencies]
 num-traits = "0.2.17"
-ordered-float = "3.9.2"
+ordered-float = "4.2.0"
 pdqselect = "0.1.1"
 typenum = "1.17.0"
 paste = "1.0.14"

diff --git a/src/lib.rs b/src/lib.rs
@@ -157,7 +157,7 @@ impl<T, N: Unsigned> KdSliceN<T, N> {
     pub fn sort_by_ordered_float(points: &mut [T]) -> &Self
     where
         T: KdPoint<Dim = N>,
-        T::Scalar: num_traits::Float,
+        T::Scalar: ordered_float::FloatCore,
     {
         Self::sort_by_key(points, |item, k| ordered_float::OrderedFloat(item.at(k)))
     }
@@ -396,7 +396,7 @@ impl<T: Send, N: Unsigned> KdSliceN<T, N> {
     pub fn par_sort_by_ordered_float(points: &mut [T]) -> &Self
     where
         T: KdPoint<Dim = N>,
-        T::Scalar: num_traits::Float,
+        T::Scalar: ordered_float::FloatCore,
     {
         Self::par_sort_by_key(points, |item, k| ordered_float::OrderedFloat(item.at(k)))
     }
@@ -503,7 +503,7 @@ impl<T, N: Unsigned> KdTreeN<T, N> {
     pub fn build_by_ordered_float(points: Vec<T>) -> Self
     where
         T: KdPoint<Dim = N>,
-        T::Scalar: num_traits::Float,
+        T::Scalar: ordered_float::FloatCore,
     {
         Self::build_by_key(points, |item, k| ordered_float::OrderedFloat(item.at(k)))
     }
@@ -562,7 +562,7 @@ impl<T: Send, N: Unsigned> KdTreeN<T, N> {
     pub fn par_build_by_ordered_float(points: Vec<T>) -> Self
     where
         T: KdPoint<Dim = N>,
-        T::Scalar: num_traits::Float,
+        T::Scalar: ordered_float::FloatCore,
     {
         Self::par_build_by_key(points, |item, k| ordered_float::OrderedFloat(item.at(k)))
     }
@@ -628,7 +628,7 @@ impl<'a, T, N: Unsigned> KdIndexTreeN<'a, T, N> {
     pub fn build_by_ordered_float(points: &'a [T]) -> Self
     where
         T: KdPoint<Dim = N>,
-        T::Scalar: num_traits::Float,
+        T::Scalar: ordered_float::FloatCore,
     {
         Self::build_by_key(points, |item, k| ordered_float::OrderedFloat(item.at(k)))
     }
@@ -766,7 +766,7 @@ impl<'a, T: Sync, N: Unsigned> KdIndexTreeN<'a, T, N> {
     pub fn par_build_by_ordered_float(points: &'a [T]) -> Self
     where
         T: KdPoint<Dim = N>,
-        T::Scalar: num_traits::Float,
+        T::Scalar: ordered_float::FloatCore,
     {
         Self::par_build_by_key(points, |item, k| ordered_float::OrderedFloat(item.at(k)))
     }
@@ -797,7 +797,7 @@ macro_rules! impl_kd_points {
     ($($len:literal),*) => {
         $(
             paste::paste!{
-                impl<T: num_traits::NumAssign + Copy + PartialOrd> KdPoint for [T; $len] {
+                impl<T: num_traits::NumAssign + Copy + PartialOrd + ordered_float::FloatCore> KdPoint for [T; $len] {
                     type Scalar = T;
                     type Dim = typenum::[<U $len>];
                     fn at(&self, i: usize) -> T { self[i] }