use clap 4 instead of structopt

3 files changed, 135 insertions, 205 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 95305c6..1a311b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,15 +34,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
 name = "anyhow"
 version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -66,17 +57,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
 name = "autocfg"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -181,18 +161,49 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
- "ansi_term",
- "atty",
  "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "is-terminal",
+ "once_cell",
  "strsim",
- "term_size",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
+ "termcolor",
+ "terminal_size",
+]
+
+[[package]]
+name = "clap_complete"
+version = "4.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
+dependencies = [
+ "os_str_bytes",
 ]
 
 [[package]]
@@ -455,21 +466,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
@@ -836,6 +835,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
+name = "os_str_bytes"
+version = "6.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
+[[package]]
 name = "parking_lot"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -870,33 +875,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "paw"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c0fc9b564dbc3dc2ed7c92c0c144f4de340aa94514ce2b446065417c4084e9"
-dependencies = [
- "paw-attributes",
- "paw-raw",
-]
-
-[[package]]
-name = "paw-attributes"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f35583365be5d148e959284f42526841917b7bfa09e2d1a7ad5dde2cf0eaa39"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "paw-raw"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0b59668fe80c5afe998f0c0bf93322bf2cd66cafeeb80581f291716f3467f2"
-
-[[package]]
 name = "pbkdf2"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1047,6 +1025,8 @@ dependencies = [
  "base64",
  "block-padding",
  "cbc",
+ "clap",
+ "clap_complete",
  "daemonize",
  "directories",
  "env_logger",
@@ -1056,7 +1036,6 @@ dependencies = [
  "libc",
  "log",
  "nix",
- "paw",
  "pbkdf2",
  "percent-encoding",
  "pkcs8",
@@ -1070,10 +1049,9 @@ dependencies = [
  "serde_repr",
  "sha1",
  "sha2",
- "structopt",
  "tempfile",
  "term_size",
- "textwrap 0.16.0",
+ "textwrap",
  "thiserror",
  "tokio",
  "totp-lite",
@@ -1485,34 +1463,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap",
- "lazy_static",
- "paw",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "subtle"
@@ -1565,13 +1518,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "terminal_size"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a"
 dependencies = [
- "term_size",
- "unicode-width",
+ "rustix",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -1758,12 +1711,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
 name = "unicode-width"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1796,12 +1743,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
 name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index a81461d..8f6bd27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,8 @@ base32 = "0.4.0"
 base64 = "0.21.0"
 block-padding = "0.3.2"
 cbc = { version = "0.1.2", features = ["alloc", "std"] }
+clap = { version = "4.1.6", features = ["wrap_help", "derive"] }
+clap_complete = "4.1.2"
 daemonize = "0.4.1"
 directories = "4.0.1"
 env_logger = "0.10.0"
@@ -30,7 +32,6 @@ humantime = "2.1.0"
 libc = "0.2.139"
 log = "0.4.17"
 nix = "0.26.2"
-paw = "1.0.0"
 pbkdf2 = "0.11.0"
 percent-encoding = "2.2.0"
 pkcs8 = "0.9.0"
@@ -44,7 +45,6 @@ serde_path_to_error = "0.1.9"
 serde_repr = "0.1.10"
 sha1 = "0.10.5"
 sha2 = "0.10.6"
-structopt = { version = "0.3.26", features = ["paw", "wrap_help"] }
 tempfile = "3.3.0"
 term_size = "0.3.2"
 textwrap = "0.16.0"
diff --git a/src/bin/rbw/main.rs b/src/bin/rbw/main.rs
index 994fb97..97784b7 100644
--- a/src/bin/rbw/main.rs
+++ b/src/bin/rbw/main.rs
@@ -12,23 +12,23 @@
 #![allow(clippy::type_complexity)]
 
 use anyhow::Context as _;
+use clap::{CommandFactory as _, Parser as _};
 use std::io::Write as _;
-use structopt::StructOpt as _;
 
 mod actions;
 mod commands;
 mod sock;
 
-#[derive(Debug, structopt::StructOpt)]
-#[structopt(about = "Unofficial Bitwarden CLI")]
+#[derive(Debug, clap::Parser)]
+#[command(about = "Unofficial Bitwarden CLI")]
 enum Opt {
-    #[structopt(about = "Get or set configuration options")]
+    #[command(about = "Get or set configuration options")]
     Config {
-        #[structopt(subcommand)]
+        #[command(subcommand)]
         config: Config,
     },
 
-    #[structopt(
+    #[command(
         about = "Register this device with the Bitwarden server",
         long_about = "Register this device with the Bitwarden server\n\n\
             The official Bitwarden server includes bot detection to prevent \
@@ -39,62 +39,59 @@ enum Opt {
     )]
     Register,
 
-    #[structopt(about = "Log in to the Bitwarden server")]
+    #[command(about = "Log in to the Bitwarden server")]
     Login,
 
-    #[structopt(about = "Unlock the local Bitwarden database")]
+    #[command(about = "Unlock the local Bitwarden database")]
     Unlock,
 
-    #[structopt(about = "Check if the local Bitwarden database is unlocked")]
+    #[command(about = "Check if the local Bitwarden database is unlocked")]
     Unlocked,
 
-    #[structopt(about = "Update the local copy of the Bitwarden database")]
+    #[command(about = "Update the local copy of the Bitwarden database")]
     Sync,
 
-    #[structopt(
+    #[command(
         about = "List all entries in the local Bitwarden database",
         visible_alias = "ls"
     )]
     List {
-        #[structopt(
+        #[arg(
             long,
             help = "Fields to display. \
                 Available options are id, name, user, folder. \
                 Multiple fields will be separated by tabs.",
             default_value = "name",
-            use_delimiter = true
+            use_value_delimiter = true
         )]
         fields: Vec<String>,
     },
 
