structopt: Migrate to clap

According to TeXitoi/structopt#525, structopt has entered maintenance mode, and clap should be used for new development. Migrate to clap so that nightly builds succeed as well. Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>
parallaxsecond · Mar 18, 2024 · 4446169 · 4446169
1 parent d4e64a0
commit 4446169
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 128 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,7 @@ picky-asn1-der = { version = "0.4.0", optional = true }
 picky-asn1 = { version = "0.8.0", optional = true }
 tss-esapi = { version = "7.5.0", optional = true }
 bincode = "1.3.1"
-structopt = { version = "0.3.26", default-features = false}
+clap = { version = "3.2.22", features = ["derive", "std"]}
 derivative = "2.2.0"
 hex = { version = "0.4.2", optional = true }
 psa-crypto = { version = "0.12.0", default-features = false, features = ["operations","std"], optional = true }

diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -49,7 +49,7 @@ use std::sync::{
     Arc,
 };
 use std::time::Duration;
-use structopt::StructOpt;
+use clap::StructOpt;
 
 const MAIN_LOOP_DEFAULT_SLEEP: u64 = 10;
 

diff --git a/src/utils/cli.rs b/src/utils/cli.rs
@@ -7,7 +7,7 @@
 // See https://github.com/parallaxsecond/parsec/issues/392 for details.
 #![allow(unused_qualifications)]
 
-use structopt::StructOpt;
+use clap::StructOpt;
 
 /// Parsec is the Platform AbstRaction for SECurity, a new open-source initiative to provide a
 /// common API to secure services in a platform-agnostic way.