From 590276941974f058394abc540d22cdd33968254f Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sun, 18 May 2025 11:23:07 +0200 Subject: [PATCH] Remove unmaintained atty, use std::io::IsTerminal --- Cargo.lock | 22 ---------------------- Cargo.toml | 2 -- src/uu/sed/Cargo.toml | 1 - src/uu/sed/src/processor.rs | 4 ++-- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 573fa582..acee64ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,17 +76,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -310,15 +299,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "iana-time-zone" version = "0.1.63" @@ -690,7 +670,6 @@ checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" name = "sed" version = "0.0.1" dependencies = [ - "atty", "chrono", "clap", "clap_complete", @@ -888,7 +867,6 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" name = "uu_sed" version = "0.0.1" dependencies = [ - "atty", "clap", "memmap2", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index b1e7845f..8adb7417 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,6 @@ feat_common_core = [ ] [workspace.dependencies] -atty = "0.2" bytesize = "2.0.0" chrono = { version = "0.4.37", default-features = false, features = [ "clock", @@ -52,7 +51,6 @@ xattr = "1.3.1" [dependencies] -atty = { workspace = true } clap = { workspace = true } clap_complete = { workspace = true } clap_mangen = { workspace = true } diff --git a/src/uu/sed/Cargo.toml b/src/uu/sed/Cargo.toml index b593b615..3cca2ca8 100644 --- a/src/uu/sed/Cargo.toml +++ b/src/uu/sed/Cargo.toml @@ -13,7 +13,6 @@ categories = ["command-line-utilities"] [dependencies] -atty = { workspace = true } clap = { workspace = true } once_cell = { workspace = true } regex = { workspace = true } diff --git a/src/uu/sed/src/processor.rs b/src/uu/sed/src/processor.rs index a799ceb9..fcbc143f 100644 --- a/src/uu/sed/src/processor.rs +++ b/src/uu/sed/src/processor.rs @@ -15,8 +15,8 @@ use crate::command::{ use crate::fast_io::{IOChunk, LineReader, OutputBuffer}; use crate::in_place::InPlace; use crate::named_writer; -use atty::Stream; use std::cell::RefCell; +use std::io::{self, IsTerminal}; use std::path::PathBuf; use std::rc::Rc; use uucore::error::{UResult, USimpleError}; @@ -476,7 +476,7 @@ pub fn process_all_files( files: Vec, mut context: ProcessingContext, ) -> UResult<()> { - context.unbuffered = context.unbuffered || atty::is(Stream::Stdout); + context.unbuffered = context.unbuffered || io::stdout().is_terminal(); let mut in_place = InPlace::new(context.clone())?; let last_file_index = files.len() - 1;