From df9a851260f7178ba7c0886641cd73a76dde7a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 24 Nov 2022 17:02:06 +0100 Subject: [PATCH] chore: replace atty with is-terminal --- crates/concolor/Cargo.toml | 4 ++-- crates/concolor/src/color/mod.rs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/concolor/Cargo.toml b/crates/concolor/Cargo.toml index 2ceed99..1b1647f 100644 --- a/crates/concolor/Cargo.toml +++ b/crates/concolor/Cargo.toml @@ -22,7 +22,7 @@ std = [] core = ["std", "bitflags"] # Cross-crate API control is not guaranteed until our 1.0 release api_unstable = ["core"] -interactive = ["core", "atty"] +interactive = ["core", "dep:is-terminal"] clicolor = ["core", "concolor-query"] no_color = ["core", "concolor-query"] term = ["core", "concolor-query"] @@ -34,4 +34,4 @@ features = ["auto", "api_unstable"] [dependencies] concolor-query = { version = "^0.1.0", path = "../query", optional = true } bitflags = { version = "1", optional = true } -atty = { version = "0.2.14", optional = true } +is-terminal = { version = "0.4", optional = true } diff --git a/crates/concolor/src/color/mod.rs b/crates/concolor/src/color/mod.rs index 6d0d228..25af54d 100644 --- a/crates/concolor/src/color/mod.rs +++ b/crates/concolor/src/color/mod.rs @@ -111,10 +111,12 @@ fn init() -> usize { #[cfg(feature = "interactive")] { - if atty::is(atty::Stream::Stdout) { + use is_terminal::IsTerminal; + use std::io::{stderr, stdout}; + if stdout().is_terminal() { flags |= InternalFlags::TTY_STDOUT; } - if atty::is(atty::Stream::Stderr) { + if stderr().is_terminal() { flags |= InternalFlags::TTY_STDERR; } }