Refactoring TTY checks into rustup-utils

src/rustup-cli/download_tracker.rs

@@ -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/main.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/term2.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-utils/Cargo.toml

@@ -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/src/lib.rs

@@ -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/command.rs

@@ -33,10 +33,12 @@ fn telemetry_rustc<S: AsRef<OsStr>>(mut cmd: Command, args: &[S], cfg: &Cfg) ->
 
     cmd.args(&args[1..]);
 
-    if stderr_isatty() && !(&args).iter().any(|e| {
-            let e = e.as_ref().to_str().unwrap_or("");
-            e == "--color"
-        }) 
+    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");