diff --git a/approx/Cargo.toml b/approx/Cargo.toml index 300b2ae..bc58a60 100644 --- a/approx/Cargo.toml +++ b/approx/Cargo.toml @@ -36,7 +36,6 @@ ordered_float = ["dep:ordered-float"] num_complex = ["dep:num-complex"] [dependencies] -num-traits = { version = "0.2", default-features = false } num-complex = { version = "0.4", optional = true } ordered-float = { version = "5", optional = true } approx-derive = { path = "../approx-derive/", version = "0.6.0-rc2", optional = true } diff --git a/approx/src/abs_diff_eq.rs b/approx/src/abs_diff_eq.rs index 522f70c..78cd7de 100644 --- a/approx/src/abs_diff_eq.rs +++ b/approx/src/abs_diff_eq.rs @@ -9,8 +9,6 @@ use indexmap::IndexMap; #[cfg(feature = "num_complex")] use num_complex::Complex; #[cfg(feature = "ordered_float")] -use num_traits::Float; -#[cfg(feature = "ordered_float")] use ordered_float::{NotNan, OrderedFloat}; /// Equality that is defined using the absolute difference of two numbers. @@ -99,7 +97,6 @@ macro_rules! impl_signed_abs_diff_eq { #[inline] #[allow(unused_imports)] fn abs_diff_eq(&self, other: &$T, epsilon: $T) -> bool { - use num_traits::float::FloatCore; $T::abs(self - other) <= epsilon } } @@ -377,7 +374,7 @@ impl AbsDiffEq for NotNan { #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl AbsDiffEq for NotNan { +impl AbsDiffEq for NotNan { type Epsilon = T::Epsilon; #[inline] @@ -393,7 +390,7 @@ impl AbsDiffEq for NotNan #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl AbsDiffEq for OrderedFloat { +impl AbsDiffEq for OrderedFloat { type Epsilon = T::Epsilon; #[inline] @@ -409,7 +406,7 @@ impl AbsDiffEq for OrderedFloat #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl AbsDiffEq for OrderedFloat { +impl AbsDiffEq for OrderedFloat { type Epsilon = T::Epsilon; #[inline] diff --git a/approx/src/lib.rs b/approx/src/lib.rs index 51b7e5d..f1d1290 100644 --- a/approx/src/lib.rs +++ b/approx/src/lib.rs @@ -226,7 +226,6 @@ #[cfg(feature = "num_complex")] #[cfg_attr(docsrs, doc(cfg(feature = "num_complex")))] extern crate num_complex; -extern crate num_traits; #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] extern crate ordered_float; diff --git a/approx/src/relative_eq.rs b/approx/src/relative_eq.rs index 1356edb..8df331d 100644 --- a/approx/src/relative_eq.rs +++ b/approx/src/relative_eq.rs @@ -9,8 +9,6 @@ use indexmap::IndexMap; #[cfg(feature = "num_complex")] use num_complex::Complex; -#[cfg(feature = "ordered_float")] -use num_traits::Float; #[cfg(feature = "ordered_float")] use ordered_float::{NotNan, OrderedFloat}; @@ -86,7 +84,6 @@ macro_rules! impl_relative_eq { #[inline] #[allow(unused_imports)] fn relative_eq(&self, other: &$T, epsilon: $T, max_relative: $T) -> bool { - use num_traits::float::FloatCore; // Handle same infinities if self == other { return true; @@ -465,7 +462,7 @@ impl RelativeEq for NotNan { #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl RelativeEq for NotNan { +impl RelativeEq for NotNan { #[inline] fn default_relative_epsilon() -> Self::Epsilon { T::default_relative_epsilon() @@ -484,7 +481,7 @@ impl RelativeEq for NotNan< #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl RelativeEq for OrderedFloat { +impl RelativeEq for OrderedFloat { #[inline] fn default_relative_epsilon() -> Self::Epsilon { T::default_relative_epsilon() @@ -513,7 +510,7 @@ impl RelativeEq for OrderedFlo #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl RelativeEq for OrderedFloat { +impl RelativeEq for OrderedFloat { #[inline] fn default_relative_epsilon() -> Self::Epsilon { T::default_relative_epsilon() diff --git a/approx/src/ulps_eq.rs b/approx/src/ulps_eq.rs index d32353a..1560ccb 100644 --- a/approx/src/ulps_eq.rs +++ b/approx/src/ulps_eq.rs @@ -8,9 +8,6 @@ use indexmap::IndexMap; #[cfg(feature = "num_complex")] use num_complex::Complex; #[cfg(feature = "ordered_float")] -use num_traits::Float; -use num_traits::Signed; -#[cfg(feature = "ordered_float")] use ordered_float::{NotNan, OrderedFloat}; use crate::AbsDiffEq; @@ -324,7 +321,7 @@ impl UlpsEq for NotNan { #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl UlpsEq for NotNan { +impl UlpsEq for NotNan { #[inline] fn default_max_ulps() -> u32 { T::default_max_ulps() @@ -338,7 +335,7 @@ impl UlpsEq for NotNan { #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl UlpsEq for OrderedFloat { +impl UlpsEq for OrderedFloat { #[inline] fn default_max_ulps() -> u32 { T::default_max_ulps() @@ -352,7 +349,7 @@ impl UlpsEq for OrderedFloat { #[cfg(feature = "ordered_float")] #[cfg_attr(docsrs, doc(cfg(feature = "ordered_float")))] -impl UlpsEq for OrderedFloat { +impl UlpsEq for OrderedFloat { #[inline] fn default_max_ulps() -> u32 { T::default_max_ulps()