Skip to content

Commit

Permalink
Have std::fmt::Formatter implement std::fmt::Write.
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Jun 10, 2015
1 parent 15b028c commit 63da18b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
22 changes: 15 additions & 7 deletions src/libcore/fmt/mod.rs
Expand Up @@ -731,13 +731,6 @@ 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 @@ -899,6 +892,21 @@ impl<'a> Formatter<'a> {
}
}

#[stable(since = "1.2.0", feature = "formatter_write")]
impl<'a> Write for Formatter<'a> {
fn write_str(&mut self, s: &str) -> Result {
self.buf.write_str(s)
}

fn write_char(&mut self, c: char) -> Result {
self.buf.write_char(c)
}

fn write_fmt(&mut self, args: Arguments) -> Result {
write(self.buf, args)
}
}

#[stable(feature = "rust1", since = "1.0.0")]
impl Display for Error {
fn fmt(&self, f: &mut Formatter) -> Result {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/ifmt.rs
Expand Up @@ -15,7 +15,7 @@
#![allow(unknown_features)]
#![feature(box_syntax)]

use std::fmt;
use std::fmt::{self, Write};
use std::usize;

struct A;
Expand Down

0 comments on commit 63da18b

Please sign in to comment.