Fix order of methods

diff --git a/src/libcore/num/f32.rs b/src/libcore/num/f32.rs
index 58dc6f4f45b57302770dd7ad829b8d4edb40b1c4..580a612aebb4830cea97d6254d16a52f45d89ca7 100644 (file)
--- a/src/libcore/num/f32.rs
+++ b/src/libcore/num/f32.rs
@@ -551,9 +551,22 @@ fn neg_infinity() -> f32 { -1.0 / 0.0 }
     #[inline(always)]
     fn neg_zero() -> f32 { -0.0 }
 
+    /// Returns `true` if the number is NaN
     #[inline(always)]
     fn is_NaN(&self) -> bool { *self != *self }
 
+    /// Returns `true` if the number is infinite
+    #[inline(always)]
+    fn is_infinite(&self) -> bool {
+        *self == Float::infinity() || *self == Float::neg_infinity()
+    }
+
+    /// Returns `true` if the number is not infinite or NaN
+    #[inline(always)]
+    fn is_finite(&self) -> bool {
+        !(self.is_NaN() || self.is_infinite())
+    }
+
     #[inline(always)]
     fn mantissa_digits() -> uint { 24 }
 
@@ -575,18 +588,6 @@ fn min_10_exp() -> int { -37 }
     #[inline(always)]
     fn max_10_exp() -> int { 38 }
 
-    /// Returns `true` if the number is infinite
-    #[inline(always)]
-    fn is_infinite(&self) -> bool {
-        *self == Float::infinity() || *self == Float::neg_infinity()
-    }
-
-    /// Returns `true` if the number is finite
-    #[inline(always)]
-    fn is_finite(&self) -> bool {
-        !(self.is_NaN() || self.is_infinite())
-    }
-
     ///
     /// Returns the exponential of the number, minus `1`, in a way that is accurate
     /// even if the number is close to zero

diff --git a/src/libcore/num/float.rs b/src/libcore/num/float.rs
index 512d3afc2b622180f6542de4184524544f908d30..95f3a76b800840b02f57f5fc1bf6a3c26ba5ca84 100644 (file)
--- a/src/libcore/num/float.rs
+++ b/src/libcore/num/float.rs
@@ -784,9 +784,22 @@ fn neg_infinity() -> float { -1.0 / 0.0 }
     #[inline(always)]
     fn neg_zero() -> float { -0.0 }
 
+    /// Returns `true` if the number is NaN
     #[inline(always)]
     fn is_NaN(&self) -> bool { *self != *self }
 
+    /// Returns `true` if the number is infinite
+    #[inline(always)]
+    fn is_infinite(&self) -> bool {
+        *self == Float::infinity() || *self == Float::neg_infinity()
+    }
+
+    /// Returns `true` if the number is not infinite or NaN
+    #[inline(always)]
+    fn is_finite(&self) -> bool {
+        !(self.is_NaN() || self.is_infinite())
+    }
+
     #[inline(always)]
     fn mantissa_digits() -> uint { Float::mantissa_digits::<f64>() }
 
@@ -808,18 +821,6 @@ fn min_10_exp() -> int { Float::min_10_exp::<f64>() }
     #[inline(always)]
     fn max_10_exp() -> int { Float::max_10_exp::<f64>() }
 
-    /// Returns `true` if the number is infinite
-    #[inline(always)]
-    fn is_infinite(&self) -> bool {
-        *self == Float::infinity() || *self == Float::neg_infinity()
-    }
-
-    /// Returns `true` if the number is finite
-    #[inline(always)]
-    fn is_finite(&self) -> bool {
-        !(self.is_NaN() || self.is_infinite())
-    }
-
     ///
     /// Returns the exponential of the number, minus `1`, in a way that is accurate
     /// even if the number is close to zero