about summary refs log tree commit diff
path: root/src/libstd/fmt.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-05-11 11:14:14 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-15 23:22:15 -0700
commit2e2160b026d7a2b2d13c3a2b4d6aa073ab3ff43f (patch)
treee4bebf36fa24fe0fe4dd6846291c59520ef1be28 /src/libstd/fmt.rs
parentd12a136b2247ab5cf5b32e44a890b3a871c0ce90 (diff)
downloadrust-2e2160b026d7a2b2d13c3a2b4d6aa073ab3ff43f.tar.gz
rust-2e2160b026d7a2b2d13c3a2b4d6aa073ab3ff43f.zip
core: Update all tests for fmt movement
Diffstat (limited to 'src/libstd/fmt.rs')
-rw-r--r--src/libstd/fmt.rs12
1 files changed, 10 insertions, 2 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) {