From 5b13ec9c667d103df53f3db21158e70b92d10f97 Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Tue, 11 Jan 2022 14:14:12 +0100
Subject: [PATCH] nl: clap 3

---
 src/uu/nl/Cargo.toml |  2 +-
 src/uu/nl/src/nl.rs  | 54 ++++++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/uu/nl/Cargo.toml b/src/uu/nl/Cargo.toml
index f9e2cfc55..361126681 100644
--- a/src/uu/nl/Cargo.toml
+++ b/src/uu/nl/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 path = "src/nl.rs"
 
 [dependencies]
-clap = { version = "2.33", features = ["wrap_help"] }
+clap = { version = "3.0", features = ["wrap_help", "cargo"] }
 aho-corasick = "0.7.3"
 libc = "0.2.42"
 memchr = "2.2.0"
diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs
index b004d2b74..1b7910629 100644
--- a/src/uu/nl/src/nl.rs
+++ b/src/uu/nl/src/nl.rs
@@ -140,84 +140,88 @@ 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())
         .name(NAME)
         .version(crate_version!())
-        .usage(USAGE)
-        .arg(Arg::with_name(options::FILE).hidden(true).multiple(true))
+        .override_usage(USAGE)
         .arg(
-            Arg::with_name(options::BODY_NUMBERING)
-                .short("b")
+            Arg::new(options::FILE)
+                .hide(true)
+                .multiple_occurrences(true),
+        )
+        .arg(
+            Arg::new(options::BODY_NUMBERING)
+                .short('b')
                 .long(options::BODY_NUMBERING)
                 .help("use STYLE for numbering body lines")
                 .value_name("SYNTAX"),
         )
         .arg(
-            Arg::with_name(options::SECTION_DELIMITER)
-                .short("d")
+            Arg::new(options::SECTION_DELIMITER)
+                .short('d')
                 .long(options::SECTION_DELIMITER)
                 .help("use CC for separating logical pages")
                 .value_name("CC"),
         )
         .arg(
-            Arg::with_name(options::FOOTER_NUMBERING)
-                .short("f")
+            Arg::new(options::FOOTER_NUMBERING)
+                .short('f')
                 .long(options::FOOTER_NUMBERING)
                 .help("use STYLE for numbering footer lines")
                 .value_name("STYLE"),
         )
         .arg(
-            Arg::with_name(options::HEADER_NUMBERING)
-                .short("h")
+            Arg::new(options::HEADER_NUMBERING)
+                .short('h')
                 .long(options::HEADER_NUMBERING)
                 .help("use STYLE for numbering header lines")
                 .value_name("STYLE"),
         )
         .arg(
-            Arg::with_name(options::LINE_INCREMENT)
-                .short("i")
+            Arg::new(options::LINE_INCREMENT)
+                .short('i')
                 .long(options::LINE_INCREMENT)
                 .help("line number increment at each line")
                 .value_name("NUMBER"),
         )
         .arg(
-            Arg::with_name(options::JOIN_BLANK_LINES)
-                .short("l")
+            Arg::new(options::JOIN_BLANK_LINES)
+                .short('l')
                 .long(options::JOIN_BLANK_LINES)
                 .help("group of NUMBER empty lines counted as one")
                 .value_name("NUMBER"),
         )
         .arg(
-            Arg::with_name(options::NUMBER_FORMAT)
-                .short("n")
+            Arg::new(options::NUMBER_FORMAT)
+                .short('n')
                 .long(options::NUMBER_FORMAT)
                 .help("insert line numbers according to FORMAT")
                 .value_name("FORMAT"),
         )
         .arg(
-            Arg::with_name(options::NO_RENUMBER)
-                .short("p")
+            Arg::new(options::NO_RENUMBER)
+                .short('p')
                 .long(options::NO_RENUMBER)
                 .help("do not reset line numbers at logical pages"),
         )
         .arg(
-            Arg::with_name(options::NUMBER_SEPARATOR)
-                .short("s")
+            Arg::new(options::NUMBER_SEPARATOR)
+                .short('s')
                 .long(options::NUMBER_SEPARATOR)
                 .help("add STRING after (possible) line number")
                 .value_name("STRING"),
         )
         .arg(
-            Arg::with_name(options::STARTING_LINE_NUMBER)
-                .short("v")
+            Arg::new(options::STARTING_LINE_NUMBER)
+                .short('v')
                 .long(options::STARTING_LINE_NUMBER)
                 .help("first line number on each logical page")
                 .value_name("NUMBER"),
         )
         .arg(
-            Arg::with_name(options::NUMBER_WIDTH)
-                .short("w")
+            Arg::new(options::NUMBER_WIDTH)
+                .short('w')
                 .long(options::NUMBER_WIDTH)
                 .help("use NUMBER columns for line numbers")
                 .value_name("NUMBER"),