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

---
 src/uu/sum/Cargo.toml |  2 +-
 src/uu/sum/src/sum.rs | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/uu/sum/Cargo.toml b/src/uu/sum/Cargo.toml
index 5f5a9d642..fe59eb6ee 100644
--- a/src/uu/sum/Cargo.toml
+++ b/src/uu/sum/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 path = "src/sum.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/sum/src/sum.rs b/src/uu/sum/src/sum.rs
index bcc4738e8..67bff31b0 100644
--- a/src/uu/sum/src/sum.rs
+++ b/src/uu/sum/src/sum.rs
@@ -140,21 +140,25 @@ 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::FILE).multiple(true).hidden(true))
         .arg(
-            Arg::with_name(options::BSD_COMPATIBLE)
-                .short(options::BSD_COMPATIBLE)
+            Arg::new(options::FILE)
+                .multiple_occurrences(true)
+                .hide(true),
+        )
+        .arg(
+            Arg::new(options::BSD_COMPATIBLE)
+                .short('r')
                 .help("use the BSD sum algorithm, use 1K blocks (default)"),
         )
         .arg(
-            Arg::with_name(options::SYSTEM_V_COMPATIBLE)
-                .short("s")
+            Arg::new(options::SYSTEM_V_COMPATIBLE)
+                .short('s')
                 .long(options::SYSTEM_V_COMPATIBLE)
                 .help("use System V sum algorithm, use 512 bytes blocks"),
         )