From 6df2187397c79a0e23c15a1c2e0effbd26289fdf Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Thu, 29 Sep 2022 18:26:30 +0200 Subject: [PATCH] groups: update to clap 4 --- src/uu/groups/Cargo.toml | 2 +- src/uu/groups/src/groups.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/uu/groups/Cargo.toml b/src/uu/groups/Cargo.toml index f16cf0880..a1bacbb47 100644 --- a/src/uu/groups/Cargo.toml +++ b/src/uu/groups/Cargo.toml @@ -15,7 +15,7 @@ edition = "2021" path = "src/groups.rs" [dependencies] -clap = { version = "3.2", features = ["wrap_help", "cargo"] } +clap = { version = "4.0", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["entries", "process"] } [[bin]] diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index f1377234d..1dd692ccd 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -26,7 +26,7 @@ use uucore::{ format_usage, }; -use clap::{crate_version, Arg, Command}; +use clap::{crate_version, Arg, ArgAction, Command}; mod options { pub const USERS: &str = "USERNAME"; @@ -102,7 +102,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app<'a>() -> Command<'a> { +pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) @@ -110,8 +110,7 @@ pub fn uu_app<'a>() -> Command<'a> { .infer_long_args(true) .arg( Arg::new(options::USERS) - .multiple_occurrences(true) - .takes_value(true) + .action(ArgAction::Append) .value_name(options::USERS) .value_hint(clap::ValueHint::Username), )