Merge pull request #241 from ognevny/is_terminal

feat: use `std::io::IsTerminal` instead of `atty` crate

Author: jgarzik

Cargo.lock

@@ -28,10 +28,9 @@ members = [
 ]
 
 [workspace.dependencies]
-atty = "0.2"
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 libc = "0.2"
 regex = "1.10"
 gettext-rs = { path = "./gettext-rs" }
-errno = "0.3"
+errno = "0.3"

Cargo.toml

@@ -11,7 +11,6 @@ plib = { path = "../plib" }
 clap.workspace = true
 gettext-rs.workspace = true
 libc.workspace = true
-atty.workspace = true
 regex.workspace = true
 walkdir = "2"
 users = "0.11"

file/Cargo.toml

@@ -8,7 +8,6 @@ repository = "https://github.com/rustcoreutils/posixutils-rs.git"
 
 [dependencies]
 plib = { path = "../plib" }
-atty.workspace = true
 clap.workspace = true
 libc.workspace = true
 gettext-rs.workspace = true

misc/Cargo.toml

@@ -11,7 +11,6 @@ plib = { path = "../plib" }
 clap.workspace = true
 gettext-rs.workspace = true
 libc.workspace = true
-atty.workspace = true
 dirs = "5.0"
 
 [dev-dependencies]

process/Cargo.toml

@@ -13,7 +13,7 @@ use libc::{dup, dup2, SIGHUP, SIG_IGN};
 use plib::PROJECT_NAME;
 use std::env;
 use std::fs::{File, OpenOptions};
-use std::io;
+use std::io::{self, IsTerminal};
 use std::os::unix::io::AsRawFd;
 use std::process::{self, Command};
 
@@ -45,11 +45,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     // Redirecting stdout and stderr to the nohup.out file if they are connected to a terminal
-    if atty::is(atty::Stream::Stdout) || atty::is(atty::Stream::Stderr) {
+    if io::stdout().is_terminal() || io::stderr().is_terminal() {
         let nohup_out_file =
             get_nohup_out_file().expect("Failed to open nohup.out in current or home directory");
 
-        if atty::is(atty::Stream::Stdout) {
+        if io::stdout().is_terminal() {
             let fd = nohup_out_file.0.as_raw_fd();
 
             if unsafe { dup2(fd, libc::STDOUT_FILENO) } == -1 {
@@ -71,7 +71,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
         }
 
-        if atty::is(atty::Stream::Stderr) {
+        if io::stderr().is_terminal() {
             let fd = nohup_out_file.0.as_raw_fd();
 
             if unsafe { dup2(fd, libc::STDERR_FILENO) } == -1 {

process/nohup.rs

@@ -16,7 +16,6 @@ chrono.workspace = true
 libc.workspace = true
 notify-debouncer-full = "0.3"
 ctor = "0.2"
-atty.workspace = true
 diff = "0.1"
 dirs = "5.0"
 deunicode = "1.6"
@@ -101,4 +100,3 @@ path = "./tsort.rs"
 [[bin]]
 name = "wc"
 path = "./wc.rs"
-

text/Cargo.toml

@@ -14,7 +14,6 @@ gettext-rs.workspace = true
 libc.workspace = true
 regex.workspace = true
 chrono.workspace = true
-atty.workspace = true
 errno.workspace = true
 
 [dev-dependencies]
@@ -87,4 +86,3 @@ path = "./touch.rs"
 [[bin]]
 name = "unlink"
 path = "./unlink.rs"
-

tree/Cargo.toml

@@ -18,9 +18,10 @@ use plib::PROJECT_NAME;
 use std::{
     collections::{HashMap, HashSet},
     ffi::CString,
+    fs,
+    io::{self, IsTerminal},
     os::unix::{ffi::OsStrExt, fs::MetadataExt},
     path::{Path, PathBuf},
-    {fs, io},
 };
 
 /// mv - move files
@@ -54,7 +55,7 @@ impl MvConfig {
         MvConfig {
             force: args.force,
             interactive: args.interactive,
-            is_terminal: atty::is(atty::Stream::Stdin),
+            is_terminal: io::stdin().is_terminal(),
         }
     }
 }

tree/mv.rs

@@ -16,7 +16,8 @@ use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleC
 use plib::PROJECT_NAME;
 use std::{
     ffi::CString,
-    fs, io,
+    fs,
+    io::{self, IsTerminal},
     os::unix::{ffi::OsStrExt, fs::MetadataExt},
     path::{Path, PathBuf},
 };
@@ -440,7 +441,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     textdomain(PROJECT_NAME)?;
     bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
 
-    let is_tty = atty::is(atty::Stream::Stdin);
+    let is_tty = io::stdin().is_terminal();
     let cfg = RmConfig { args, is_tty };
 
     let mut exit_code = 0;