Move isatty() to utils.rs

[rust.git] / src / rustfmt_diff.rs

diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs
index 3e9fd913d7c67d39f1e5cf443bcc7b33ef1f22fc..3fb228653851541da06dee98136776a044fb88ae 100644 (file)
--- a/src/rustfmt_diff.rs
+++ b/src/rustfmt_diff.rs
@@ -12,6 +12,7 @@
 use std::collections::VecDeque;
 use std::io;
 use term;
+use utils::isatty;
 
 #[derive(Debug, PartialEq)]
 pub enum DiffLine {
@@ -105,25 +106,6 @@ pub fn print_diff<F>(diff: Vec<Mismatch>, get_section_title: F)
         }
         _ => print_diff_basic(diff, get_section_title),
     }
-
-    // isatty shamelessly adapted from cargo.
-    #[cfg(unix)]
-    fn isatty() -> bool {
-        extern crate libc;
-
-        unsafe { libc::isatty(libc::STDOUT_FILENO) != 0 }
-    }
-    #[cfg(windows)]
-    fn isatty() -> bool {
-        extern crate kernel32;
-        extern crate winapi;
-
-        unsafe {
-            let handle = kernel32::GetStdHandle(winapi::winbase::STD_OUTPUT_HANDLE);
-            let mut out = 0;
-            kernel32::GetConsoleMode(handle, &mut out) != 0
-        }
-    }
 }
 
 fn print_diff_fancy<F>(