Rollup merge of #114098 - klensy:drop-atty, r=fee1-dead
replace atty crate with std's IsTerminal
This commit is contained in:
commit
dea5b4fff3
@ -3734,7 +3734,6 @@ dependencies = [
|
||||
name = "rustc_interface"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"libloading",
|
||||
"rustc-rayon",
|
||||
"rustc-rayon-core",
|
||||
@ -4198,7 +4197,6 @@ dependencies = [
|
||||
name = "rustc_session"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"bitflags 1.3.2",
|
||||
"getopts",
|
||||
"libc",
|
||||
|
@ -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 }
|
||||
|
@ -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
|
||||
|
@ -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" }
|
||||
|
@ -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(),
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user