Merge branch 'minver-fix'

mikedilger · Jul 21, 2021 · 15400f7 · 15400f7
2 parents 6407563 + d76d1b1
commit 15400f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,4 +23,4 @@ ratio = [ "num-traits" ]
 std = [ ]
 
 [dependencies]
-num-traits = { version = "0.2", default-features = false, optional = true }
+num-traits = { version = "0.2.1", default-features = false, optional = true }
diff --git a/src/eq.rs b/src/eq.rs
@@ -66,13 +66,13 @@ impl F32Margin {
     }
     pub fn epsilon(self, epsilon: f32) -> Self {
         F32Margin {
-            epsilon: epsilon,
+            epsilon,
             ..self
         }
     }
     pub fn ulps(self, ulps: i32) -> Self {
         F32Margin {
-            ulps: ulps,
+            ulps,
             ..self
         }
     }
@@ -192,13 +192,13 @@ impl F64Margin {
     }
     pub fn epsilon(self, epsilon: f64) -> Self {
         F64Margin {
-            epsilon: epsilon,
+            epsilon,
             ..self
         }
     }
     pub fn ulps(self, ulps: i64) -> Self {
         F64Margin {
-            ulps: ulps,
+            ulps,
             ..self
         }
     }

diff --git a/src/ulps_eq.rs b/src/ulps_eq.rs
@@ -1,6 +1,9 @@
 // Copyright 2014-2020 Optimal Computing (NZ) Ltd.
 // Licensed under the MIT license.  See LICENSE for details.
 
+#[cfg(feature = "num-traits")]
+#[allow(unused_imports)]
+use num_traits::float::FloatCore;
 use super::Ulps;
 
 /// ApproxEqUlps is a trait for approximate equality comparisons.