Merge pull request #3784 from jarkonik/main

Use `clap::ArgAction` in `true` and `false`
uutils · Aug 16, 2022 · 5ecabb8 · 5ecabb8
2 parents c03b3c4 + 710e2af
commit 5ecabb8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/src/uu/false/src/false.rs b/src/uu/false/src/false.rs
@@ -4,8 +4,8 @@
 //  *
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
-use clap::{Arg, Command};
-use std::io::Write;
+use clap::{Arg, ArgAction, Command};
+use std::{ffi::OsString, io::Write};
 use uucore::error::{set_exit_code, UResult};
 
 static ABOUT: &str = "\
@@ -26,13 +26,18 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     // and unwind through the standard library allocation handling machinery.
     set_exit_code(1);
 
-    if let Ok(matches) = command.try_get_matches_from_mut(args) {
-        let error = if matches.index_of("help").is_some() {
-            command.print_help()
-        } else if matches.index_of("version").is_some() {
-            writeln!(std::io::stdout(), "{}", command.render_version())
-        } else {
-            Ok(())
+    let args: Vec<OsString> = args.collect();
+    if args.len() > 2 {
+        return Ok(());
+    }
+
+    if let Err(e) = command.try_get_matches_from_mut(args) {
+        let error = match e.kind() {
+            clap::ErrorKind::DisplayHelp => command.print_help(),
+            clap::ErrorKind::DisplayVersion => {
+                writeln!(std::io::stdout(), "{}", command.render_version())
+            }
+            _ => Ok(()),
         };
 
         // Try to display this error.
@@ -56,11 +61,12 @@ pub fn uu_app<'a>() -> Command<'a> {
             Arg::new("help")
                 .long("help")
                 .help("Print help information")
-                .exclusive(true),
+                .action(ArgAction::Help),
         )
         .arg(
             Arg::new("version")
                 .long("version")
-                .help("Print version information"),
+                .help("Print version information")
+                .action(ArgAction::Version),
         )
 }
diff --git a/src/uu/true/src/true.rs b/src/uu/true/src/true.rs
@@ -4,8 +4,8 @@
 //  *
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
-use clap::{Arg, Command};
-use std::io::Write;
+use clap::{Arg, ArgAction, Command};
+use std::{ffi::OsString, io::Write};
 use uucore::error::{set_exit_code, UResult};
 
 static ABOUT: &str = "\
@@ -20,13 +20,18 @@ operation causes the program to return `1` instead.
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let mut command = uu_app();
 
-    if let Ok(matches) = command.try_get_matches_from_mut(args) {
-        let error = if matches.index_of("help").is_some() {
-            command.print_help()
-        } else if matches.index_of("version").is_some() {
-            writeln!(std::io::stdout(), "{}", command.render_version())
-        } else {
-            Ok(())
+    let args: Vec<OsString> = args.collect();
+    if args.len() > 2 {
+        return Ok(());
+    }
+
+    if let Err(e) = command.try_get_matches_from_mut(args) {
+        let error = match e.kind() {
+            clap::ErrorKind::DisplayHelp => command.print_help(),
+            clap::ErrorKind::DisplayVersion => {
+                writeln!(std::io::stdout(), "{}", command.render_version())
+            }
+            _ => Ok(()),
         };
 
         if let Err(print_fail) = error {
@@ -53,11 +58,12 @@ pub fn uu_app<'a>() -> Command<'a> {
             Arg::new("help")
                 .long("help")
                 .help("Print help information")
-                .exclusive(true),
+                .action(ArgAction::Help),
         )
         .arg(
             Arg::new("version")
                 .long("version")
-                .help("Print version information"),
+                .help("Print version information")
+                .action(ArgAction::Version),
         )
 }