Skip to content

Commit

Permalink
Fix error:/warning: coloring inconsistency with rustc
Browse files Browse the repository at this point in the history
  • Loading branch information
snejugal committed Aug 24, 2019
1 parent 44d9e09 commit dd653eb
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/cargo/core/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T: fmt::Display>(&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),
}
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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)?,
Expand Down

0 comments on commit dd653eb

Please sign in to comment.