mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 19:47:45 +00:00
Use std::io::IsTerminal instead of is-terminal
This commit is contained in:
parent
794977409a
commit
4992cb9b86
17 changed files with 8 additions and 31 deletions
8
Cargo.lock
generated
8
Cargo.lock
generated
|
@ -389,7 +389,6 @@ dependencies = [
|
|||
"filetime",
|
||||
"glob",
|
||||
"hex-literal",
|
||||
"is-terminal",
|
||||
"libc",
|
||||
"nix",
|
||||
"once_cell",
|
||||
|
@ -2311,7 +2310,6 @@ name = "uu_cat"
|
|||
version = "0.0.21"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"is-terminal",
|
||||
"nix",
|
||||
"thiserror",
|
||||
"uucore",
|
||||
|
@ -2411,7 +2409,6 @@ version = "0.0.21"
|
|||
dependencies = [
|
||||
"bstr",
|
||||
"clap",
|
||||
"is-terminal",
|
||||
"memchr",
|
||||
"uucore",
|
||||
]
|
||||
|
@ -2679,7 +2676,6 @@ dependencies = [
|
|||
"chrono",
|
||||
"clap",
|
||||
"glob",
|
||||
"is-terminal",
|
||||
"lscolors",
|
||||
"number_prefix",
|
||||
"once_cell",
|
||||
|
@ -2732,7 +2728,6 @@ version = "0.0.21"
|
|||
dependencies = [
|
||||
"clap",
|
||||
"crossterm",
|
||||
"is-terminal",
|
||||
"nix",
|
||||
"unicode-segmentation",
|
||||
"unicode-width",
|
||||
|
@ -2773,7 +2768,6 @@ name = "uu_nohup"
|
|||
version = "0.0.21"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"is-terminal",
|
||||
"libc",
|
||||
"uucore",
|
||||
]
|
||||
|
@ -3072,7 +3066,6 @@ version = "0.0.21"
|
|||
dependencies = [
|
||||
"clap",
|
||||
"fundu",
|
||||
"is-terminal",
|
||||
"libc",
|
||||
"memchr",
|
||||
"notify",
|
||||
|
@ -3162,7 +3155,6 @@ name = "uu_tty"
|
|||
version = "0.0.21"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"is-terminal",
|
||||
"nix",
|
||||
"uucore",
|
||||
]
|
||||
|
|
|
@ -286,7 +286,6 @@ gcd = "2.3"
|
|||
glob = "0.3.1"
|
||||
half = "2.2"
|
||||
indicatif = "0.17"
|
||||
is-terminal = "0.4.9"
|
||||
itertools = "0.11.0"
|
||||
libc = "0.2.147"
|
||||
lscolors = { version = "0.15.0", default-features = false, features = [
|
||||
|
@ -491,7 +490,6 @@ time = { workspace = true, features = ["local-offset"] }
|
|||
unindent = "0.2"
|
||||
uucore = { workspace = true, features = ["entries", "process", "signals"] }
|
||||
walkdir = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
hex-literal = "0.4.1"
|
||||
rstest = { workspace = true }
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ path = "src/cat.rs"
|
|||
[dependencies]
|
||||
clap = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
uucore = { workspace = true, features = ["fs", "pipes"] }
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
|
|
|
@ -7,9 +7,8 @@
|
|||
|
||||
// last synced with: cat (GNU coreutils) 8.13
|
||||
use clap::{crate_version, Arg, ArgAction, Command};
|
||||
use is_terminal::IsTerminal;
|
||||
use std::fs::{metadata, File};
|
||||
use std::io::{self, Read, Write};
|
||||
use std::io::{self, IsTerminal, Read, Write};
|
||||
use thiserror::Error;
|
||||
use uucore::display::Quotable;
|
||||
use uucore::error::UResult;
|
||||
|
|
|
@ -19,7 +19,6 @@ clap = { workspace = true }
|
|||
uucore = { workspace = true, features = ["ranges"] }
|
||||
memchr = { workspace = true }
|
||||
bstr = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
|
||||
[[bin]]
|
||||
name = "cut"
|
||||
|
|
|
@ -7,9 +7,8 @@
|
|||
|
||||
use bstr::io::BufReadExt;
|
||||
use clap::{crate_version, Arg, ArgAction, Command};
|
||||
use is_terminal::IsTerminal;
|
||||
use std::fs::File;
|
||||
use std::io::{stdin, stdout, BufReader, BufWriter, Read, Write};
|
||||
use std::io::{stdin, stdout, BufReader, BufWriter, IsTerminal, Read, Write};
|
||||
use std::path::Path;
|
||||
use uucore::display::Quotable;
|
||||
use uucore::error::{FromIo, UResult, USimpleError};
|
||||
|
|
|
@ -25,7 +25,6 @@ glob = { workspace = true }
|
|||
lscolors = { workspace = true }
|
||||
uucore = { workspace = true, features = ["entries", "fs"] }
|
||||
once_cell = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
selinux = { workspace = true, optional = true }
|
||||
|
||||
[[bin]]
|
||||
|
|
|
@ -10,12 +10,11 @@ use clap::{
|
|||
crate_version, Arg, ArgAction, Command,
|
||||
};
|
||||
use glob::{MatchOptions, Pattern};
|
||||
use is_terminal::IsTerminal;
|
||||
use lscolors::LsColors;
|
||||
use number_prefix::NumberPrefix;
|
||||
use once_cell::unsync::OnceCell;
|
||||
use std::collections::HashSet;
|
||||
use std::num::IntErrorKind;
|
||||
use std::{collections::HashSet, io::IsTerminal};
|
||||
|
||||
#[cfg(windows)]
|
||||
use std::os::windows::fs::MetadataExt;
|
||||
|
|
|
@ -18,7 +18,6 @@ path = "src/more.rs"
|
|||
clap = { workspace = true }
|
||||
uucore = { workspace = true }
|
||||
crossterm = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
unicode-width = { workspace = true }
|
||||
unicode-segmentation = { workspace = true }
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
use std::{
|
||||
fs::File,
|
||||
io::{stdin, stdout, BufReader, Read, Stdout, Write},
|
||||
io::{stdin, stdout, BufReader, IsTerminal, Read, Stdout, Write},
|
||||
path::Path,
|
||||
time::Duration,
|
||||
};
|
||||
|
@ -22,7 +22,6 @@ use crossterm::{
|
|||
terminal::{self, Clear, ClearType},
|
||||
};
|
||||
|
||||
use is_terminal::IsTerminal;
|
||||
use unicode_segmentation::UnicodeSegmentation;
|
||||
use unicode_width::UnicodeWidthStr;
|
||||
use uucore::display::Quotable;
|
||||
|
|
|
@ -17,7 +17,6 @@ path = "src/nohup.rs"
|
|||
[dependencies]
|
||||
clap = { workspace = true }
|
||||
libc = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
uucore = { workspace = true, features = ["fs"] }
|
||||
|
||||
[[bin]]
|
||||
|
|
|
@ -6,14 +6,13 @@
|
|||
// spell-checker:ignore (ToDO) execvp SIGHUP cproc vprocmgr cstrs homeout
|
||||
|
||||
use clap::{crate_version, Arg, ArgAction, Command};
|
||||
use is_terminal::IsTerminal;
|
||||
use libc::{c_char, dup2, execvp, signal};
|
||||
use libc::{SIGHUP, SIG_IGN};
|
||||
use std::env;
|
||||
use std::ffi::CString;
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::fs::{File, OpenOptions};
|
||||
use std::io::Error;
|
||||
use std::io::{Error, IsTerminal};
|
||||
use std::os::unix::prelude::*;
|
||||
use std::path::{Path, PathBuf};
|
||||
use uucore::display::Quotable;
|
||||
|
|
|
@ -22,7 +22,6 @@ memchr = { workspace = true }
|
|||
notify = { workspace = true }
|
||||
uucore = { workspace = true }
|
||||
same-file = { workspace = true }
|
||||
is-terminal = { workspace = true }
|
||||
fundu = { workspace = true }
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
|
|
|
@ -10,9 +10,9 @@ use crate::{parse, platform, Quotable};
|
|||
use clap::{crate_version, value_parser};
|
||||
use clap::{Arg, ArgAction, ArgMatches, Command};
|
||||
use fundu::{DurationParser, SaturatingInto};
|
||||
use is_terminal::IsTerminal;
|
||||
use same_file::Handle;
|
||||
use std::ffi::OsString;
|
||||
use std::io::IsTerminal;
|
||||
use std::time::Duration;
|
||||
use uucore::error::{UResult, USimpleError, UUsageError};
|
||||
use uucore::parse_size::{parse_size, ParseSizeError};
|
||||
|
|
|
@ -17,7 +17,6 @@ path = "src/tty.rs"
|
|||
[dependencies]
|
||||
clap = { workspace = true }
|
||||
nix = { workspace = true, features = ["term"] }
|
||||
is-terminal = { workspace = true }
|
||||
uucore = { workspace = true, features = ["fs"] }
|
||||
|
||||
[[bin]]
|
||||
|
|
|
@ -8,8 +8,7 @@
|
|||
// spell-checker:ignore (ToDO) ttyname filedesc
|
||||
|
||||
use clap::{crate_version, Arg, ArgAction, Command};
|
||||
use is_terminal::IsTerminal;
|
||||
use std::io::Write;
|
||||
use std::io::{IsTerminal, Write};
|
||||
use std::os::unix::io::AsRawFd;
|
||||
use uucore::error::{set_exit_code, UResult};
|
||||
use uucore::{format_usage, help_about, help_usage};
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// For the full copyright and license information, please view the LICENSE
|
||||
// file that was distributed with this source code.
|
||||
use crate::common::util::TestScenario;
|
||||
use is_terminal::IsTerminal;
|
||||
use std::io::IsTerminal;
|
||||
|
||||
#[test]
|
||||
fn test_more_no_arg() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue