Merge pull request #2197 from Gilnaa/2125-arch-clap

Switched 'arch' to use clap instead of getopts

Cargo.lock

@@ -1658,6 +1658,7 @@ dependencies = [
 name = "uu_arch"
 version = "0.0.6"
 dependencies = [
+ "clap",
  "platform-info",
  "uucore",
  "uucore_procs",

src/uu/arch/Cargo.toml

@@ -16,6 +16,7 @@ path = "src/arch.rs"
 
 [dependencies]
 platform-info = "0.1"
+clap = "2.33"
 uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
 

src/uu/arch/src/arch.rs

@@ -10,17 +10,20 @@
 extern crate uucore;
 
 use platform_info::*;
-use uucore::InvalidEncodingHandling;
 
-static SYNTAX: &str = "Display machine architecture";
+use clap::App;
+
+static VERSION: &str = env!("CARGO_PKG_VERSION");
+static ABOUT: &str = "Display machine architecture";
 static SUMMARY: &str = "Determine architecture name for current machine.";
-static LONG_HELP: &str = "";
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    app!(SYNTAX, SUMMARY, LONG_HELP).parse(
-        args.collect_str(InvalidEncodingHandling::ConvertLossy)
-            .accept_any(),
-    );
+    App::new(executable!())
+        .version(VERSION)
+        .about(ABOUT)
+        .after_help(SUMMARY)
+        .get_matches_from(args);
+
     let uts = return_if_err!(1, PlatformInfo::new());
     println!("{}", uts.machine().trim());
     0