From 8b9971c54ea58013020189d43123177c63e88190 Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Thu, 29 Sep 2022 23:02:09 +0200 Subject: [PATCH] nice: update to clap 4 --- src/uu/nice/Cargo.toml | 2 +- src/uu/nice/src/nice.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml index d294466a0..c062d4db3 100644 --- a/src/uu/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -15,7 +15,7 @@ edition = "2021" path = "src/nice.rs" [dependencies] -clap = { version = "3.2", features = ["wrap_help", "cargo"] } +clap = { version = "4.0", features = ["wrap_help", "cargo"] } libc = "0.2.135" nix = { version = "0.25", default-features = false } uucore = { version=">=0.0.16", package="uucore", path="../../uucore" } diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index 439b30f37..f4fa5a195 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -15,7 +15,7 @@ use std::ffi::CString; use std::io::Error; use std::ptr; -use clap::{crate_version, Arg, Command}; +use clap::{crate_version, Arg, ArgAction, Command}; use uucore::{ error::{set_exit_code, UClapError, UResult, USimpleError, UUsageError}, format_usage, @@ -100,7 +100,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()) .about(ABOUT) .override_usage(format_usage(USAGE)) @@ -112,12 +112,11 @@ pub fn uu_app<'a>() -> Command<'a> { .short('n') .long(options::ADJUSTMENT) .help("add N to the niceness (default is 10)") - .takes_value(true) .allow_hyphen_values(true), ) .arg( Arg::new(options::COMMAND) - .multiple_occurrences(true) + .action(ArgAction::Append) .value_hint(clap::ValueHint::CommandName), ) }