OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #26846 - P1start:print-maybe-styled-macro, r=pnkfelix

Browse Source 
`EmitterWriter::print_maybe_styled` was basically always used with `format!`, so this macro makes some code cleaner. It should also remove some unnecessary allocations (most `print_maybe_styled` invocations allocated a `String` previously, whereas the new macro uses `write_fmt` to write the formatted string directly to the terminal).

This probably could have been part of #26838, but it’s too late now. It’s also rebased on #26838’s branch because otherwise pretty much all of the changes in this PR would conflict with the other PR’s changes.
This commit is contained in:
bors 2015-07-29 00:28:55 +00:00
commit 8d432fbf10
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/libsyntax/diagnostic.rs
View File

@ -322,6 +322,20 @@ enum Destination {
Raw(Box<Write + Send>),
}
/// Do not use this for messages that end in `\n` – use `println_maybe_styled` instead. See
/// `EmitterWriter::print_maybe_styled` for details.
macro_rules! print_maybe_styled {
($writer: expr, $style: expr, $($arg: tt)*) => {
$writer.print_maybe_styled(format_args!($($arg)*), $style, false)
}
}
macro_rules! println_maybe_styled {
($writer: expr, $style: expr, $($arg: tt)*) => {
$writer.print_maybe_styled(format_args!($($arg)*), $style, true)
}
}
impl EmitterWriter {
pub fn stderr(color_config: ColorConfig,
registry: Option<diagnostics::registry::Registry>) -> EmitterWriter {
@ -350,8 +364,9 @@ impl EmitterWriter {
}
fn print_maybe_styled(&mut self,
msg: &str,
color: term::attr::Attr) -> io::Result<()> {
args: fmt::Arguments,
color: term::attr::Attr,
print_newline_at_end: bool) -> io::Result<()> {
match self.dst {
Terminal(ref mut t) => {
try!(t.attr(color));
@ -368,17 +383,22 @@ impl EmitterWriter {
// once, which still leaves the opportunity for interleaved output
// to be miscolored. We assume this is rare enough that we don't
// have to worry about it.
if msg.ends_with("\n") {
try!(t.write_all(msg[..msg.len()-1].as_bytes()));
try!(t.reset());
try!(t.write_all(b"\n"));
try!(t.write_fmt(args));
try!(t.reset());
if print_newline_at_end {
t.write_all(b"\n")
} else {
try!(t.write_all(msg.as_bytes()));
try!(t.reset());
Ok(())
}
}
Raw(ref mut w) => {
try!(w.write_fmt(args));
if print_newline_at_end {
w.write_all(b"\n")
} else {
Ok(())
}
Ok(())
}
Raw(ref mut w) => w.write_all(msg.as_bytes()),
}
}
@ -388,15 +408,14 @@ impl EmitterWriter {
try!(write!(&mut self.dst, "{} ", topic));
}
try!(self.print_maybe_styled(&format!("{}: ", lvl.to_string()),
term::attr::ForegroundColor(lvl.color())));
try!(self.print_maybe_styled(&format!("{}", msg),
term::attr::Bold));
try!(print_maybe_styled!(self, term::attr::ForegroundColor(lvl.color()),
"{}: ", lvl.to_string()));
try!(print_maybe_styled!(self, term::attr::Bold, "{}", msg));
match code {
Some(code) => {
let style = term::attr::ForegroundColor(term::color::BRIGHT_MAGENTA);
try!(self.print_maybe_styled(&format!(" [{}]", code.clone()), style));
try!(print_maybe_styled!(self, style, " [{}]", code.clone()));
}
None => ()
}
@ -627,8 +646,8 @@ impl EmitterWriter {
s.pop();
}
try!(self.print_maybe_styled(&format!("{}\n", s),
term::attr::ForegroundColor(lvl.color())));
try!(println_maybe_styled!(self, term::attr::ForegroundColor(lvl.color()),
"{}", s));
}
}
Ok(())
@ -700,9 +719,8 @@ impl EmitterWriter {
}
}
s.push('^');
s.push('\n');
self.print_maybe_styled(&s[..],
term::attr::ForegroundColor(lvl.color()))
println_maybe_styled!(self, term::attr::ForegroundColor(lvl.color()),
"{}", s)
}
fn print_macro_backtrace(&mut self,