提交 15b028c5 编写于 作者: S Simon Sapin

Add a write_char method to std::fmt::Formatter.

This is the logical next step after #24661, but I’m less sure about this one.
上级 8025bc96
......@@ -731,6 +731,13 @@ pub fn write_str(&mut self, data: &str) -> Result {
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 {
......@@ -965,10 +972,7 @@ fn fmt(&self, f: &mut Formatter) -> Result {
#[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)
}
}
......
......@@ -21,6 +21,7 @@
struct A;
struct B;
struct C;
struct D;
impl fmt::LowerHex for A {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
......@@ -37,6 +38,13 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
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) }
......@@ -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");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册