diff --git a/src/uu/groups/Cargo.toml b/src/uu/groups/Cargo.toml index 3a86a0024..412e35f28 100644 --- a/src/uu/groups/Cargo.toml +++ b/src/uu/groups/Cargo.toml @@ -17,7 +17,7 @@ path = "src/groups.rs" [dependencies] uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "process"] } uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" } -clap = { version = "2.33", features = ["wrap_help"] } +clap = { version = "3.0", features = ["wrap_help", "cargo"] } [[bin]] name = "groups" diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index 70980780d..fac12df99 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -73,7 +73,7 @@ fn infallible_gid2grp(gid: &u32) -> String { pub fn uumain(args: impl uucore::Args) -> UResult<()> { let usage = usage(); - let matches = uu_app().usage(&usage[..]).get_matches_from(args); + let matches = uu_app().override_usage(&usage[..]).get_matches_from(args); let users: Vec = matches .values_of(options::USERS) @@ -105,13 +105,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { Ok(()) } -pub fn uu_app() -> App<'static, 'static> { +pub fn uu_app<'a>() -> App<'a> { App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( - Arg::with_name(options::USERS) - .multiple(true) + Arg::new(options::USERS) + .multiple_occurrences(true) .takes_value(true) .value_name(options::USERS), )