-    #[structopt(about = "Display the password for a given entry")]
+    #[command(about = "Display the password for a given entry")]
     Get {
-        #[structopt(help = "Name or UUID of the entry to display")]
+        #[arg(help = "Name or UUID of the entry to display")]
         name: String,
-        #[structopt(help = "Username of the entry to display")]
+        #[arg(help = "Username of the entry to display")]
         user: Option<String>,
-        #[structopt(long, help = "Folder name to search in")]
+        #[arg(long, help = "Folder name to search in")]
         folder: Option<String>,
-        #[structopt(short, long, help = "Field to get")]
+        #[arg(short, long, help = "Field to get")]
         field: Option<String>,
-        #[structopt(
-            long,
-            help = "Display the notes in addition to the password"
-        )]
+        #[arg(long, help = "Display the notes in addition to the password")]
         full: bool,
     },
 
-    #[structopt(about = "Display the authenticator code for a given entry")]
+    #[command(about = "Display the authenticator code for a given entry")]
     Code {
-        #[structopt(help = "Name or UUID of the entry to display")]
+        #[arg(help = "Name or UUID of the entry to display")]
         name: String,
-        #[structopt(help = "Username of the entry to display")]
+        #[arg(help = "Username of the entry to display")]
         user: Option<String>,
-        #[structopt(long, help = "Folder name to search in")]
+        #[arg(long, help = "Folder name to search in")]
         folder: Option<String>,
     },
 
-    #[structopt(
+    #[command(
         about = "Add a new password to the database",
         long_about = "Add a new password to the database\n\n\
             This command will open a text editor to enter \
@@ -104,28 +101,27 @@ enum Opt {
             remainder will be saved as a note."
     )]
     Add {
-        #[structopt(help = "Name of the password entry")]
+        #[arg(help = "Name of the password entry")]
         name: String,
-        #[structopt(help = "Username for the password entry")]
+        #[arg(help = "Username for the password entry")]
         user: Option<String>,
-        #[structopt(
+        #[arg(
             long,
             help = "URI for the password entry",
-            multiple = true,
             number_of_values = 1
         )]
         uri: Vec<String>,
-        #[structopt(long, help = "Folder for the password entry")]
+        #[arg(long, help = "Folder for the password entry")]
         folder: Option<String>,
     },
 
-    #[structopt(
+    #[command(
         about = "Generate a new password",
         long_about = "Generate a new password\n\n\
             If given a password entry name, also save the generated \
             password to the database.",
         visible_alias = "gen",
-        group = structopt::clap::ArgGroup::with_name("password-type").args(&[
+        group = clap::ArgGroup::new("password-type").args(&[
             "no-symbols",
             "only-numbers",
             "nonconfusables",
@@ -133,39 +129,38 @@ enum Opt {
         ])
     )]
     Generate {
-        #[structopt(help = "Length of the password to generate")]
+        #[arg(help = "Length of the password to generate")]
         len: usize,
-        #[structopt(help = "Name of the password entry")]
+        #[arg(help = "Name of the password entry")]
         name: Option<String>,
-        #[structopt(help = "Username for the password entry")]
+        #[arg(help = "Username for the password entry")]
         user: Option<String>,
-        #[structopt(
+        #[arg(
             long,
             help = "URI for the password entry",
-            multiple = true,
             number_of_values = 1
         )]
         uri: Vec<String>,
-        #[structopt(long, help = "Folder for the password entry")]
+        #[arg(long, help = "Folder for the password entry")]
         folder: Option<String>,
-        #[structopt(
+        #[arg(
             long = "no-symbols",
             help = "Generate a password with no special characters"
         )]
         no_symbols: bool,
-        #[structopt(
+        #[arg(
             long = "only-numbers",
             help = "Generate a password consisting of only numbers"
         )]
         only_numbers: bool,
-        #[structopt(
+        #[arg(
             long,
             help = "Generate a password without visually similar \
                 characters (useful for passwords intended to be \
                 written down)"
         )]
         nonconfusables: bool,
-        #[structopt(
+        #[arg(
             long,
             help = "Generate a password of multiple dictionary \
                 words chosen from the EFF word list. The len \
@@ -175,7 +170,7 @@ enum Opt {
         diceware: bool,
     },
 
