diff options
| author | Camelid <camelidcamel@gmail.com> | 2021-01-10 18:07:05 -0800 |
|---|---|---|
| committer | Camelid <camelidcamel@gmail.com> | 2021-01-11 19:59:25 -0800 |
| commit | 8c431607440d454e15c456b14f0282d3487c411e (patch) | |
| tree | a7e148d00b2ee564e683474c2a7aa3708a47effd | |
| parent | 04064416644eba7351b1a457c1de27d28a750c95 (diff) | |
| download | rust-8c431607440d454e15c456b14f0282d3487c411e.tar.gz rust-8c431607440d454e15c456b14f0282d3487c411e.zip | |
driver: Use `atty` instead of rolling our own
Rationale: - `atty` is widely used in the Rust ecosystem - We already use it (in `rustc_errors` and other places) - We shouldn't be rolling our own TTY detector when there's a widely-used, well-tested package that we can use
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | compiler/rustc_driver/Cargo.toml | 1 | ||||
| -rw-r--r-- | compiler/rustc_driver/src/lib.rs | 35 |
3 files changed, 4 insertions, 33 deletions
diff --git a/Cargo.lock b/Cargo.lock index 322b1632031..ab452c97e7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3652,6 +3652,7 @@ dependencies = [ name = "rustc_driver" version = "0.0.0" dependencies = [ + "atty", "libc", "rustc_ast", "rustc_ast_pretty", diff --git a/compiler/rustc_driver/Cargo.toml b/compiler/rustc_driver/Cargo.toml index 0adc006b624..b88b556d143 100644 --- a/compiler/rustc_driver/Cargo.toml +++ b/compiler/rustc_driver/Cargo.toml @@ -9,6 +9,7 @@ crate-type = ["dylib"] [dependencies] libc = "0.2" +atty = "0.2" tracing = { version = "0.1.18" } tracing-subscriber = { version = "0.2.13", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] } tracing-tree = "0.1.6" diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index c2a0d8ef7ea..509f81e1653 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -546,43 +546,12 @@ impl Compilation { #[derive(Copy, Clone)] pub struct RustcDefaultCalls; -// FIXME remove these and use winapi 0.3 instead -// Duplicates: bootstrap/compile.rs, librustc_errors/emitter.rs -#[cfg(unix)] -fn stdout_isatty() -> bool { - unsafe { libc::isatty(libc::STDOUT_FILENO) != 0 } -} - -#[cfg(windows)] fn stdout_isatty() -> bool { - use winapi::um::consoleapi::GetConsoleMode; - use winapi::um::processenv::GetStdHandle; - use winapi::um::winbase::STD_OUTPUT_HANDLE; - - unsafe { - let handle = GetStdHandle(STD_OUTPUT_HANDLE); - let mut out = 0; - GetConsoleMode(handle, &mut out) != 0 - } + atty::is(atty::Stream::Stdout) } -// FIXME remove these and use winapi 0.3 instead -#[cfg(unix)] -fn stderr_isatty() -> bool { - unsafe { libc::isatty(libc::STDERR_FILENO) != 0 } -} - -#[cfg(windows)] fn stderr_isatty() -> bool { - use winapi::um::consoleapi::GetConsoleMode; - use winapi::um::processenv::GetStdHandle; - use winapi::um::winbase::STD_ERROR_HANDLE; - - unsafe { - let handle = GetStdHandle(STD_ERROR_HANDLE); - let mut out = 0; - GetConsoleMode(handle, &mut out) != 0 - } + atty::is(atty::Stream::Stderr) } fn handle_explain(registry: Registry, code: &str, output: ErrorOutputType) { |