From dd653ebe4c8460c5690d611af9bfc0b9fabbeb24 Mon Sep 17 00:00:00 2001 From: SnejUgal Date: Sat, 24 Aug 2019 23:19:12 +0700 Subject: [PATCH] Fix `error:`/`warning:` coloring inconsistency with rustc --- src/cargo/core/shell.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs index 0e1d878f518..742b42a3eee 100644 --- a/src/cargo/core/shell.rs +++ b/src/cargo/core/shell.rs @@ -210,14 +210,14 @@ impl Shell { if self.needs_clear { self.err_erase_line(); } - self.err.print(&"error:", Some(&message), Red, false) + self.err.print(&"error", Some(&message), Red, false) } /// Prints an amber 'warning' message. pub fn warn(&mut self, message: T) -> CargoResult<()> { match self.verbosity { Verbosity::Quiet => Ok(()), - _ => self.print(&"warning:", Some(&message), Yellow, false), + _ => self.print(&"warning", Some(&message), Yellow, false), } } @@ -318,6 +318,8 @@ impl ShellOut { write!(stream, "{:>12}", status)?; } else { write!(stream, "{}", status)?; + stream.set_color(ColorSpec::new().set_bold(true))?; + write!(stream, ":")?; } stream.reset()?; match message { @@ -329,7 +331,7 @@ impl ShellOut { if justified { write!(w, "{:>12}", status)?; } else { - write!(w, "{}", status)?; + write!(w, "{}:", status)?; } match message { Some(message) => writeln!(w, " {}", message)?,