Merge pull request #59 from cbiffle/no-std

In no_std context, use no_std num-traits.

Author: mbrubeck

Cargo.toml

@@ -10,12 +10,12 @@ keywords = ["no_std", "ord", "f64", "f32", "sort"]
 categories = ["science", "rust-patterns", "no-std"]
 
 [dependencies]
-num-traits = "0.2"
+num-traits = { version = "0.2.1", default-features = false }
 serde = { version = "1.0", optional = true, default-features = false }
 
 [dev-dependencies]
 serde_test = "1.0"
 
 [features]
 default = ["std"]
-std = []
+std = ["num-traits/std"]

src/lib.rs

@@ -16,8 +16,11 @@ use core::mem;
 use core::hint::unreachable_unchecked;
 use core::str::FromStr;
 
-use num_traits::{Bounded, Float, FromPrimitive, Num, NumCast, One, Signed, ToPrimitive,
-                 Zero};
+use num_traits::{Bounded, FromPrimitive, Num, NumCast, One, Signed, ToPrimitive, Zero};
+#[cfg(feature = "std")]
+use num_traits::Float;
+#[cfg(not(feature = "std"))]
+use num_traits::float::FloatCore as Float;
 
 /// A wrapper around Floats providing an implementation of Ord and Hash.
 ///
@@ -615,7 +618,7 @@ impl<T: Float + Signed> Signed for NotNan<T> {
     fn abs(&self) -> Self { NotNan(self.0.abs()) }
 
     fn abs_sub(&self, other: &Self) -> Self {
-        NotNan::new(self.0.abs_sub(other.0)).expect("Subtraction resulted in NaN")
+        NotNan::new(Signed::abs_sub(&self.0, &other.0)).expect("Subtraction resulted in NaN")
     }
 
     fn signum(&self) -> Self { NotNan(self.0.signum()) }
@@ -635,7 +638,10 @@ mod impl_serde {
     use self::serde::{Serialize, Serializer, Deserialize, Deserializer};
     use self::serde::de::{Error, Unexpected};
     use super::{OrderedFloat, NotNan};
+    #[cfg(feature = "std")]
     use num_traits::Float;
+    #[cfg(not(feature = "std"))]
+    use num_traits::float::FloatCore as Float;
     use core::f64;
 
     #[cfg(test)]

tests/test.rs

@@ -2,7 +2,12 @@ extern crate num_traits;
 extern crate ordered_float;
 
 pub use ordered_float::*;
-pub use num_traits::{Bounded, Float, FromPrimitive, Num, One, Signed, ToPrimitive, Zero};
+pub use num_traits::{Bounded, FromPrimitive, Num, One, Signed, ToPrimitive, Zero};
+#[cfg(feature = "std")]
+pub use num_traits::Float;
+#[cfg(not(feature = "std"))]
+pub use num_traits::float::FloatCore as Float;
+
 pub use std::cmp::Ordering::*;
 pub use std::{f32, f64, panic};
 

tests/test_deprecated_names.rs

@@ -4,7 +4,11 @@ extern crate num_traits;
 extern crate ordered_float;
 
 pub use ordered_float::*;
-pub use num_traits::{Bounded, Float, FromPrimitive, Num, One, Signed, ToPrimitive, Zero};
+pub use num_traits::{Bounded, FromPrimitive, Num, One, Signed, ToPrimitive, Zero};
+#[cfg(feature = "std")]
+pub use num_traits::Float;
+#[cfg(not(feature = "std"))]
+pub use num_traits::float::FloatCore as Float;
 pub use std::cmp::Ordering::*;
 pub use std::{f32, f64, panic};