core: Update all tests for fmt movement

4 files changed, 3 insertions, 12 deletions

diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index 8d3fae7e8b1..e9ea0df2a7b 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -19,7 +19,6 @@ use from_str::FromStr;
 use intrinsics;
 use libc::c_int;
 use num::strconv;
-use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal};
 use num;
 
 pub use core::f32::{RADIX, MANTISSA_DIGITS, DIGITS, EPSILON, MIN_VALUE};
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
index 6b5561f5698..869a275b1d4 100644
--- a/src/libstd/num/f64.rs
+++ b/src/libstd/num/f64.rs
@@ -15,6 +15,7 @@
 use prelude::*;
 
 use from_str::FromStr;
+use intrinsics;
 use libc::c_int;
 use num::strconv;
 use num;
diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
index e1743b301e9..ddff42f68db 100644
--- a/src/libstd/num/int_macros.rs
+++ b/src/libstd/num/int_macros.rs
@@ -68,11 +68,7 @@ pub fn to_str_bytes<U>(n: $T, radix: uint, f: |v: &[u8]| -> U) -> U {
     let mut buf = [0u8, ..65];
     let amt = {
         let mut wr = ::io::BufWriter::new(buf);
-        if radix == 10 {
-            (write!(&mut wr, "{}", n)).unwrap()
-        } else {
-            (write!(&mut wr, "{}", ::fmt::radix(n, radix as u8))).unwrap()
-        }
+        (write!(&mut wr, "{}", ::fmt::radix(n, radix as u8))).unwrap();
         wr.tell().unwrap() as uint
     };
     f(buf.slice(0, amt))
@@ -82,11 +78,7 @@ impl ToStrRadix for $T {
     /// Convert to a string in a given base.
     #[inline]
     fn to_str_radix(&self, radix: uint) -> ~str {
-        if radix == 10 {
-            format!("{}", *self)
-        } else {
-            format!("{}", ::fmt::radix(*self, radix as u8))
-        }
+        format!("{}", ::fmt::radix(*self, radix as u8))
     }
 }
 
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index c6cb57665a3..e58872b8395 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -19,7 +19,6 @@ use num::{Float, FPNaN, FPInfinite, ToPrimitive};
 use num;
 use ops::{Add, Sub, Mul, Div, Rem, Neg};
 use option::{None, Option, Some};
-use result::ResultUnwrap;
 use slice::{CloneableVector, ImmutableVector, MutableVector};
 use std::cmp::{Ord, Eq};
 use str::{StrAllocating, StrSlice};