Update arg parsing to clap v3

nuxeh · May 28, 2022 · 78742b1 · 78742b1
1 parent 9198a6f
commit 78742b1
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 122 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ serde_derive = "1.0.117"
 serde_json = "1.0.59"
 tempfile = "3.1.0"
 libsqlite3-sys = { version = ">=0.8.0, <0.21.0", features = ["min_sqlite_version_3_7_16", "bundled"], optional = true }
-structopt = "0.3.21"
+clap = { version = "3.1", features = ["derive"] }
 atty = "0.2.14"
 ureq = "2.2.0"
 

diff --git a/aocf_cli/Cargo.lock b/aocf_cli/Cargo.lock
diff --git a/aocf_cli/Cargo.toml b/aocf_cli/Cargo.toml
@@ -28,7 +28,8 @@ glob = "0.3.0"
 termimad = "0.9.1"
 crossterm = "0.17.7"
 regex = "1.4.2"
-structopt = "0.3.21"
+clap = { version =  "3.1", features = ["derive"] }
+clap_complete = "3.1"
 webbrowser = "0.5.5"
 
 [package.metadata.deb]

diff --git a/aocf_cli/build.rs b/aocf_cli/build.rs
diff --git a/aocf_cli/src/bin/aocf.rs b/aocf_cli/src/bin/aocf.rs
@@ -18,12 +18,12 @@ use tempfile::tempdir;
 use glob::glob;
 use failure::{Error, bail, format_err};
 use regex::Regex;
-use structopt::StructOpt;
+use clap::Parser;
 use chrono::{Utc, Datelike};
 use webbrowser;
 
 fn main() {
-    let opt = Aocf::from_args();
+    let opt = Aocf::parse();
 
     run(&opt).unwrap_or_else(|err| {
         eprintln!("error: {}", err);