core: Update all tests for fmt movement

8 files changed, 29 insertions, 17 deletions

diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs
index 4e19b92bcfc..86b77a46a39 100644
--- a/src/libstd/fmt.rs
+++ b/src/libstd/fmt.rs
@@ -285,10 +285,10 @@ use std::io;
 format_args!(fmt::format, "this returns {}", "~str");
 
 let some_writer: &mut io::Writer = &mut io::stdout();
-format_args!(|args| { fmt::write(some_writer, args) }, "print with a {}", "closure");
+format_args!(|args| { write!(some_writer, "{}", args) }, "print with a {}", "closure");
 
 fn my_fmt_fn(args: &fmt::Arguments) {
-    fmt::write(&mut io::stdout(), args);
+    write!(&mut io::stdout(), "{}", args);
 }
 format_args!(my_fmt_fn, "or a {} too", "function");
 # }
@@ -490,6 +490,7 @@ use repr;
 use result::{Ok, Err};
 use str::{StrAllocating};
 use str;
+use strbuf::StrBuf;
 use slice::Vector;
 
 pub use core::fmt::{Formatter, Result, FormatWriter, Show, rt};
@@ -550,6 +551,13 @@ pub fn format(args: &Arguments) -> ~str {
     str::from_utf8(output.unwrap().as_slice()).unwrap().to_owned()
 }
 
+/// Temporary transition utility
+pub fn format_strbuf(args: &Arguments) -> StrBuf {
+    let mut output = io::MemWriter::new();
+    let _ = write!(&mut output, "{}", args);
+    str::from_utf8(output.unwrap().as_slice()).unwrap().into_strbuf()
+}
+
 impl<T> Poly for T {
     fn fmt(&self, f: &mut Formatter) -> Result {
         match (f.width, f.precision) {
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index 88ed7e9c0d3..fc760e6fe4c 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -308,9 +308,9 @@ impl fmt::Show for Command {
     /// non-utf8 data is lossily converted using the utf8 replacement
     /// character.
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        try!(write!(f.buf, "{}", str::from_utf8_lossy(self.program.as_bytes_no_nul())));
+        try!(write!(f, "{}", str::from_utf8_lossy(self.program.as_bytes_no_nul())));
         for arg in self.args.iter() {
-            try!(write!(f.buf, " '{}'", str::from_utf8_lossy(arg.as_bytes_no_nul())));
+            try!(write!(f, " '{}'", str::from_utf8_lossy(arg.as_bytes_no_nul())));
         }
         Ok(())
     }
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};
diff --git a/src/libstd/owned.rs b/src/libstd/owned.rs
index 3af12c5154c..bd6684b3905 100644
--- a/src/libstd/owned.rs
+++ b/src/libstd/owned.rs
@@ -14,6 +14,7 @@ use any::{Any, AnyRefExt};
 use clone::Clone;
 use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering};
 use default::Default;
+use fmt;
 use intrinsics;
 use mem;
 use raw::TraitObject;
@@ -99,3 +100,16 @@ impl AnyOwnExt for Box<Any> {
         }
     }
 }
+
+impl<T: fmt::Show> fmt::Show for Box<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(not(stage0))]
+impl fmt::Show for Box<Any> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Box<Any>")
+    }
+}
diff --git a/src/libstd/task.rs b/src/libstd/task.rs
index 7fb61c29112..5c875b4a2ad 100644
--- a/src/libstd/task.rs
+++ b/src/libstd/task.rs
@@ -49,7 +49,6 @@ use str::{Str, SendStr, IntoMaybeOwned};
 
 #[cfg(test)] use any::AnyRefExt;
 #[cfg(test)] use owned::AnyOwnExt;
-#[cfg(test)] use realstd::result::ResultUnwrap;
 #[cfg(test)] use result;
 #[cfg(test)] use str::StrAllocating;