From 31630859cce142d1a31a92f188682dac3f87d8ac Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 26 Jul 2023 18:09:50 +0300 Subject: [PATCH] replace atty crate with std's isTerminal --- Cargo.lock | 2 -- compiler/rustc_interface/Cargo.toml | 1 - compiler/rustc_interface/src/util.rs | 3 ++- compiler/rustc_session/Cargo.toml | 1 - compiler/rustc_session/src/config.rs | 3 ++- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72f0236fd08..7898bc549a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3732,7 +3732,6 @@ dependencies = [ name = "rustc_interface" version = "0.0.0" dependencies = [ - "atty", "libloading", "rustc-rayon", "rustc-rayon-core", @@ -4196,7 +4195,6 @@ dependencies = [ name = "rustc_session" version = "0.0.0" dependencies = [ - "atty", "bitflags 1.3.2", "getopts", "libc", diff --git a/compiler/rustc_interface/Cargo.toml b/compiler/rustc_interface/Cargo.toml index 7826d42dcb2..2c7438ed9db 100644 --- a/compiler/rustc_interface/Cargo.toml +++ b/compiler/rustc_interface/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [lib] [dependencies] -atty = "0.2.13" libloading = "0.7.1" tracing = "0.1" rustc-rayon-core = { version = "0.5.0", optional = true } diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs index 12d33f06309..ad35dbbc8f9 100644 --- a/compiler/rustc_interface/src/util.rs +++ b/compiler/rustc_interface/src/util.rs @@ -519,7 +519,8 @@ fn multiple_output_types_to_stdout( output_types: &OutputTypes, single_output_file_is_stdout: bool, ) -> bool { - if atty::is(atty::Stream::Stdout) { + use std::io::IsTerminal; + if std::io::stdout().is_terminal() { // If stdout is a tty, check if multiple text output types are // specified by `--emit foo=- --emit bar=-` or `-o - --emit foo,bar` let named_text_types = output_types diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml index 1291d1454a6..e26d25d9a41 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml @@ -4,7 +4,6 @@ version = "0.0.0" edition = "2021" [dependencies] -atty = "0.2.13" bitflags = "1.2.1" getopts = "0.2" rustc_macros = { path = "../rustc_macros" } diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index 36b5c385ab1..f75cd2ae776 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -834,9 +834,10 @@ pub fn is_stdout(&self) -> bool { } pub fn is_tty(&self) -> bool { + use std::io::IsTerminal; match *self { OutFileName::Real(_) => false, - OutFileName::Stdout => atty::is(atty::Stream::Stdout), + OutFileName::Stdout => std::io::stdout().is_terminal(), } }