From 5702313e9cf0c69785eaac76d8ae717b878a2b99 Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Tue, 11 Jan 2022 14:16:20 +0100
Subject: [PATCH] nproc: clap 3

---
 src/uu/nproc/Cargo.toml   |  2 +-
 src/uu/nproc/src/nproc.rs | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/uu/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml
index 49c584237..d95108875 100644
--- a/src/uu/nproc/Cargo.toml
+++ b/src/uu/nproc/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/nproc.rs"
 [dependencies]
 libc = "0.2.42"
 num_cpus = "1.10"
-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=["fs"] }
 uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs
index 4ab1378b0..583cb003b 100644
--- a/src/uu/nproc/src/nproc.rs
+++ b/src/uu/nproc/src/nproc.rs
@@ -33,7 +33,7 @@ fn usage() -> String {
 #[uucore_procs::gen_uumain]
 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 mut ignore = match matches.value_of(OPT_IGNORE) {
         Some(numstr) => match numstr.parse() {
@@ -71,19 +71,17 @@ 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(OPT_ALL)
-                .short("")
+            Arg::new(OPT_ALL)
                 .long(OPT_ALL)
                 .help("print the number of cores available to the system"),
         )
         .arg(
-            Arg::with_name(OPT_IGNORE)
-                .short("")
+            Arg::new(OPT_IGNORE)
                 .long(OPT_IGNORE)
                 .takes_value(true)
                 .help("ignore up to N cores"),