upgrade to clap 4

Byron · Byron · commit dd8b0ef8e12d · 2022-12-13T19:02:08.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ tui-shared = ["tui", "tui-react", "open", "unicode-segmentation"]
 trash-move = ["trash"]
 
 [dependencies]
-clap = { version = "3.0", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
 jwalk = "0.6.0"
 byte-unit = "4"
 atty = "0.2.11"
diff --git a/src/main.rs b/src/main.rs
@@ -57,7 +57,6 @@ fn main() -> Result<()> {
 
     let opt: options::Args = options::Args::parse_from(wild::args_os());
     let threads = derive_default_threads(opt.threads);
-    dbg!(threads);
     let walk_options = dua::WalkOptions {
         threads,
         byte_format: opt.format.into(),
diff --git a/src/options.rs b/src/options.rs
@@ -1,7 +1,7 @@
 use dua::ByteFormat as LibraryByteFormat;
 use std::path::PathBuf;
 
-#[derive(PartialEq, Eq, Debug, Clone, Copy, clap::ArgEnum)]
+#[derive(PartialEq, Eq, Debug, Clone, Copy, clap::ValueEnum)]
 pub enum ByteFormat {
     Metric,
     Binary,
@@ -50,7 +50,7 @@ pub struct Args {
     #[clap(
         short = 'f',
         long,
-        arg_enum,
+        value_enum,
         default_value_t = ByteFormat::Metric,
         ignore_case = true,
         hide_default_value = true,
@@ -73,12 +73,12 @@ pub struct Args {
     /// One or more absolute directories to ignore. Note that these are not ignored if they are passed as input path.
     ///
     /// Hence, they will only be ignored if they are eventually reached as part of the traversal.
-    #[clap(long = "ignore-dirs", short = 'i', parse(from_os_str))]
+    #[clap(long = "ignore-dirs", short = 'i', value_parser)]
     #[cfg_attr(target_os = "linux", clap(default_values = &["/proc", "/dev", "/sys", "/run"]))]
     pub ignore_dirs: Vec<PathBuf>,
 
     /// One or more input files or directories. If unset, we will use all entries in the current working directory.
-    #[clap(parse(from_os_str))]
+    #[clap(value_parser)]
     pub input: Vec<PathBuf>,
 }
 
@@ -89,7 +89,7 @@ pub enum Command {
     #[clap(name = "interactive", visible_alias = "i")]
     Interactive {
         /// One or more input files or directories. If unset, we will use all entries in the current working directory.
-        #[clap(parse(from_os_str))]
+        #[clap(value_parser)]
         input: Vec<PathBuf>,
     },
     /// Aggregrate the consumed space of one or more directories or files
@@ -106,7 +106,7 @@ pub enum Command {
         #[clap(long)]
         no_total: bool,
         /// One or more input files or directories. If unset, we will use all entries in the current working directory.
-        #[clap(parse(from_os_str))]
+        #[clap(value_parser)]
         input: Vec<PathBuf>,
     },
 }
