uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into refactor/add_nix_error_auto_conversion

Browse Source
This commit is contained in:
Sylvestre Ledru
2022-10-30 15:54:13 +01:00
committed by GitHub
parent f117f36313 44cded6c06
commit f2f2f7033e
54 changed files with 412 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+18 -7
View File
@@ -1145,9 +1145,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
version = "0.2.135"
version = "0.2.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
[[package]]
name = "libloading"
@@ -2076,21 +2076,32 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.15"
version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c"
checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca"
dependencies = [
"itoa",
"libc",
"num_threads",
"serde",
"time-core",
"time-macros",
]
[[package]]
name = "time-macros"
version = "0.2.4"
name = "time-core"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
[[package]]
name = "time-macros"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b"
dependencies = [
"time-core",
]
[[package]]
name = "typenum"
out
View File
src/uu/chcon/src/chcon.rs
+5 -5
View File
@@ -100,7 +100,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
}
CommandLineMode::ContextBased { context } => {
let c_context = match os_str_to_c_string(&context) {
let c_context = match os_str_to_c_string(context) {
Ok(context) => context,
Err(_r) => {
@@ -198,7 +198,7 @@ pub fn uu_app() -> Command {
.long(options::REFERENCE)
.value_name("RFILE")
.value_hint(clap::ValueHint::FilePath)
.conflicts_with_all(&[options::USER, options::ROLE, options::TYPE, options::RANGE])
.conflicts_with_all([options::USER, options::ROLE, options::TYPE, options::RANGE])
.help(
"Use security context of RFILE, rather than specifying \
a CONTEXT value.",
@@ -249,7 +249,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sym_links::FOLLOW_ARG_DIR_SYM_LINK)
.short('H')
.requires(options::RECURSIVE)
.overrides_with_all(&[
.overrides_with_all([
options::sym_links::FOLLOW_DIR_SYM_LINKS,
options::sym_links::NO_FOLLOW_SYM_LINKS,
])
@@ -263,7 +263,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sym_links::FOLLOW_DIR_SYM_LINKS)
.short('L')
.requires(options::RECURSIVE)
.overrides_with_all(&[
.overrides_with_all([
options::sym_links::FOLLOW_ARG_DIR_SYM_LINK,
options::sym_links::NO_FOLLOW_SYM_LINKS,
])
@@ -277,7 +277,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sym_links::NO_FOLLOW_SYM_LINKS)
.short('P')
.requires(options::RECURSIVE)
.overrides_with_all(&[
.overrides_with_all([
options::sym_links::FOLLOW_ARG_DIR_SYM_LINK,
options::sym_links::FOLLOW_DIR_SYM_LINKS,
])
src/uu/chgrp/src/chgrp.rs
+1 -1
View File
@@ -146,7 +146,7 @@ pub fn uu_app() -> Command {
Arg::new(options::traverse::NO_TRAVERSE)
.short(options::traverse::NO_TRAVERSE.chars().next().unwrap())
.help("do not traverse any symbolic links (default)")
.overrides_with_all(&[options::traverse::TRAVERSE, options::traverse::EVERY])
.overrides_with_all([options::traverse::TRAVERSE, options::traverse::EVERY])
.action(ArgAction::SetTrue),
)
.arg(
src/uu/chmod/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/chmod.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
libc = "0.2.135"
libc = "0.2.137"
uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["fs", "mode"] }
[[bin]]
src/uu/chown/src/chown.rs
+16 -3
View File
@@ -156,21 +156,21 @@ pub fn uu_app() -> Command {
Arg::new(options::traverse::TRAVERSE)
.short(options::traverse::TRAVERSE.chars().next().unwrap())
.help("if a command line argument is a symbolic link to a directory, traverse it")
.overrides_with_all(&[options::traverse::EVERY, options::traverse::NO_TRAVERSE])
.overrides_with_all([options::traverse::EVERY, options::traverse::NO_TRAVERSE])
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::traverse::EVERY)
.short(options::traverse::EVERY.chars().next().unwrap())
.help("traverse every symbolic link to a directory encountered")
.overrides_with_all(&[options::traverse::TRAVERSE, options::traverse::NO_TRAVERSE])
.overrides_with_all([options::traverse::TRAVERSE, options::traverse::NO_TRAVERSE])
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::traverse::NO_TRAVERSE)
.short(options::traverse::NO_TRAVERSE.chars().next().unwrap())
.help("do not traverse any symbolic links (default)")
.overrides_with_all(&[options::traverse::TRAVERSE, options::traverse::EVERY])
.overrides_with_all([options::traverse::TRAVERSE, options::traverse::EVERY])
.action(ArgAction::SetTrue),
)
.arg(
@@ -246,6 +246,19 @@ fn parse_spec(spec: &str, sep: char) -> UResult<(Option<u32>, Option<u32>)> {
} else {
None
};
if user.chars().next().map(char::is_numeric).unwrap_or(false)
&& group.is_empty()
&& spec != user
{
// if the arg starts with an id numeric value, the group isn't set but the separator is provided,
// we should fail with an error
return Err(USimpleError::new(
1,
format!("invalid spec: {}", spec.quote()),
));
}
Ok((uid, gid))
}
src/uu/cp/Cargo.toml
+1 -1
View File
@@ -21,7 +21,7 @@ path = "src/cp.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
filetime = "0.2"
libc = "0.2.135"
libc = "0.2.137"
quick-error = "2.0.1"
selinux = { version="0.3", optional=true }
uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
src/uu/cp/src/copydir.rs
+22 -1
View File
@@ -66,7 +66,7 @@ fn get_local_to_root_parent(
adjust_canonicalization(path),
adjust_canonicalization(parent),
);
let path = path.strip_prefix(&parent)?;
let path = path.strip_prefix(parent)?;
Ok(path.to_path_buf())
}
None => Ok(path.to_path_buf()),
@@ -303,6 +303,27 @@ pub(crate) fn copy_directory(
.into());
}
// If in `--parents` mode, create all the necessary ancestor directories.
//
// For example, if the command is `cp --parents a/b/c d`, that
// means we need to copy the two ancestor directories first:
//
// a -> d/a
// a/b -> d/a/b
//
let tmp = if options.parents {
if let Some(parent) = root.parent() {
let new_target = target.join(parent);
std::fs::create_dir_all(&new_target)?;
new_target
} else {
target.to_path_buf()
}
} else {
target.to_path_buf()
};
let target = tmp.as_path();
let mut hard_links: Vec<(String, u64)> = vec![];
let preserve_hard_links = options.preserve_hard_links();
src/uu/cp/src/cp.rs
+20 -5
View File
@@ -427,7 +427,7 @@ pub fn uu_app() -> Command {
))
.num_args(0..)
.value_name("ATTR_LIST")
.overrides_with_all(&[
.overrides_with_all([
options::ARCHIVE,
options::PRESERVE_DEFAULT_ATTRIBUTES,
options::NO_PRESERVE,
@@ -443,7 +443,7 @@ pub fn uu_app() -> Command {
Arg::new(options::PRESERVE_DEFAULT_ATTRIBUTES)
.short('p')
.long(options::PRESERVE_DEFAULT_ATTRIBUTES)
.overrides_with_all(&[options::PRESERVE, options::NO_PRESERVE, options::ARCHIVE])
.overrides_with_all([options::PRESERVE, options::NO_PRESERVE, options::ARCHIVE])
.help("same as --preserve=mode,ownership(unix only),timestamps")
.action(ArgAction::SetTrue),
)
@@ -451,7 +451,7 @@ pub fn uu_app() -> Command {
Arg::new(options::NO_PRESERVE)
.long(options::NO_PRESERVE)
.value_name("ATTR_LIST")
.overrides_with_all(&[
.overrides_with_all([
options::PRESERVE_DEFAULT_ATTRIBUTES,
options::PRESERVE,
options::ARCHIVE,
@@ -492,7 +492,7 @@ pub fn uu_app() -> Command {
Arg::new(options::ARCHIVE)
.short('a')
.long(options::ARCHIVE)
.overrides_with_all(&[
.overrides_with_all([
options::PRESERVE_DEFAULT_ATTRIBUTES,
options::PRESERVE,
options::NO_PRESERVE,
@@ -1146,7 +1146,16 @@ fn copy_attribute(source: &Path, dest: &Path, attribute: &Attribute) -> CopyResu
}
#[cfg(not(unix))]
{
return Err("XAttrs are only supported on unix.".to_string().into());
// The documentation for GNU cp states:
//
// > Try to preserve SELinux security context and
// > extended attributes (xattr), but ignore any failure
// > to do that and print no corresponding diagnostic.
//
// so we simply do nothing here.
//
// TODO Silently ignore failures in the `#[cfg(unix)]`
// block instead of terminating immediately on errors.
}
}
};
@@ -1255,6 +1264,12 @@ fn copy_file(
symlinked_files: &mut HashSet<FileInformation>,
source_in_command_line: bool,
) -> CopyResult<()> {
if options.update && options.overwrite == OverwriteMode::Interactive(ClobberMode::Standard) {
// `cp -i --update old new` when `new` exists doesn't copy anything
// and exit with 0
return Ok(());
}
if file_or_link_exists(dest) {
handle_existing_dest(source, dest, options, source_in_command_line)?;
}
src/uu/dd/src/parseargs/unit_tests.rs
+2 -2
View File
@@ -86,7 +86,7 @@ fn unimplemented_flags_should_error() {
fn test_status_level_absent() {
let args = &["if=foo.file", "of=bar.file"];
assert_eq!(Parser::new().parse(args).unwrap().status, None)
assert_eq!(Parser::new().parse(args).unwrap().status, None);
}
#[test]
@@ -96,7 +96,7 @@ fn test_status_level_none() {
assert_eq!(
Parser::new().parse(args).unwrap().status,
Some(StatusLevel::None)
)
);
}
#[test]
src/uu/df/src/df.rs
+9 -9
View File
@@ -509,7 +509,7 @@ pub fn uu_app() -> Command {
.short('B')
.long("block-size")
.value_name("SIZE")
.overrides_with_all(&[OPT_KILO, OPT_BLOCKSIZE])
.overrides_with_all([OPT_KILO, OPT_BLOCKSIZE])
.help(
"scale sizes by SIZE before printing them; e.g.\
'-BM' prints sizes in units of 1,048,576 bytes",
@@ -526,7 +526,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_HUMAN_READABLE_BINARY)
.short('h')
.long("human-readable")
.overrides_with_all(&[OPT_HUMAN_READABLE_DECIMAL, OPT_HUMAN_READABLE_BINARY])
.overrides_with_all([OPT_HUMAN_READABLE_DECIMAL, OPT_HUMAN_READABLE_BINARY])
.help("print sizes in human readable format (e.g., 1K 234M 2G)")
.action(ArgAction::SetTrue),
)
@@ -534,7 +534,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_HUMAN_READABLE_DECIMAL)
.short('H')
.long("si")
.overrides_with_all(&[OPT_HUMAN_READABLE_BINARY, OPT_HUMAN_READABLE_DECIMAL])
.overrides_with_all([OPT_HUMAN_READABLE_BINARY, OPT_HUMAN_READABLE_DECIMAL])
.help("likewise, but use powers of 1000 not 1024")
.action(ArgAction::SetTrue),
)
@@ -550,7 +550,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_KILO)
.short('k')
.help("like --block-size=1K")
.overrides_with_all(&[OPT_BLOCKSIZE, OPT_KILO])
.overrides_with_all([OPT_BLOCKSIZE, OPT_KILO])
.action(ArgAction::SetTrue),
)
.arg(
@@ -564,7 +564,7 @@ pub fn uu_app() -> Command {
.arg(
Arg::new(OPT_NO_SYNC)
.long("no-sync")
.overrides_with_all(&[OPT_SYNC, OPT_NO_SYNC])
.overrides_with_all([OPT_SYNC, OPT_NO_SYNC])
.help("do not invoke sync before getting usage info (default)")
.action(ArgAction::SetTrue),
)
@@ -577,9 +577,9 @@ pub fn uu_app() -> Command {
.require_equals(true)
.use_value_delimiter(true)
.value_parser(OUTPUT_FIELD_LIST)
.default_missing_values(&OUTPUT_FIELD_LIST)
.default_values(&["source", "size", "used", "avail", "pcent", "target"])
.conflicts_with_all(&[OPT_INODES, OPT_PORTABILITY, OPT_PRINT_TYPE])
.default_missing_values(OUTPUT_FIELD_LIST)
.default_values(["source", "size", "used", "avail", "pcent", "target"])
.conflicts_with_all([OPT_INODES, OPT_PORTABILITY, OPT_PRINT_TYPE])
.help(
"use the output format defined by FIELD_LIST, \
or print all fields if FIELD_LIST is omitted.",
@@ -596,7 +596,7 @@ pub fn uu_app() -> Command {
.arg(
Arg::new(OPT_SYNC)
.long("sync")
.overrides_with_all(&[OPT_NO_SYNC, OPT_SYNC])
.overrides_with_all([OPT_NO_SYNC, OPT_SYNC])
.help("invoke sync before getting usage info (non-windows only)")
.action(ArgAction::SetTrue),
)
src/uu/echo/src/echo.rs
+3
View File
@@ -64,6 +64,9 @@ fn print_escaped(input: &str, mut output: impl Write) -> io::Result<bool> {
let mut buffer = ['\\'; 2];
// TODO `cargo +nightly clippy` complains that `.peek()` is never
// called on `iter`. However, `peek()` is called inside the
// `parse_code()` function that borrows `iter`.
let mut iter = input.chars().peekable();
while let Some(mut c) = iter.next() {
let mut start = 1;
src/uu/hashsum/src/hashsum.rs
+2 -2
View File
@@ -278,8 +278,8 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
let tag = matches.get_flag("tag");
let nonames = *matches
.try_get_one("no-names")
.unwrap_or(Some(&false))
.unwrap();
.unwrap_or(None)
.unwrap_or(&false);
let status = matches.get_flag("status");
let quiet = matches.get_flag("quiet") || status;
let strict = matches.get_flag("strict");
src/uu/head/src/head.rs
+4 -4
View File
@@ -59,7 +59,7 @@ pub fn uu_app() -> Command {
NUM bytes of each file\
",
)
.overrides_with_all(&[options::BYTES_NAME, options::LINES_NAME])
.overrides_with_all([options::BYTES_NAME, options::LINES_NAME])
.allow_hyphen_values(true),
)
.arg(
@@ -74,7 +74,7 @@ pub fn uu_app() -> Command {
NUM lines of each file\
",
)
.overrides_with_all(&[options::LINES_NAME, options::BYTES_NAME])
.overrides_with_all([options::LINES_NAME, options::BYTES_NAME])
.allow_hyphen_values(true),
)
.arg(
@@ -83,7 +83,7 @@ pub fn uu_app() -> Command {
.long("quiet")
.visible_alias("silent")
.help("never print headers giving file names")
.overrides_with_all(&[options::VERBOSE_NAME, options::QUIET_NAME])
.overrides_with_all([options::VERBOSE_NAME, options::QUIET_NAME])
.action(ArgAction::SetTrue),
)
.arg(
@@ -91,7 +91,7 @@ pub fn uu_app() -> Command {
.short('v')
.long("verbose")
.help("always print headers giving file names")
.overrides_with_all(&[options::QUIET_NAME, options::VERBOSE_NAME])
.overrides_with_all([options::QUIET_NAME, options::VERBOSE_NAME])
.action(ArgAction::SetTrue),
)
.arg(
src/uu/hostid/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/hostid.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
libc = "0.2.135"
libc = "0.2.137"
uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
[[bin]]
src/uu/hostname/src/hostname.rs
+4 -4
View File
@@ -81,7 +81,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_DOMAIN)
.short('d')
.long("domain")
.overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.overrides_with_all([OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.help("Display the name of the DNS domain if possible")
.action(ArgAction::SetTrue),
)
@@ -89,7 +89,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_IP_ADDRESS)
.short('i')
.long("ip-address")
.overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.overrides_with_all([OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.help("Display the network address(es) of the host")
.action(ArgAction::SetTrue),
)
@@ -97,7 +97,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_FQDN)
.short('f')
.long("fqdn")
.overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.overrides_with_all([OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.help("Display the FQDN (Fully Qualified Domain Name) (default)")
.action(ArgAction::SetTrue),
)
@@ -105,7 +105,7 @@ pub fn uu_app() -> Command {
Arg::new(OPT_SHORT)
.short('s')
.long("short")
.overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.overrides_with_all([OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
.help("Display the short hostname (the portion before the first dot) if possible")
.action(ArgAction::SetTrue),
)
src/uu/id/src/id.rs
+3 -3
View File
@@ -348,7 +348,7 @@ pub fn uu_app() -> Command {
.arg(
Arg::new(options::OPT_AUDIT)
.short('A')
.conflicts_with_all(&[
.conflicts_with_all([
options::OPT_GROUP,
options::OPT_EFFECTIVE_USER,
options::OPT_HUMAN_READABLE,
@@ -382,7 +382,7 @@ pub fn uu_app() -> Command {
Arg::new(options::OPT_GROUPS)
.short('G')
.long(options::OPT_GROUPS)
.conflicts_with_all(&[
.conflicts_with_all([
options::OPT_GROUP,
options::OPT_EFFECTIVE_USER,
options::OPT_CONTEXT,
@@ -443,7 +443,7 @@ pub fn uu_app() -> Command {
Arg::new(options::OPT_CONTEXT)
.short('Z')
.long(options::OPT_CONTEXT)
.conflicts_with_all(&[options::OPT_GROUP, options::OPT_EFFECTIVE_USER])
.conflicts_with_all([options::OPT_GROUP, options::OPT_EFFECTIVE_USER])
.help(CONTEXT_HELP_TEXT)
.action(ArgAction::SetTrue),
)
src/uu/logname/Cargo.toml
+1 -1
View File
@@ -15,7 +15,7 @@ edition = "2021"
path = "src/logname.rs"
[dependencies]
libc = "0.2.135"
libc = "0.2.137"
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
src/uu/ls/src/ls.rs
+28 -28
View File
@@ -981,7 +981,7 @@ pub fn uu_app() -> Command {
])
.hide_possible_values(true)
.require_equals(true)
.overrides_with_all(&[
.overrides_with_all([
options::FORMAT,
options::format::COLUMNS,
options::format::LONG,
@@ -993,7 +993,7 @@ pub fn uu_app() -> Command {
Arg::new(options::format::COLUMNS)
.short('C')
.help("Display the files in columns.")
.overrides_with_all(&[
.overrides_with_all([
options::FORMAT,
options::format::COLUMNS,
options::format::LONG,
@@ -1007,7 +1007,7 @@ pub fn uu_app() -> Command {
.short('l')
.long(options::format::LONG)
.help("Display detailed information.")
.overrides_with_all(&[
.overrides_with_all([
options::FORMAT,
options::format::COLUMNS,
options::format::LONG,
@@ -1020,7 +1020,7 @@ pub fn uu_app() -> Command {
Arg::new(options::format::ACROSS)
.short('x')
.help("List entries in rows instead of in columns.")
.overrides_with_all(&[
.overrides_with_all([
options::FORMAT,
options::format::COLUMNS,
options::format::LONG,
@@ -1042,7 +1042,7 @@ pub fn uu_app() -> Command {
Arg::new(options::format::COMMAS)
.short('m')
.help("List entries separated by commas.")
.overrides_with_all(&[
.overrides_with_all([
options::FORMAT,
options::format::COLUMNS,
options::format::LONG,
@@ -1114,7 +1114,7 @@ pub fn uu_app() -> Command {
"c",
"escape",
])
.overrides_with_all(&[
.overrides_with_all([
options::QUOTING_STYLE,
options::quoting::LITERAL,
options::quoting::ESCAPE,
@@ -1126,7 +1126,7 @@ pub fn uu_app() -> Command {
.short('N')
.long(options::quoting::LITERAL)
.help("Use literal quoting style. Equivalent to `--quoting-style=literal`")
.overrides_with_all(&[
.overrides_with_all([
options::QUOTING_STYLE,
options::quoting::LITERAL,
options::quoting::ESCAPE,
@@ -1139,7 +1139,7 @@ pub fn uu_app() -> Command {
.short('b')
.long(options::quoting::ESCAPE)
.help("Use escape quoting style. Equivalent to `--quoting-style=escape`")
.overrides_with_all(&[
.overrides_with_all([
options::QUOTING_STYLE,
options::quoting::LITERAL,
options::quoting::ESCAPE,
@@ -1152,7 +1152,7 @@ pub fn uu_app() -> Command {
.short('Q')
.long(options::quoting::C)
.help("Use C quoting style. Equivalent to `--quoting-style=c`")
.overrides_with_all(&[
.overrides_with_all([
options::QUOTING_STYLE,
options::quoting::LITERAL,
options::quoting::ESCAPE,
@@ -1166,14 +1166,14 @@ pub fn uu_app() -> Command {
.short('q')
.long(options::HIDE_CONTROL_CHARS)
.help("Replace control characters with '?' if they are not escaped.")
.overrides_with_all(&[options::HIDE_CONTROL_CHARS, options::SHOW_CONTROL_CHARS])
.overrides_with_all([options::HIDE_CONTROL_CHARS, options::SHOW_CONTROL_CHARS])
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::SHOW_CONTROL_CHARS)
.long(options::SHOW_CONTROL_CHARS)
.help("Show control characters 'as is' if they are not escaped.")
.overrides_with_all(&[options::HIDE_CONTROL_CHARS, options::SHOW_CONTROL_CHARS])
.overrides_with_all([options::HIDE_CONTROL_CHARS, options::SHOW_CONTROL_CHARS])
.action(ArgAction::SetTrue),
)
// Time arguments
@@ -1192,7 +1192,7 @@ pub fn uu_app() -> Command {
])
.hide_possible_values(true)
.require_equals(true)
.overrides_with_all(&[options::TIME, options::time::ACCESS, options::time::CHANGE]),
.overrides_with_all([options::TIME, options::time::ACCESS, options::time::CHANGE]),
)
.arg(
Arg::new(options::time::CHANGE)
@@ -1203,7 +1203,7 @@ pub fn uu_app() -> Command {
time. When explicitly sorting by time (--sort=time or -t) or when not \
using a long listing format, sort according to the status change time.",
)
.overrides_with_all(&[options::TIME, options::time::ACCESS, options::time::CHANGE])
.overrides_with_all([options::TIME, options::time::ACCESS, options::time::CHANGE])
.action(ArgAction::SetTrue),
)
.arg(
@@ -1215,7 +1215,7 @@ pub fn uu_app() -> Command {
sorting by time (--sort=time or -t) or when not using a long listing \
format, sort according to the access time.",
)
.overrides_with_all(&[options::TIME, options::time::ACCESS, options::time::CHANGE])
.overrides_with_all([options::TIME, options::time::ACCESS, options::time::CHANGE])
.action(ArgAction::SetTrue),
)
// Hide and ignore
@@ -1251,7 +1251,7 @@ pub fn uu_app() -> Command {
.value_name("field")
.value_parser(["name", "none", "time", "size", "version", "extension"])
.require_equals(true)
.overrides_with_all(&[
.overrides_with_all([
options::SORT,
options::sort::SIZE,
options::sort::TIME,
@@ -1264,7 +1264,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sort::SIZE)
.short('S')
.help("Sort by file size, largest first.")
.overrides_with_all(&[
.overrides_with_all([
options::SORT,
options::sort::SIZE,
options::sort::TIME,
@@ -1278,7 +1278,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sort::TIME)
.short('t')
.help("Sort by modification time (the 'mtime' in the inode), newest first.")
.overrides_with_all(&[
.overrides_with_all([
options::SORT,
options::sort::SIZE,
options::sort::TIME,
@@ -1292,7 +1292,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sort::VERSION)
.short('v')
.help("Natural sort of (version) numbers in the filenames.")
.overrides_with_all(&[
.overrides_with_all([
options::SORT,
options::sort::SIZE,
options::sort::TIME,
@@ -1306,7 +1306,7 @@ pub fn uu_app() -> Command {
Arg::new(options::sort::EXTENSION)
.short('X')
.help("Sort alphabetically by entry extension.")
.overrides_with_all(&[
.overrides_with_all([
options::SORT,
options::sort::SIZE,
options::sort::TIME,
@@ -1324,7 +1324,7 @@ pub fn uu_app() -> Command {
directory. This is especially useful when listing very large directories, \
since not doing any sorting can be noticeably faster.",
)
.overrides_with_all(&[
.overrides_with_all([
options::SORT,
options::sort::SIZE,
options::sort::TIME,
@@ -1343,7 +1343,7 @@ pub fn uu_app() -> Command {
"When showing file information for a symbolic link, show information for the \
file the link references rather than the link itself.",
)
.overrides_with_all(&[
.overrides_with_all([
options::dereference::ALL,
options::dereference::DIR_ARGS,
options::dereference::ARGS,
@@ -1357,7 +1357,7 @@ pub fn uu_app() -> Command {
"Do not dereference symlinks except when they link to directories and are \
given as command line arguments.",
)
.overrides_with_all(&[
.overrides_with_all([
options::dereference::ALL,
options::dereference::DIR_ARGS,
options::dereference::ARGS,
@@ -1369,7 +1369,7 @@ pub fn uu_app() -> Command {
.short('H')
.long(options::dereference::ARGS)
.help("Do not dereference symlinks except when given as command line arguments.")
.overrides_with_all(&[
.overrides_with_all([
options::dereference::ALL,
options::dereference::DIR_ARGS,
options::dereference::ARGS,
@@ -1509,7 +1509,7 @@ pub fn uu_app() -> Command {
none (default), slash (-p), file-type (--file-type), classify (-F)",
)
.value_parser(["none", "slash", "file-type", "classify"])
.overrides_with_all(&[
.overrides_with_all([
options::indicator_style::FILE_TYPE,
options::indicator_style::SLASH,
options::indicator_style::CLASSIFY,
@@ -1545,7 +1545,7 @@ pub fn uu_app() -> Command {
.default_missing_value("always")
.require_equals(true)
.num_args(0..=1)
.overrides_with_all(&[
.overrides_with_all([
options::indicator_style::FILE_TYPE,
options::indicator_style::SLASH,
options::indicator_style::CLASSIFY,
@@ -1556,7 +1556,7 @@ pub fn uu_app() -> Command {
Arg::new(options::indicator_style::FILE_TYPE)
.long(options::indicator_style::FILE_TYPE)
.help("Same as --classify, but do not append '*'")
.overrides_with_all(&[
.overrides_with_all([
options::indicator_style::FILE_TYPE,
options::indicator_style::SLASH,
options::indicator_style::CLASSIFY,
@@ -1568,7 +1568,7 @@ pub fn uu_app() -> Command {
Arg::new(options::indicator_style::SLASH)
.short('p')
.help("Append / indicator to directories.")
.overrides_with_all(&[
.overrides_with_all([
options::indicator_style::FILE_TYPE,
options::indicator_style::SLASH,
options::indicator_style::CLASSIFY,
@@ -1584,7 +1584,7 @@ pub fn uu_app() -> Command {
.value_name("TIME_STYLE")
.env("TIME_STYLE")
.value_parser(NonEmptyStringValueParser::new())
.overrides_with_all(&[options::TIME_STYLE]),
.overrides_with_all([options::TIME_STYLE]),
)
.arg(
Arg::new(options::FULL_TIME)
src/uu/mkfifo/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/mkfifo.rs"
[dependencies]
clap = { version = "4.0", features = ["wrap_help", "cargo"] }
libc = "0.2.135"
libc = "0.2.137"
uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
[[bin]]

Some files were not shown because too many files have changed in this diff Show More