num: remove deprecated functionality.

3 files changed, 12 insertions, 16 deletions

diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 426c858d408..87973eacc66 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -1248,18 +1248,6 @@ pub trait Float
     /// Returns the `1` value.
     fn one() -> Self;
 
-    /// Returns true if this value is NaN and false otherwise.
-    fn is_nan(self) -> bool;
-    /// Returns true if this value is positive infinity or negative infinity and
-    /// false otherwise.
-    fn is_infinite(self) -> bool;
-    /// Returns true if this number is neither infinite nor NaN.
-    fn is_finite(self) -> bool;
-    /// Returns true if this number is neither zero, infinite, denormal, or NaN.
-    fn is_normal(self) -> bool;
-    /// Returns the category that this number falls into.
-    fn classify(self) -> FpCategory;
-
     // FIXME (#5527): These should be associated constants
 
     /// Returns the number of binary digits of mantissa that this type supports.
@@ -1283,6 +1271,18 @@ pub trait Float
     /// Returns the largest finite value that this type can represent.
     fn max_value() -> Self;
 
+    /// Returns true if this value is NaN and false otherwise.
+    fn is_nan(self) -> bool;
+    /// Returns true if this value is positive infinity or negative infinity and
+    /// false otherwise.
+    fn is_infinite(self) -> bool;
+    /// Returns true if this number is neither infinite nor NaN.
+    fn is_finite(self) -> bool;
+    /// Returns true if this number is neither zero, infinite, denormal, or NaN.
+    fn is_normal(self) -> bool;
+    /// Returns the category that this number falls into.
+    fn classify(self) -> FpCategory;
+
     /// Returns the mantissa, exponent and sign as integers, respectively.
     fn integer_decode(self) -> (u64, i16, i8);
 
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index c126eb1d6cf..98e3bf2f6ba 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -112,8 +112,6 @@ pub trait FloatMath: Float {
     fn atanh(self) -> Self;
 }
 
-// DEPRECATED
-
 /// Helper function for testing numeric operations
 #[cfg(test)]
 pub fn test_num<T>(ten: T, two: T) where
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
index 08ea1b024c9..4ce15491a0e 100644
--- a/src/libstd/num/uint_macros.rs
+++ b/src/libstd/num/uint_macros.rs
@@ -14,8 +14,6 @@
 
 macro_rules! uint_module { ($T:ty) => (
 
-// String conversion functions and impl num -> str
-
 #[cfg(test)]
 mod tests {
     use prelude::v1::*;