From db1e630c6c5b256b53ae841fce5a3344bfe73399 Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Tue, 11 Jan 2022 13:24:00 +0100 Subject: [PATCH] dirname: clap 3 --- src/uu/dirname/Cargo.toml | 2 +- src/uu/dirname/src/dirname.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/uu/dirname/Cargo.toml b/src/uu/dirname/Cargo.toml index 7946459f3..98157b82a 100644 --- a/src/uu/dirname/Cargo.toml +++ b/src/uu/dirname/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/dirname.rs" [dependencies] -clap = { version = "2.33", features = ["wrap_help"] } +clap = { version = "3.0", features = ["wrap_help", "cargo"] } libc = "0.2.42" uucore = { version=">=0.0.10", package="uucore", path="../../uucore" } uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" } diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index 129c9369e..ce1e9423b 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -39,7 +39,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let after_help = get_long_usage(); let matches = uu_app() - .usage(&usage[..]) + .override_usage(&usage[..]) .after_help(&after_help[..]) .get_matches_from(args); @@ -83,15 +83,15 @@ 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()) .about(ABOUT) .version(crate_version!()) .arg( - Arg::with_name(options::ZERO) + Arg::new(options::ZERO) .long(options::ZERO) - .short("z") + .short('z') .help("separate output with NUL rather than newline"), ) - .arg(Arg::with_name(options::DIR).hidden(true).multiple(true)) + .arg(Arg::new(options::DIR).hide(true).multiple_occurrences(true)) }