From 430652193be939b9dbdd2487fa1c951da2d67af3 Mon Sep 17 00:00:00 2001 From: Pat Laster Date: Sat, 15 Oct 2022 15:08:28 -0500 Subject: [PATCH] Fixed merge conflicts --- Cargo.lock | 2 +- src/uu/rm/src/rm.rs | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 763d24fa9..149099e8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index f94c4ce46..b45938a86 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -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(