diff options
| author | bors <bors@rust-lang.org> | 2013-09-05 15:00:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-05 15:00:49 -0700 |
| commit | 6f9ce0948a47dbbb5a0ed9aae12e2cce6755465a (patch) | |
| tree | 64a0cb6ba9e7796da1ffad8044dda1bb6d33adf2 /src/libstd/fmt | |
| parent | d1dde99e4b3d43d044cdead7240bbd5f0d7a0ce5 (diff) | |
| parent | de39874801761197bf10bf8d04bde1aa2bd82e15 (diff) | |
| download | rust-6f9ce0948a47dbbb5a0ed9aae12e2cce6755465a.tar.gz rust-6f9ce0948a47dbbb5a0ed9aae12e2cce6755465a.zip | |
auto merge of #8997 : fhahn/rust/issue_8985, r=catamorphism,brson
Patch for #8985
Diffstat (limited to 'src/libstd/fmt')
| -rw-r--r-- | src/libstd/fmt/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 8d50f5efa48..ef036340412 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -468,7 +468,7 @@ pub unsafe fn write(output: &mut io::Writer, pub unsafe fn format(fmt: &[rt::Piece], args: &[Argument]) -> ~str { let mut output = MemWriter::new(); write(&mut output as &mut io::Writer, fmt, args); - return str::from_bytes_owned(output.inner()); + return str::from_utf8_owned(output.inner()); } impl<'self> Formatter<'self> { @@ -589,7 +589,7 @@ impl<'self> Formatter<'self> { fn runplural(&mut self, value: uint, pieces: &[rt::Piece]) { do ::uint::to_str_bytes(value, 10) |buf| { - let valuestr = str::from_bytes_slice(buf); + let valuestr = str::from_utf8_slice(buf); for piece in pieces.iter() { self.run(piece, Some(valuestr)); } |