diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-11-17 21:39:01 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-11-17 22:41:33 +1300 |
| commit | ca08540a0039e827114752d11166ea8cb1387068 (patch) | |
| tree | 53b03a7c1563b089518fdcf1be7e9d789fdd0897 /src/libcore/fmt | |
| parent | 803aacd5aef78f90fdd06ae7653fc20eec224992 (diff) | |
| download | rust-ca08540a0039e827114752d11166ea8cb1387068.tar.gz rust-ca08540a0039e827114752d11166ea8cb1387068.zip | |
Fix fallout from coercion removal
Diffstat (limited to 'src/libcore/fmt')
| -rw-r--r-- | src/libcore/fmt/float.rs | 2 | ||||
| -rw-r--r-- | src/libcore/fmt/mod.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs index 6a6a2fe4a6d..bb3c8e71a52 100644 --- a/src/libcore/fmt/float.rs +++ b/src/libcore/fmt/float.rs @@ -315,7 +315,7 @@ pub fn float_to_str_bytes_common<T: Float, U>( } } - let mut filler = Filler { buf: buf, end: &mut end }; + let mut filler = Filler { buf: &mut buf, end: &mut end }; match sign { SignNeg => { let _ = format_args!(|args| { diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 380ca82783a..2d33d5b5525 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -392,7 +392,7 @@ impl<'a> Formatter<'a> { let write_prefix = |f: &mut Formatter| { for c in sign.into_iter() { let mut b = [0, ..4]; - let n = c.encode_utf8(b).unwrap_or(0); + let n = c.encode_utf8(&mut b).unwrap_or(0); try!(f.buf.write(b[..n])); } if prefixed { f.buf.write(prefix.as_bytes()) } @@ -497,7 +497,7 @@ impl<'a> Formatter<'a> { }; let mut fill = [0u8, ..4]; - let len = self.fill.encode_utf8(fill).unwrap_or(0); + let len = self.fill.encode_utf8(&mut fill).unwrap_or(0); for _ in range(0, pre_pad) { try!(self.buf.write(fill[..len])); @@ -586,7 +586,7 @@ impl Char for char { use char::Char; let mut utf8 = [0u8, ..4]; - let amt = self.encode_utf8(utf8).unwrap_or(0); + let amt = self.encode_utf8(&mut utf8).unwrap_or(0); let s: &str = unsafe { mem::transmute(utf8[..amt]) }; String::fmt(s, f) } |
