Migrate to clap v3.0.0

This patch replaces structopt with clap v3.0.0.

Author: robinkrahl

Cargo.lock

@@ -24,6 +24,7 @@ default-run = "nitrocli"
 [[bin]]
 name = "shell-complete"
 path = "var/shell-complete.rs"
+required-features = ["clap_generate"]
 
 [[bin]]
 name = "nitrocli-otp-cache"
@@ -45,6 +46,15 @@ version = "1.0"
 [dependencies.base32]
 version = "0.5.1"
 
+[dependencies.clap]
+version = "3.0"
+default-features = false
+features = ["derive", "std", "unicode"]
+
+[dependencies.clap_generate]
+version = "3.0"
+optional = true
+
 [dependencies.directories]
 version = "5"
 
@@ -67,10 +77,6 @@ version = "3.0.2"
 version = "1.0.156"
 features = ["derive"]
 
-[dependencies.structopt]
-version = "0.3.21"
-default-features = false
-
 [dependencies.termion]
 version = "1.5.5"
 

Cargo.toml

@@ -8,7 +8,7 @@ use std::io::Write as _;
 use std::path;
 
 use anyhow::Context as _;
-use structopt::StructOpt as _;
+use clap::StructOpt as _;
 
 mod ext;
 
@@ -33,7 +33,7 @@ struct Slot {
 /// `--force-update` option is set. The cache includes the Nitrokey's
 /// serial number so that it is possible to use it with multiple
 /// devices.
-#[derive(Debug, structopt::StructOpt)]
+#[derive(Debug, clap::StructOpt)]
 #[structopt(bin_name = "nitrocli otp-cache")]
 struct Args {
   /// Always query the slot data even if it is already cached
@@ -43,7 +43,7 @@ struct Args {
   cmd: Command,
 }
 
-#[derive(Debug, structopt::StructOpt)]
+#[derive(Debug, clap::StructOpt)]
 enum Command {
   /// Generates a one-time password
   Get {

ext/otp_cache.rs

@@ -22,7 +22,7 @@ macro_rules! Command {
     $( $(#[$doc:meta])* $var:ident$(($inner:ty))? => $exec:expr, ) *
   ] ) => {
     $(#[$docs])*
-    #[derive(Debug, PartialEq, structopt::StructOpt)]
+    #[derive(Debug, PartialEq, clap::StructOpt)]
     pub enum $name {
       $(
         $(#[$doc])*