Add colors

Author: jyn514

Cargo.lock

@@ -183,6 +183,7 @@ dependencies = [
  "pretty_assertions",
  "serde",
  "serde_json",
+ "termcolor",
  "time",
  "toml",
  "winapi 0.3.9",

src/bootstrap/Cargo.toml

@@ -50,6 +50,7 @@ time = "0.1"
 ignore = "0.4.10"
 opener = "0.4"
 merge = "0.1.0"
+termcolor = "1.0"
 
 [target.'cfg(windows)'.dependencies.winapi]
 version = "0.3"

src/bootstrap/builder.rs

@@ -14,6 +14,7 @@ use std::time::{Duration, Instant};
 
 use build_helper::{output, t};
 use lazy_static::lazy_static;
+use termcolor::{ColorSpec, WriteColor};
 
 use crate::cache::{Cache, Interned, INTERNER};
 use crate::check;
@@ -1562,6 +1563,7 @@ impl<'a> Builder<'a> {
             let paths = S::should_run(ShouldRun::new(self)).paths;
             let path = paths.iter().map(|pathset| pathset.path(self)).next();
             let instructions = ReplicationStep {
+                color: self.build.config.color,
                 name: step.name(),
                 cmd: self.kind,
                 path: path.expect("no paths for step"),
@@ -1600,6 +1602,7 @@ impl<'a> Builder<'a> {
 }
 
 struct ReplicationStep {
+    color: Color,
     cmd: Kind,
     name: &'static str,
     path: PathBuf,
@@ -1610,11 +1613,26 @@ lazy_static! {
 }
 
 pub(crate) extern "C" fn print_replication_steps() {
+    use std::io::Write;
     if let Some(step) = CURRENT_INSTRUCTIONS.lock().expect("mutex guard is dropped on panic").take()
     {
-        println!("note: failed while building {}", step.name);
-        println!(
-            "help: to replicate this failure, run `./x.py {} {}`",
+        let mut stdout = termcolor::StandardStream::stdout(step.color.into());
+        // ignore errors; we're exiting anyway
+        let mut yellow = ColorSpec::new();
+        yellow.set_fg(Some(termcolor::Color::Yellow));
+        let _ = stdout.set_color(&yellow);
+        let _ = write!(stdout, "note");
+        let _ = stdout.reset();
+        let _ = writeln!(stdout, ": failed while building {}", step.name);
+
+        let mut blue = ColorSpec::new();
+        blue.set_fg(Some(termcolor::Color::Blue));
+        let _ = stdout.set_color(&blue);
+        let _ = write!(stdout, "help");
+        let _ = stdout.reset();
+        let _ = writeln!(
+            stdout,
+            ": to replicate this failure, run `./x.py {} {}`",
             step.cmd,
             step.path.display()
         );

src/bootstrap/flags.rs

@@ -9,12 +9,14 @@ use std::process;
 
 use build_helper::t;
 use getopts::Options;
+use termcolor::ColorChoice;
 
 use crate::builder::Builder;
 use crate::config::{Config, TargetSelection};
 use crate::setup::Profile;
 use crate::{Build, DocTests};
 
+#[derive(Copy, Clone)]
 pub enum Color {
     Always,
     Never,
@@ -27,6 +29,16 @@ impl Default for Color {
     }
 }
 
+impl From<Color> for ColorChoice {
+    fn from(c: Color) -> Self {
+        match c {
+            Color::Always => ColorChoice::Always,
+            Color::Never => ColorChoice::Never,
+            Color::Auto => ColorChoice::Auto,
+        }
+    }
+}
+
 impl std::str::FromStr for Color {
     type Err = ();