Updated clap example dependency

Author: elast0ny

Cargo.toml

@@ -39,5 +39,5 @@ win-sys = "0.2"
 
 [dev-dependencies]
 raw_sync = "0.1"
-clap = "2.33"
+clap = {version = "3", features = ["derive"]}
 env_logger = "0"

examples/basic.rs

@@ -1,51 +1,34 @@
 use std::thread;
 
-use clap::{App, Arg};
+use clap::Parser;
 use shared_memory::*;
 
+/// Spawns N threads that increment a value to 100
+#[derive(Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// Number of threads to spawn
+    num_threads: usize,
+
+    /// Count to this value
+    #[clap(long, short, default_value_t = 50)]
+    count_to: u8,
+}
+
 fn main() {
     env_logger::init();
+    let args = Args::parse();
 
-    // Get number of thread argument
-    let matches = App::new("Basic Example")
-        .about("Spawns N threads that increment a value to 100")
-        .arg(
-            Arg::with_name("num_threads")
-                .help("Number of threads to spawn")
-                .required(true)
-                .takes_value(true),
-        )
-        .arg(
-            Arg::with_name("count_to")
-                .help("Count to this value")
-                .short("c")
-                .long("count")
-                .default_value("50")
-                .takes_value(true)
-        )
-        .get_matches();
-    let num_threads: usize = matches
-        .value_of("num_threads")
-        .unwrap()
-        .parse()
-        .expect("Invalid number passed for num_threads");
-
-    let max: u8 = matches
-        .value_of("count_to")
-        .unwrap()
-        .parse()
-        .expect("Invalid number passed for count_to");
-    
-    if num_threads < 1 {
+    if args.num_threads < 1 {
         eprintln!("Invalid number of threads");
         return;
     }
 
-    let mut threads = Vec::with_capacity(num_threads);
+    let mut threads = Vec::with_capacity(args.num_threads);
     let _ = std::fs::remove_file("basic_mapping");
-
+    let max = args.count_to;
     // Spawn N threads
-    for i in 0..num_threads {
+    for i in 0..args.num_threads {
         let thread_id = i + 1;
         threads.push(thread::spawn(move || {
             increment_value("basic_mapping", thread_id, max);

examples/mutex.rs

@@ -1,36 +1,35 @@
 use std::sync::atomic::{AtomicU8, Ordering};
 use std::thread;
 
-use clap::{App, Arg};
+use clap::Parser;
 use raw_sync::locks::*;
 use shared_memory::*;
 
+/// Spawns N threads that increment a value to 10 using a mutex
+#[derive(Parser)]
+#[clap(author, version, about)]
+struct Args {
+    /// Number of threads to spawn
+    num_threads: usize,
+
+    /// Count to this value
+    #[clap(long, short, default_value_t = 50)]
+    count_to: u8,
+}
+
 fn main() {
     env_logger::init();
-    let matches = App::new("Mutex Example")
-        .about("Spawns N threads that increment a value to 10 using a mutex")
-        .arg(
-            Arg::with_name("num_threads")
-                .help("Number of threads to spawn")
-                .required(true)
-                .takes_value(true),
-        )
-        .get_matches();
+    let args = Args::parse();
 
-    let num_threads: usize = matches
-        .value_of("num_threads")
-        .unwrap()
-        .parse()
-        .expect("Invalid number passed for num_threads");
-    if num_threads < 1 {
+    if args.num_threads < 1 {
         eprintln!("num_threads should be 2 or more");
         return;
     }
-    let mut threads = Vec::with_capacity(num_threads);
+    let mut threads = Vec::with_capacity(args.num_threads);
     let _ = std::fs::remove_file("mutex_mapping");
 
     // Spawn N threads
-    for i in 0..num_threads {
+    for i in 0..args.num_threads {
         let thread_id = i + 1;
         threads.push(thread::spawn(move || {
             increment_value("mutex_mapping", thread_id);