chore(deps): port to clap 3.0 and clap_derive

Cargo.toml

@@ -8,10 +8,10 @@ name = "resource_proof"
 readme = "README.md"
 repository = "https://github.com/maidsafe/resource_proof"
 version = "1.0.38"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-clap = "~2.33.0"
+clap = { version = "3.0", features=["derive"] }
 rand = "~0.4.1"
 
   [dependencies.tiny-keccak]

src/main.rs

@@ -12,7 +12,6 @@
 // For explanation of lint checks, run `rustc -W help` or see
 // https://github.com/maidsafe/QA/blob/master/Documentation/Rust%20Lint%20Checks.md
 #![forbid(
-    bad_style,
     arithmetic_overflow,
     mutable_transmutes,
     no_mangle_const_items,
@@ -52,10 +51,7 @@
     variant_size_differences
 )]
 
-#[macro_use]
-extern crate clap;
-
-use clap::{App, Arg};
+use clap::Parser;
 use resource_proof::ResourceProof;
 use std::time::Instant;
 #[cfg(not(windows))]
@@ -113,60 +109,41 @@ fn print_red(message: &str) {
     println!("{}", message);
 }
 
+#[derive(Parser, Debug)]
+#[clap(author, version)]
+#[clap(name = "Simple Resource Proof example")]
+#[clap(about = "Please set the size and difficulty to test", long_about = None)]
+#[clap(
+    after_help = "Several proofs may be chained, i.e. a large difficulty and small size or vice versa to check CPU And BW seperately"
+)]
+struct Config {
+    #[clap(short, long)]
+    #[clap(help = "The number of leading zeros of the proof when hashed with SHA3")]
+    difficulty: u8,
+
+    #[clap(short, long)]
+    #[clap(help = "The minimum size of the proof in bytes")]
+    size: usize,
+
+    #[clap(short, long, action)]
+    #[clap(
+        help = "Will run continuously, increasing difficulty with every invocation. Note this will likley not stop in your lifetime :-)"
+    )]
+    increase: bool,
+}
+
 fn main() {
-    let matches = App::new(
-        "=============================\nSimple Resource Proof \
-         example\n=============================\n",
-    )
-    .about("______________________________\nPlease set the size and difficulty to test")
-    .author(crate_authors!())
-    .version(crate_version!())
-    .before_help("Resource proof testing framework")
-    .after_help(
-        "_____________________________________________________________\nSeveral \
-         proofs may be chained, i.e. a large difficulty and small size or large size \
-         and small difficulty to check specifically CPU And BW seperately",
-    )
-    .arg(
-        Arg::with_name("Difficulty")
-            .short("d")
-            .required(true)
-            .long("difficulty")
-            .help(
-                "Set difficulty, i.e. the number of leading zeros of the proof when hashed \
-                 with SHA3",
-            )
-            .takes_value(true),
-    )
-    .arg(
-        Arg::with_name("Size")
-            .required(true)
-            .short("s")
-            .long("size")
-            .help("Set size, i.e. the minimum size of the proof in bytes")
-            .takes_value(true),
-    )
-    .arg(Arg::with_name("Increase").short("i").long("increase").help(
-        "Will run continuously, increasing difficulty with every invocation. Note \
-         this will likley not stop in your lifetime :-)",
-    ))
-    .get_matches();
+    let config = Config::parse();
 
     print_red("Running analysis ....");
 
-    let repeat = matches.is_present("Increase");
-
-    let dif = value_t!(matches, "Difficulty", u8).unwrap_or(1);
-
-    let size = value_t!(matches, "Size", usize).unwrap_or(10);
-
     let nonce = [rand::random::<u8>(); 32];
 
-    if repeat {
-        for i in dif.. {
-            test_it(i, size, nonce);
+    if config.increase {
+        for i in config.difficulty.. {
+            test_it(i, config.size, nonce);
         }
     } else {
-        test_it(dif, size, nonce);
+        test_it(config.difficulty, config.size, nonce);
     }
 }