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

---
 src/uu/mkfifo/Cargo.toml    |  2 +-
 src/uu/mkfifo/src/mkfifo.rs | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/uu/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml
index fa4c458fc..d593f75e9 100644
--- a/src/uu/mkfifo/Cargo.toml
+++ b/src/uu/mkfifo/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 path = "src/mkfifo.rs"
 
 [dependencies]
-clap = { version = "2.33", features = ["wrap_help"] }
+clap = { version = "3.0", features = ["wrap_help", "cargo"] }
 libc = "0.2.42"
 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/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs
index dfb595a72..120c9177b 100644
--- a/src/uu/mkfifo/src/mkfifo.rs
+++ b/src/uu/mkfifo/src/mkfifo.rs
@@ -69,27 +69,27 @@ 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)
+        .override_usage(USAGE)
         .about(SUMMARY)
         .arg(
-            Arg::with_name(options::MODE)
-                .short("m")
+            Arg::new(options::MODE)
+                .short('m')
                 .long(options::MODE)
                 .help("file permissions for the fifo")
                 .default_value("0666")
                 .value_name("0666"),
         )
         .arg(
-            Arg::with_name(options::SE_LINUX_SECURITY_CONTEXT)
-                .short(options::SE_LINUX_SECURITY_CONTEXT)
+            Arg::new(options::SE_LINUX_SECURITY_CONTEXT)
+                .short('Z')
                 .help("set the SELinux security context to default type"),
         )
         .arg(
-            Arg::with_name(options::CONTEXT)
+            Arg::new(options::CONTEXT)
                 .long(options::CONTEXT)
                 .value_name("CTX")
                 .help(
@@ -97,5 +97,9 @@ pub fn uu_app() -> App<'static, 'static> {
                     or SMACK security context to CTX",
                 ),
         )
-        .arg(Arg::with_name(options::FIFO).hidden(true).multiple(true))
+        .arg(
+            Arg::new(options::FIFO)
+                .hide(true)
+                .multiple_occurrences(true),
+        )
 }