Convert to declarative Clap structs

solokeys · Jan 7, 2022 · 6bac36d · 6bac36d
1 parent 6f99bac
commit 6bac36d
Show file tree

Hide file tree

Showing 7 changed files with 691 additions and 778 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solo2"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["SoloKeys Developers"]
 edition = "2021"
 rust-version = "1.56"

diff --git a/build.rs b/build.rs
@@ -39,7 +39,8 @@ fn main() {
 
         // Use clap to build completion files.
         // Pro-tip: use `fd -HIe bash` to get OUT_DIR
-        let mut app = cli::cli();
+        use clap::IntoApp;
+        let mut app = cli::Cli::into_app();
         generate_to(shells::Bash, &mut app, "solo2", &outdir).unwrap();
         generate_to(shells::Fish, &mut app, "solo2", &outdir).unwrap();
         generate_to(shells::PowerShell, &mut app, "solo2", &outdir).unwrap();

diff --git a/src/apps/oath.rs b/src/apps/oath.rs
@@ -112,7 +112,7 @@ impl Secret {
     /// length of 160 bits."
     ///
     /// But 14B = 112b < 128b.
-    fn from_base32(encoded: &str, digest: Digest) -> Result<Self> {
+    pub fn from_base32(encoded: &str, digest: Digest) -> Result<Self> {
         let unshortened = data_encoding::BASE32.decode(encoded.as_bytes())?;
         let mut shortened = match digest {
             Digest::Sha1 => {

diff --git a/src/bin/solo2/cli.rs b/src/bin/solo2/cli.rs