-    #[structopt(
+    #[command(
         about = "Modify an existing password",
         long_about = "Modify an existing password\n\n\
             This command will open a text editor with the existing \
@@ -186,50 +181,48 @@ enum Opt {
             as a note."
     )]
     Edit {
-        #[structopt(help = "Name or UUID of the password entry")]
+        #[arg(help = "Name or UUID of the password entry")]
         name: String,
-        #[structopt(help = "Username for the password entry")]
+        #[arg(help = "Username for the password entry")]
         user: Option<String>,
-        #[structopt(long, help = "Folder name to search in")]
+        #[arg(long, help = "Folder name to search in")]
         folder: Option<String>,
     },
 
-    #[structopt(about = "Remove a given entry", visible_alias = "rm")]
+    #[command(about = "Remove a given entry", visible_alias = "rm")]
     Remove {
-        #[structopt(help = "Name or UUID of the password entry")]
+        #[arg(help = "Name or UUID of the password entry")]
         name: String,
-        #[structopt(help = "Username for the password entry")]
+        #[arg(help = "Username for the password entry")]
         user: Option<String>,
-        #[structopt(long, help = "Folder name to search in")]
+        #[arg(long, help = "Folder name to search in")]
         folder: Option<String>,
     },
 
-    #[structopt(about = "View the password history for a given entry")]
+    #[command(about = "View the password history for a given entry")]
     History {
-        #[structopt(help = "Name or UUID of the password entry")]
+        #[arg(help = "Name or UUID of the password entry")]
         name: String,
-        #[structopt(help = "Username for the password entry")]
+        #[arg(help = "Username for the password entry")]
         user: Option<String>,
-        #[structopt(long, help = "Folder name to search in")]
+        #[arg(long, help = "Folder name to search in")]
         folder: Option<String>,
     },
 
-    #[structopt(about = "Lock the password database")]
+    #[command(about = "Lock the password database")]
     Lock,
 
-    #[structopt(about = "Remove the local copy of the password database")]
+    #[command(about = "Remove the local copy of the password database")]
     Purge,
 
-    #[structopt(
-        name = "stop-agent",
-        about = "Terminate the background agent"
-    )]
+    #[command(name = "stop-agent", about = "Terminate the background agent")]
     StopAgent,
-    #[structopt(
+
+    #[command(
         name = "gen-completions",
         about = "Generate completion script for the given shell"
     )]
-    GenCompletions { shell: String },
+    GenCompletions { shell: clap_complete::Shell },
 }
 
 impl Opt {
@@ -259,20 +252,20 @@ impl Opt {
     }
 }
 
-#[derive(Debug, structopt::StructOpt)]
+#[derive(Debug, clap::Parser)]
 enum Config {
-    #[structopt(about = "Show the values of all configuration settings")]
+    #[command(about = "Show the values of all configuration settings")]
     Show,
-    #[structopt(about = "Set a configuration option")]
+    #[command(about = "Set a configuration option")]
     Set {
-        #[structopt(help = "Configuration key to set")]
+        #[arg(help = "Configuration key to set")]
         key: String,
-        #[structopt(help = "Value to set the configuration option to")]
+        #[arg(help = "Value to set the configuration option to")]
         value: String,
     },
-    #[structopt(about = "Reset a configuration option to its default")]
+    #[command(about = "Reset a configuration option to its default")]
     Unset {
-        #[structopt(help = "Configuration key to unset")]
+        #[arg(help = "Configuration key to unset")]
         key: String,
     },
 }
@@ -288,8 +281,9 @@ impl Config {
     }
 }
 
-#[paw::main]
-fn main(opt: Opt) {
+fn main() {
+    let opt = Opt::parse();
+
     env_logger::Builder::from_env(
         env_logger::Env::default().default_filter_or("info"),
     )
@@ -393,7 +387,15 @@ fn main(opt: Opt) {
         Opt::Lock => commands::lock(),
         Opt::Purge => commands::purge(),
         Opt::StopAgent => commands::stop_agent(),
-        Opt::GenCompletions { shell } => gen_completions(shell),
+        Opt::GenCompletions { shell } => {
+            clap_complete::generate(
+                *shell,
+                &mut Opt::command(),
+                "rbw",
+                &mut std::io::stdout(),
+            );
+            Ok(())
+        }
     }
     .context(format!("rbw {}", opt.subcommand_name()));
 
@@ -402,16 +404,3 @@ fn main(opt: Opt) {
         std::process::exit(1);
     }
 }
-
-fn gen_completions(shell: &str) -> anyhow::Result<()> {
-    let shell = match shell {
-        "bash" => structopt::clap::Shell::Bash,
-        "zsh" => structopt::clap::Shell::Zsh,
-        "fish" => structopt::clap::Shell::Fish,
-        "powershell" => structopt::clap::Shell::PowerShell,
-        "elvish" => structopt::clap::Shell::Elvish,
-        _ => return Err(anyhow::anyhow!("unknown shell {}", shell)),
-    };
-    Opt::clap().gen_completions_to("rbw", shell, &mut std::io::stdout());
-    Ok(())
-}