From 6a98c4c7d0f17067cb2caf30153b0059cfc97743 Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Fri, 30 Sep 2022 16:42:49 +0200 Subject: [PATCH] sleep: update to clap 4 --- src/uu/sleep/Cargo.toml | 2 +- src/uu/sleep/src/sleep.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/uu/sleep/Cargo.toml b/src/uu/sleep/Cargo.toml index e5dc7419e..dc0152fd5 100644 --- a/src/uu/sleep/Cargo.toml +++ b/src/uu/sleep/Cargo.toml @@ -15,7 +15,7 @@ edition = "2021" path = "src/sleep.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" } [[bin]] diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs index b48bfd849..a39e9ce6f 100644 --- a/src/uu/sleep/src/sleep.rs +++ b/src/uu/sleep/src/sleep.rs @@ -13,7 +13,7 @@ use uucore::{ format_usage, }; -use clap::{crate_version, Arg, Command}; +use clap::{crate_version, Arg, ArgAction, Command}; static ABOUT: &str = "Pause for NUMBER seconds."; const USAGE: &str = "\ @@ -41,7 +41,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) @@ -52,8 +52,7 @@ pub fn uu_app<'a>() -> Command<'a> { Arg::new(options::NUMBER) .help("pause for NUMBER seconds") .value_name(options::NUMBER) - .index(1) - .multiple_occurrences(true) + .action(ArgAction::Append) .required(true), ) }