system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-07-23 19:04:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse source
This commit is contained in:
Pat Laster 2022-10-15 15:08:28 -05:00
parent 7e62945fd3
commit 430652193b
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2713,7 +2713,7 @@ name = "uu_rm"
version = "0.0.16"
dependencies = [
"clap 4.0.14",
"libc"
"libc",
"remove_dir_all 0.7.0",
"uucore",
"walkdir",

15
src/uu/rm/src/rm.rs
View file

@ -196,11 +196,14 @@ pub fn uu_app() -> Command {
.overrides_with_all(&[OPT_PROMPT_MORE, OPT_INTERACTIVE])
.action(ArgAction::SetTrue),
)
.arg(Arg::new(OPT_PROMPT_MORE).short('I').help(
"prompt once before removing more than three files, or when removing recursively. \
Less intrusive than -i, while still giving some protection against most mistakes",
).overrides_with_all(&[OPT_PROMPT, OPT_INTERACTIVE])
).action(ArgAction::SetTrue))
.arg(
Arg::new(OPT_PROMPT_MORE)
.short('I')
.help("prompt once before removing more than three files, or when removing recursively. \
Less intrusive than -i, while still giving some protection against most mistakes")
.overrides_with_all(&[OPT_PROMPT, OPT_INTERACTIVE])
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(OPT_INTERACTIVE)
.long(OPT_INTERACTIVE)
@ -208,7 +211,7 @@ pub fn uu_app() -> Command {
"prompt according to WHEN: never, once (-I), or always (-i). Without WHEN, \
prompts always",
)
.value_name("WHEN"),
.value_name("WHEN")
.overrides_with_all(&[OPT_PROMPT, OPT_PROMPT_MORE]),
)
.arg(