diff options
| author | bors <bors@rust-lang.org> | 2014-11-17 11:22:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-17 11:22:00 +0000 |
| commit | 0047dbe59c41b951d34ce6324f3a8c0e15d523e9 (patch) | |
| tree | e4f717adb4830ca6e737a23c81abbab3bb3a80b5 /src/libcore/fmt/mod.rs | |
| parent | edfb83c9e28df2a8f326d688f3d5b1f6faa72db8 (diff) | |
| parent | ca08540a0039e827114752d11166ea8cb1387068 (diff) | |
| download | rust-0047dbe59c41b951d34ce6324f3a8c0e15d523e9.tar.gz rust-0047dbe59c41b951d34ce6324f3a8c0e15d523e9.zip | |
auto merge of #19027 : nick29581/rust/coercions-4, r=alexcrichton
The forwards compatible parts of #18645, rebased. Converts implicit coercions from `[T, ..n]` to `&[T]` into explicit references.
Diffstat (limited to 'src/libcore/fmt/mod.rs')
| -rw-r--r-- | src/libcore/fmt/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
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) } |
