Remove structopt reference, use Clap helper for verbosity

shell/Cargo.toml

@@ -7,6 +7,7 @@ license.workspace = true
 edition.workspace = true
 
 [dependencies]
+clap-verbosity-flag = "2"
 directories.workspace = true
 exitcode = "1.1"
 owo-colors = "4"

shell/src/main.rs

@@ -37,8 +37,8 @@ struct Options {
     login: bool,
 
     /// Set the verbosity level
-    #[arg(short = 'v', long = "verbose", action = clap::ArgAction::Count)]
-    verbosity: u8,
+    #[command(flatten)]
+    verbose: clap_verbosity_flag::Verbosity,
 
     /// Silence all output
     #[arg(short = 'q', long = "quiet")]
@@ -52,33 +52,18 @@ struct Options {
     /// In private mode, session history is kept independent from other sessions
     /// and is stored only in memory. All history generated during a private
     /// session will be forgotten when the session terminates.
-    #[structopt(long = "private")]
+    #[arg(long = "private")]
     private: bool,
 }
 
-impl Options {
-    fn log_level_filter(&self) -> log::LevelFilter {
-        if self.quiet {
-            log::LevelFilter::Off
-        } else {
-            match self.verbosity {
-                0 => log::LevelFilter::Warn,
-                1 => log::LevelFilter::Info,
-                2 => log::LevelFilter::Debug,
-                _ => log::LevelFilter::Trace,
-            }
-        }
-    }
-}
-
 /// Entrypoint of the program. This just does some boring setup and teardown
 /// around the real main body of the program.
 fn main() {
     // Parse command line args.
     let options = Options::parse();
 
     // Initialize logging.
-    logger::init(options.log_level_filter());
+    logger::init(options.verbose.log_level_filter());
     log_panics::init();
 
     // Create a single-threaded Tokio runtime, which drives the async Riptide