From 8ba10936b0bd01a44baa964cee929c6c2d297ce3 Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Tue, 11 Jan 2022 14:25:51 +0100
Subject: [PATCH] printenv: clap 3

---
 src/uu/printenv/Cargo.toml      |  2 +-
 src/uu/printenv/src/printenv.rs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/uu/printenv/Cargo.toml b/src/uu/printenv/Cargo.toml
index 799e114bc..438d50834 100644
--- a/src/uu/printenv/Cargo.toml
+++ b/src/uu/printenv/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 path = "src/printenv.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" }
 uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs
index c3f996865..747d7fa7e 100644
--- a/src/uu/printenv/src/printenv.rs
+++ b/src/uu/printenv/src/printenv.rs
@@ -25,7 +25,7 @@ fn usage() -> String {
 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 variables: Vec<String> = matches
         .values_of(ARG_VARIABLES)
@@ -61,19 +61,19 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     }
 }
 
-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_NULL)
-                .short("0")
+            Arg::new(OPT_NULL)
+                .short('0')
                 .long(OPT_NULL)
                 .help("end each output line with 0 byte rather than newline"),
         )
         .arg(
-            Arg::with_name(ARG_VARIABLES)
-                .multiple(true)
+            Arg::new(ARG_VARIABLES)
+                .multiple_occurrences(true)
                 .takes_value(true)
                 .min_values(1),
         )