diff --git a/src/uu/basenc/Cargo.toml b/src/uu/basenc/Cargo.toml index 7e177ef6d..c0f2b99cc 100644 --- a/src/uu/basenc/Cargo.toml +++ b/src/uu/basenc/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" path = "src/basenc.rs" [dependencies] -clap = { version = "2.33", features = ["wrap_help"] } +clap = { version = "3.0", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features = ["encoding"] } uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" } uu_base32 = { version=">=0.0.8", package="uu_base32", path="../base32"} diff --git a/src/uu/basenc/src/basenc.rs b/src/uu/basenc/src/basenc.rs index e4b24c351..9f67bf488 100644 --- a/src/uu/basenc/src/basenc.rs +++ b/src/uu/basenc/src/basenc.rs @@ -45,17 +45,17 @@ fn usage() -> String { format!("{0} [OPTION]... [FILE]", uucore::execution_phrase()) } -pub fn uu_app() -> App<'static, 'static> { +pub fn uu_app<'a>() -> App<'a> { let mut app = base_common::base_app(ABOUT); for encoding in ENCODINGS { - app = app.arg(Arg::with_name(encoding.0).long(encoding.0)); + app = app.arg(Arg::new(encoding.0).long(encoding.0)); } app } fn parse_cmd_args(args: impl uucore::Args) -> UResult<(Config, Format)> { let usage = usage(); - let matches = uu_app().usage(&usage[..]).get_matches_from( + let matches = uu_app().override_usage(&usage[..]).get_matches_from( args.collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(), );