Merge pull request #405 from str4d/359-replace-atty

age: Replace `atty` with `is-terminal`
str4d · Aug 6, 2023 · ea42d81 · ea42d81
2 parents 3b29ef6 + 4d81bb0
commit ea42d81
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/age/Cargo.toml b/age/Cargo.toml
@@ -73,8 +73,8 @@ web-sys = { version = "0.3", optional = true, features = ["Window", "Performance
 memchr = { version = "2.5", optional = true }
 
 # Common CLI dependencies
-atty = { version = "0.2", optional = true }
 console = { version = "0.15", optional = true, default-features = false }
+is-terminal = { version = "0.4", optional = true }
 rpassword = { version = "7", optional = true }
 
 [target.'cfg(any(unix, windows))'.dependencies]
@@ -102,7 +102,7 @@ criterion-cycles-per-byte = "0.5"
 default = []
 armor = []
 async = ["futures", "memchr"]
-cli-common = ["atty", "console", "pinentry", "rpassword"]
+cli-common = ["console", "is-terminal", "pinentry", "rpassword"]
 plugin = ["age-core/plugin", "which", "wsl"]
 ssh = [
     "aes",

diff --git a/age/src/cli_common/file_io.rs b/age/src/cli_common/file_io.rs
@@ -7,6 +7,7 @@ use std::io::{self, Read, Write};
 #[cfg(unix)]
 use std::os::unix::fs::OpenOptionsExt;
 
+use is_terminal::IsTerminal;
 use zeroize::Zeroize;
 
 use crate::{fl, util::LINE_ENDING, wfl, wlnfl};
@@ -61,7 +62,7 @@ impl InputReader {
 
     /// Returns true if this input is from a terminal, and a user is likely typing it.
     pub fn is_terminal(&self) -> bool {
-        matches!(self, Self::Stdin(_)) && atty::is(atty::Stream::Stdin)
+        matches!(self, Self::Stdin(_)) && io::stdin().is_terminal()
     }
 }
 

diff --git a/supply-chain/config.toml b/supply-chain/config.toml
@@ -322,10 +322,6 @@ criteria = "safe-to-deploy"
 version = "0.8.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.hermit-abi]]
-version = "0.1.19"
-criteria = "safe-to-deploy"
-
 [[exemptions.hermit-abi]]
 version = "0.3.2"
 criteria = "safe-to-deploy"

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
@@ -166,16 +166,6 @@ criteria = "safe-to-deploy"
 version = "0.1.6"
 notes = "Contains no unsafe code, no IO, no build.rs."
 
-[[audits.bytecode-alliance.audits.atty]]
-who = "Alex Crichton <alex@alexcrichton.com>"
-criteria = "safe-to-deploy"
-version = "0.2.14"
-notes = """
-Contains only unsafe code for what this crate's purpose is and only accesses
-the environment's terminal information when asked. Does its stated purpose and
-no more.
-"""
-
 [[audits.bytecode-alliance.audits.base64]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"