Merge pull request #52 from chenxiaolong/clap

Switch from structopt to clap
chenxiaolong · Sep 16, 2022 · 924afd6 · 924afd6
2 parents eaa2338 + 1bf174e
commit 924afd6
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 82 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,13 +17,14 @@ log = "0.4.17"
 retry = "1.3.1"
 rexpect = "0.4.0"
 serde_json = "1.0.85"
-# We cannot switch to clap v3 because its MSRV is too high for the distros that
-# we provide binary packages for: https://github.com/clap-rs/clap/issues/3267
-structopt = "0.3.26"
 thiserror = "1.0.35"
 tokio-stream = "0.1.9"
 toml = "0.5.9"
 
+[dependencies.clap]
+version = "3.2.22"
+features = ["derive"]
+
 [dependencies.serde]
 version = "1.0.144"
 features = ["derive"]

diff --git a/src/main.rs b/src/main.rs
@@ -19,10 +19,10 @@ use {
         },
         u8,
     },
+    clap::Parser,
     futures::stream::FuturesUnordered,
     log::{debug, error, info, trace},
     retry::retry_with_index,
-    structopt::StructOpt,
     tokio::{
         task,
         time::sleep,
@@ -347,15 +347,15 @@ fn bool_env(name: &str, default: bool) -> bool {
     }
 }
 
-#[derive(StructOpt, Debug)]
+#[derive(Debug, Parser)]
 struct Opt {
     /// Path to config file
-    #[structopt(short, long)]
+    #[clap(short, long)]
     config: PathBuf,
 }
 
 async fn main_wrapper() -> Result<()> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
     let config = load_config(&opt.config)?;
 
     let pkg_name = env!("CARGO_PKG_NAME").replace('-', "_");