Skip to content

Commit

Permalink
Add a write_char method to std::fmt::Formatter.
Browse files Browse the repository at this point in the history
This is the logical next step after #24661, but I’m less sure about this one.
  • Loading branch information
SimonSapin committed Jun 10, 2015
1 parent 8025bc9 commit 15b028c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/libcore/fmt/mod.rs
Expand Up @@ -731,6 +731,13 @@ impl<'a> Formatter<'a> {
self.buf.write_str(data)
}

/// Writes a `char` to the underlying buffer contained within this
/// formatter.
#[stable(feature = "fmt_write_char", since = "1.1.0")]
pub fn write_char(&mut self, c: char) -> Result {
self.buf.write_char(c)
}

/// Writes some formatted information into this instance
#[stable(feature = "rust1", since = "1.0.0")]
pub fn write_fmt(&mut self, fmt: Arguments) -> Result {
Expand Down Expand Up @@ -965,10 +972,7 @@ impl Debug for char {
#[stable(feature = "rust1", since = "1.0.0")]
impl Display for char {
fn fmt(&self, f: &mut Formatter) -> Result {
let mut utf8 = [0; 4];
let amt = self.encode_utf8(&mut utf8).unwrap_or(0);
let s: &str = unsafe { mem::transmute(&utf8[..amt]) };
Display::fmt(s, f)
f.write_char(*self)
}
}

Expand Down
9 changes: 9 additions & 0 deletions src/test/run-pass/ifmt.rs
Expand Up @@ -21,6 +21,7 @@ use std::usize;
struct A;
struct B;
struct C;
struct D;

impl fmt::LowerHex for A {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Expand All @@ -37,6 +38,13 @@ impl fmt::Display for C {
f.pad_integral(true, "☃", "123")
}
}
impl fmt::Binary for D {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
try!(f.write_str("aa"));
try!(f.write_char('☃'));
f.write_str("bb")
}
}

macro_rules! t {
($a:expr, $b:expr) => { assert_eq!($a, $b) }
Expand Down Expand Up @@ -90,6 +98,7 @@ pub fn main() {
t!(format!("{foo_bar}", foo_bar=1), "1");
t!(format!("{}", 5 + 5), "10");
t!(format!("{:#4}", C), "☃123");
t!(format!("{:b}", D), "aa☃bb");

let a: &fmt::Debug = &1;
t!(format!("{:?}", a), "1");
Expand Down

0 comments on commit 15b028c

Please sign in to comment.