Update to Clap 4 for parsing command-line arguments

fredmorcos · Sep 4, 2024 · 649425f · 649425f
1 parent eb5989f
commit 649425f
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 106 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -20,7 +20,7 @@ tvrank = { path = "../lib", version = "0.8.5" }
 indicatif = "0.16"
 log = "0.4"
 atoi = "2.0"
-clap = { version = "3", features = ["derive"] }
+clap = { version = "4", features = ["derive"] }
 env_logger = "0.10"
 derive_more = "0.99"
 reqwest = { version = "0.11", features = ["blocking"] }

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -110,12 +110,12 @@ struct GeneralOpts {
   #[clap(short, long)]
   force_update: bool,
 
-  /// Display colors regardless of the NO_COLOR environment variable
+  /// Display colors even when the NO_COLOR environment variable is set
   #[clap(short, long)]
   color: bool,
 
   /// Verbose output (can be specified multiple times)
-  #[clap(short, long, parse(from_occurrences))]
+  #[clap(short, long, action = clap::ArgAction::Count)]
   verbose: u8,
 }
 
@@ -130,7 +130,7 @@ struct SearchOpts {
   top: Option<usize>,
 
   /// Set output format
-  #[clap(short, long, arg_enum, default_value = "table")]
+  #[clap(short, long, value_enum, default_value = "table")]
   output: OutputFormat,
 }
 

diff --git a/cli/src/print.rs b/cli/src/print.rs
@@ -21,7 +21,7 @@ pub enum Error {
   Table(#[from] url::ParseError),
 }
 
-#[derive(Debug, Clone, clap::ArgEnum)]
+#[derive(Debug, Clone, clap::ValueEnum)]
 pub enum OutputFormat {
   Json,
   Table,