Merge pull request #394 from peschkaj/378-rustc-colors

Autodetect TTY and add colors

Author: brson

Cargo.lock

@@ -5,7 +5,7 @@ use time::precise_time_s;
 use rustup::Notification;
 use rustup_dist::Notification as In;
 use rustup_utils::Notification as Un;
-use tty;
+use rustup_utils::tty;
 
 /// Keep track of this many past download amounts
 const DOWNLOAD_TRACK_COUNT: usize = 5;

src/rustup-cli/download_tracker.rs

@@ -40,7 +40,6 @@ mod proxy_mode;
 mod setup_mode;
 mod rustup_mode;
 mod self_update;
-mod tty;
 mod job;
 mod term2;
 mod errors;

src/rustup-cli/main.rs

@@ -4,7 +4,7 @@
 
 use std::io;
 use term;
-use tty;
+use rustup_utils::tty;
 
 pub use term::color;
 pub use term::Attr;

src/rustup-cli/term2.rs

@@ -17,6 +17,7 @@ hyper = "0.7.0"
 rand = "0.3.11"
 scopeguard = "0.1.2"
 error-chain = { path = "../error-chain", version = "0.1.9" }
+libc = "0.2.0"
 
 [target.x86_64-pc-windows-gnu.dependencies]
 winapi = "0.2.4"

src/rustup-utils/Cargo.toml

@@ -24,10 +24,14 @@ extern crate advapi32;
 #[cfg(windows)]
 extern crate userenv;
 
+#[cfg(unix)]
+extern crate libc;
+
 pub mod notify;
 pub mod errors;
 pub mod notifications;
 pub mod raw;
+pub mod tty;
 pub mod utils;
 
 pub use errors::*;

src/rustup-utils/src/lib.rs

@@ -30,8 +30,19 @@ pub fn run_command_for_dir<S: AsRef<OsStr>>(cmd: Command,
 
 fn telemetry_rustc<S: AsRef<OsStr>>(mut cmd: Command, args: &[S], cfg: &Cfg) -> Result<()> {
     let now = Instant::now();
-
+    
     cmd.args(&args[1..]);
+    
+    let has_color_args = (&args).iter().any(|e| {
+        let e = e.as_ref().to_str().unwrap_or("");
+        e.starts_with("--color")
+    });
+    
+    if stderr_isatty() && !has_color_args
+    {
+        cmd.arg("--color");
+        cmd.arg("always"); 
+    }
 
     // FIXME rust-lang/rust#32254. It's not clear to me
     // when and why this is needed.
@@ -132,3 +143,27 @@ fn run_command_for_dir_without_telemetry<S: AsRef<OsStr>>(mut cmd: Command, args
         }
     }    
 }
+
+#[cfg(unix)]
+fn stderr_isatty() -> bool {
+    use libc;
+    unsafe { libc::isatty(libc::STDERR_FILENO) != 0 }
+}
+
+#[cfg(windows)]
+fn stderr_isatty() -> bool {
+    type DWORD = u32;
+    type BOOL = i32;
+    type HANDLE = *mut u8;
+    const STD_ERROR_HANDLE: DWORD = -12i32 as DWORD;
+    extern "system" {
+        fn GetStdHandle(which: DWORD) -> HANDLE;
+        fn GetConsoleMode(hConsoleHandle: HANDLE,
+                          lpMode: *mut DWORD) -> BOOL;
+    }
+    unsafe {
+        let handle = GetStdHandle(STD_ERROR_HANDLE);
+        let mut out = 0;
+        GetConsoleMode(handle, &mut out) != 0
+    }
+}

src/rustup-cli/tty.rs renamed to src/rustup-utils/src/tty.rs

@@ -10,6 +10,8 @@ extern crate regex;
 extern crate itertools;
 extern crate rustc_serialize;
 extern crate time;
+#[cfg(unix)]
+extern crate libc;
 
 pub use errors::*;
 pub use notifications::*;