Replace use_colored_tty with iatty crate

Author: nrc

Cargo.lock

@@ -32,6 +32,7 @@ cargo-fmt = []
 rustfmt-format-diff = []
 
 [dependencies]
+isatty = "0.1"
 itertools = "0.7"
 toml = "0.4"
 serde = "1.0"
@@ -53,9 +54,3 @@ failure = "0.1.1"
 [dev-dependencies]
 assert_cli = "0.6"
 lazy_static = "1.0.0"
-
-[target.'cfg(unix)'.dependencies]
-libc = "0.2.11"
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3" }

Cargo.toml

@@ -28,8 +28,8 @@ use failure::err_msg;
 use getopts::{Matches, Options};
 
 use rustfmt::{
-    checkstyle_footer, checkstyle_header, format_input, load_config, use_colored_tty, CliOptions,
-    Color, Config, EmitMode, ErrorKind, FileLines, FileName, Input, Summary, Verbosity,
+    checkstyle_footer, checkstyle_header, format_input, load_config, CliOptions, Color, Config,
+    EmitMode, ErrorKind, FileLines, FileName, Input, Summary, Verbosity,
 };
 
 fn main() {
@@ -316,7 +316,7 @@ fn format_and_emit_report(input: Input, config: &Config) -> Result<Summary, fail
             if report.has_warnings() {
                 match term::stderr() {
                     Some(ref t)
-                        if use_colored_tty(config.color())
+                        if config.color().use_colored_tty()
                             && t.supports_color()
                             && t.supports_attr(term::Attr::Bold) =>
                     {

src/bin/main.rs

@@ -12,6 +12,8 @@ use config::config_type::ConfigType;
 use config::lists::*;
 use config::{Config, FileName};
 
+use isatty::stdout_isatty;
+
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 
@@ -191,6 +193,16 @@ configuration_option_enum! { Color:
     Auto,
 }
 
+impl Color {
+    pub fn use_colored_tty(&self) -> bool {
+        match self {
+            Color::Always => true,
+            Color::Never => false,
+            Color::Auto => stdout_isatty(),
+        }
+    }
+}
+
 configuration_option_enum! { Verbosity:
     // Emit more.
     Verbose,

src/config/options.rs

@@ -19,6 +19,7 @@
 extern crate derive_new;
 extern crate diff;
 extern crate failure;
+extern crate isatty;
 extern crate itertools;
 #[cfg(test)]
 #[macro_use]
@@ -61,7 +62,6 @@ pub use config::summary::Summary;
 pub use config::{
     load_config, CliOptions, Color, Config, EmitMode, FileLines, FileName, Verbosity,
 };
-pub use utils::use_colored_tty;
 
 #[macro_use]
 mod utils;

src/lib.rs

@@ -13,7 +13,6 @@ use diff;
 use std::collections::VecDeque;
 use std::io;
 use std::io::Write;
-use utils::use_colored_tty;
 
 #[derive(Debug, PartialEq)]
 pub enum DiffLine {
@@ -53,7 +52,7 @@ impl OutputWriter {
     // for colorized output and the capabilities of the terminal.
     pub fn new(color: Color) -> Self {
         if let Some(t) = term::stdout() {
-            if use_colored_tty(color) && t.supports_color() {
+            if color.use_colored_tty() && t.supports_color() {
                 return OutputWriter { terminal: Some(t) };
             }
         }

src/rustfmt_diff.rs

@@ -18,7 +18,6 @@ use syntax::ast::{
 use syntax::codemap::{BytePos, Span, NO_EXPANSION};
 use syntax::ptr;
 
-use config::Color;
 use rewrite::RewriteContext;
 use shape::Shape;
 
@@ -376,32 +375,6 @@ pub fn left_most_sub_expr(e: &ast::Expr) -> &ast::Expr {
     }
 }
 
-// isatty shamelessly adapted from cargo.
-#[cfg(unix)]
-pub fn isatty() -> bool {
-    extern crate libc;
-
-    unsafe { libc::isatty(libc::STDOUT_FILENO) != 0 }
-}
-#[cfg(windows)]
-pub fn isatty() -> bool {
-    extern crate winapi;
-
-    unsafe {
-        let handle = winapi::um::processenv::GetStdHandle(winapi::um::winbase::STD_OUTPUT_HANDLE);
-        let mut out = 0;
-        winapi::um::consoleapi::GetConsoleMode(handle, &mut out) != 0
-    }
-}
-
-pub fn use_colored_tty(color: Color) -> bool {
-    match color {
-        Color::Always => true,
-        Color::Never => false,
-        Color::Auto => isatty(),
-    }
-}
-
 pub fn starts_with_newline(s: &str) -> bool {
     s.starts_with('\n') || s.starts_with("\r\n")
 }