chore(cli): Migrate to Derive API

Change the definition of CLI from the Builder API to the Derive API.

src/cli.rs

@@ -1,326 +1,258 @@
-use clap::{Arg, Command, builder::PossibleValue, value_parser};
+use std::fmt;
+
+use clap::{Parser, ValueEnum, ValueHint};
 
 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
 
-pub fn build_cli() -> Command {
-    Command::new("Dust")
-        .about("Like du but more intuitive")
-        .version(env!("CARGO_PKG_VERSION"))
-        .arg(
-            Arg::new("depth")
-                .short('d')
-                .long("depth")
-                .value_name("DEPTH")
-                .value_parser(value_parser!(usize))
-                .help("Depth to show")
-                .num_args(1)
-        )
-        .arg(
-            Arg::new("threads")
-                .short('T')
-                .long("threads")
-                .value_parser(value_parser!(usize))
-                .help("Number of threads to use")
-                .num_args(1)
-        )
-        .arg(
-            Arg::new("config")
-                .long("config")
-                .help("Specify a config file to use")
-                .value_name("FILE")
-                .value_hint(clap::ValueHint::FilePath)
-                .value_parser(value_parser!(String))
-                .num_args(1)
-        )
-        .arg(
-            Arg::new("number_of_lines")
-                .short('n')
-                .long("number-of-lines")
-                .value_name("NUMBER")
-                .value_parser(value_parser!(usize))
-                .help("Number of lines of output to show. (Default is terminal_height - 10)")
-                .num_args(1)
-        )
-        .arg(
-            Arg::new("display_full_paths")
-                .short('p')
-                .long("full-paths")
-                .action(clap::ArgAction::SetTrue)
-                .help("Subdirectories will not have their path shortened"),
-        )
-        .arg(
-            Arg::new("ignore_directory")
-                .short('X')
-                .long("ignore-directory")
-                .value_name("PATH")
-                .value_hint(clap::ValueHint::AnyPath)
-                .action(clap::ArgAction::Append)
-                .help("Exclude any file or directory with this path"),
-        )
-        .arg(
-            Arg::new("ignore_all_in_file")
-                .short('I')
-                .long("ignore-all-in-file")
-                .value_name("FILE")
-                .value_hint(clap::ValueHint::FilePath)
-                .value_parser(value_parser!(String))
-                .help("Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter"),
-        )
-         .arg(
-            Arg::new("dereference_links")
-                .short('L')
-                .long("dereference-links")
-                .action(clap::ArgAction::SetTrue)
-                .help("dereference sym links - Treat sym links as directories and go into them"),
-        )
-        .arg(
-            Arg::new("limit_filesystem")
-                .short('x')
-                .long("limit-filesystem")
-                .action(clap::ArgAction::SetTrue)
-                .help("Only count the files and directories on the same filesystem as the supplied directory"),
-        )
-        .arg(
-            Arg::new("display_apparent_size")
-                .short('s')
-                .long("apparent-size")
-                .action(clap::ArgAction::SetTrue)
-                .help("Use file length instead of blocks"),
-        )
-        .arg(
-            Arg::new("reverse")
-                .short('r')
-                .long("reverse")
-                .action(clap::ArgAction::SetTrue)
-                .help("Print tree upside down (biggest highest)"),
-        )
-        .arg(
-            Arg::new("no_colors")
-                .short('c')
-                .long("no-colors")
-                .action(clap::ArgAction::SetTrue)
-                .help("No colors will be printed (Useful for commands like: watch)"),
-        )
-        .arg(
-            Arg::new("force_colors")
-                .short('C')
-                .long("force-colors")
-                .action(clap::ArgAction::SetTrue)
-                .help("Force colors print"),
-        )
-        .arg(
-            Arg::new("no_bars")
-                .short('b')
-                .long("no-percent-bars")
-                .action(clap::ArgAction::SetTrue)
-                .help("No percent bars or percentages will be displayed"),
-        )
-        .arg(
-            Arg::new("bars_on_right")
-                .short('B')
-                .long("bars-on-right")
-                .action(clap::ArgAction::SetTrue)
-                .help("percent bars moved to right side of screen"),
-        )
-        .arg(
-            Arg::new("min_size")
-                .short('z')
-                .long("min-size")
-                .value_name("MIN_SIZE")
-                .num_args(1)
-                .help("Minimum size file to include in output"),
-        )
-        .arg(
-            Arg::new("screen_reader")
-                .short('R')
-                .long("screen-reader")
-                .action(clap::ArgAction::SetTrue)
-                .help("For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)"),
-        )
-        .arg(
-            Arg::new("skip_total")
-                .long("skip-total")
-                .action(clap::ArgAction::SetTrue)
-                .help("No total row will be displayed"),
-        )
-        .arg(
-            Arg::new("by_filecount")
-                .short('f')
-                .long("filecount")
-                .action(clap::ArgAction::SetTrue)
-                .help("Directory 'size' is number of child files instead of disk size"),
-        )
-        .arg(
-            Arg::new("ignore_hidden")
-                .short('i') // Do not use 'h' this is used by 'help'
-                .long("ignore-hidden")
-                .action(clap::ArgAction::SetTrue)
-                .help("Do not display hidden files"),
-        )
-        .arg(
-            Arg::new("invert_filter")
-                .short('v')
-                .long("invert-filter")
-                .value_name("REGEX")
-                .action(clap::ArgAction::Append)
-                .conflicts_with("filter")
-                .conflicts_with("types")
-                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
-        )
-        .arg(
-            Arg::new("filter")
-                .short('e')
-                .long("filter")
-                .value_name("REGEX")
-                .action(clap::ArgAction::Append)
-                .conflicts_with("types")
-                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
-        )
-        .arg(
-            Arg::new("types")
-                .short('t')
-                .long("file-types")
-                .conflicts_with("depth")
-                .conflicts_with("only_dir")
-                .action(clap::ArgAction::SetTrue)
-                .help("show only these file types"),
-        )
-        .arg(
-            Arg::new("width")
-                .short('w')
-                .long("terminal-width")
-                .value_name("WIDTH")
-                .value_parser(value_parser!(usize))
-                .num_args(1)
-                .help("Specify width of output overriding the auto detection of terminal width"),
-        )
-        .arg(
-            Arg::new("disable_progress")
-                .short('P')
-                .long("no-progress")
-                .action(clap::ArgAction::SetTrue)
-                .help("Disable the progress indication."),
-        )
-        .arg(
-            Arg::new("print_errors")
-                .long("print-errors")
-                .action(clap::ArgAction::SetTrue)
-                .help("Print path with errors."),
-        )
-        .arg(
-            Arg::new("only_dir")
-                .short('D')
-                .long("only-dir")
-                .conflicts_with("only_file")
-                .conflicts_with("types")
-                .action(clap::ArgAction::SetTrue)
-                .help("Only directories will be displayed."),
-        )
-        .arg(
-            Arg::new("only_file")
-                .short('F')
-                .long("only-file")
-                .conflicts_with("only_dir")
-                .action(clap::ArgAction::SetTrue)
-                .help("Only files will be displayed. (Finds your largest files)"),
-        )
-        .arg(
-            Arg::new("output_format")
-                .short('o')
-                .long("output-format")
-                .value_name("FORMAT")
-                .value_parser([
-                    PossibleValue::new("si"),
-                    PossibleValue::new("b"),
-                    PossibleValue::new("k").alias("kib"),
-                    PossibleValue::new("m").alias("mib"),
-                    PossibleValue::new("g").alias("gib"),
-                    PossibleValue::new("t").alias("tib"),
-                    PossibleValue::new("kb"),
-                    PossibleValue::new("mb"),
-                    PossibleValue::new("gb"),
-                    PossibleValue::new("tb"),
-                ])
-                .ignore_case(true)
-                .help("Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.")
-        )
-        .arg(
-            Arg::new("stack_size")
-                .short('S')
-                .long("stack-size")
-                .value_name("STACK_SIZE")
-                .value_parser(value_parser!(usize))
-                .num_args(1)
-                .help("Specify memory to use as stack size - use if you see: 'fatal runtime error: stack overflow' (default low memory=1048576, high memory=1073741824)"),
-        )
-        .arg(
-            Arg::new("params")
-                .value_name("PATH")
-                .value_hint(clap::ValueHint::AnyPath)
-                .value_parser(value_parser!(String))
-                .num_args(1..)
-        )
-        .arg(
-            Arg::new("output_json")
-                .short('j')
-                .long("output-json")
-                .action(clap::ArgAction::SetTrue)
-                .help("Output the directory tree as json to the current directory"),
-        )
-        .arg(
-            Arg::new("mtime")
-            .short('M')
-            .long("mtime")
-            .num_args(1)
-            .allow_hyphen_values(true)
-            .value_parser(value_parser!(String))
-            .help("+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)")
-        )
-        .arg(
-            Arg::new("atime")
-            .short('A')
-            .long("atime")
-            .num_args(1)
-            .allow_hyphen_values(true)
-            .value_parser(value_parser!(String))
-            .help("just like -mtime, but based on file access time")
-        )
-        .arg(
-            Arg::new("ctime")
-            .short('y')
-            .long("ctime")
-            .num_args(1)
-            .allow_hyphen_values(true)
-            .value_parser(value_parser!(String))
-            .help("just like -mtime, but based on file change time")
-        )
-        .arg(
-            Arg::new("files0_from")
-                .long("files0-from")
-                .value_hint(clap::ValueHint::AnyPath)
-                .value_parser(value_parser!(String))
-                .num_args(1)
-                .help("run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input"),
-        )
-        .arg(
-            Arg::new("collapse")
-                .long("collapse")
-                .value_hint(clap::ValueHint::AnyPath)
-                .value_parser(value_parser!(String))
-                .action(clap::ArgAction::Append)
-                .help("Keep these directories collapsed"),
-        )
-        .arg(
-            Arg::new("filetime")
-                .short('m')
-                .long("filetime")
-                .num_args(1)
-                .value_parser([
-                    PossibleValue::new("a").alias("accessed"),
-                    PossibleValue::new("c").alias("changed"),
-                    PossibleValue::new("m").alias("modified"),
-                ])
-                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time"),
-        )
+/// Like du but more intuitive
+#[derive(Debug, Parser)]
+#[command(name("Dust"), version)]
+pub struct Cli {
+    /// Depth to show
+    #[arg(short, long)]
+    pub depth: Option<usize>,
+
+    /// Number of threads to use
+    #[arg(short('T'), long)]
+    pub threads: Option<usize>,
+
+    /// Specify a config file to use
+    #[arg(long, value_name("FILE"), value_hint(ValueHint::FilePath))]
+    pub config: Option<String>,
+
+    /// Number of lines of output to show. (Default is terminal_height - 10)
+    #[arg(short, long, value_name("NUMBER"))]
+    pub number_of_lines: Option<usize>,
+
+    /// Subdirectories will not have their path shortened
+    #[arg(short('p'), long)]
+    pub full_paths: bool,
+
+    /// Exclude any file or directory with this path
+    #[arg(short('X'), long, value_name("PATH"), value_hint(ValueHint::AnyPath))]
+    pub ignore_directory: Option<Vec<String>>,
+
+    /// Exclude any file or directory with a regex matching that listed in this
+    /// file, the file entries will be added to the ignore regexs provided by
+    /// --invert_filter
+    #[arg(short('I'), long, value_name("FILE"), value_hint(ValueHint::FilePath))]
+    pub ignore_all_in_file: Option<String>,
+
+    /// dereference sym links - Treat sym links as directories and go into them
+    #[arg(short('L'), long)]
+    pub dereference_links: bool,
+
+    /// Only count the files and directories on the same filesystem as the
+    /// supplied directory
+    #[arg(short('x'), long)]
+    pub limit_filesystem: bool,
+
+    /// Use file length instead of blocks
+    #[arg(short('s'), long)]
+    pub apparent_size: bool,
+
+    /// Print tree upside down (biggest highest)
+    #[arg(short, long)]
+    pub reverse: bool,
+
+    /// No colors will be printed (Useful for commands like: watch)
+    #[arg(short('c'), long)]
+    pub no_colors: bool,
+
+    /// Force colors print
+    #[arg(short('C'), long)]
+    pub force_colors: bool,
+
+    /// No percent bars or percentages will be displayed
+    #[arg(short('b'), long)]
+    pub no_percent_bars: bool,
+
+    /// percent bars moved to right side of screen
+    #[arg(short('B'), long)]
+    pub bars_on_right: bool,
+
+    /// Minimum size file to include in output
+    #[arg(short('z'), long)]
+    pub min_size: Option<String>,
+
+    /// For screen readers. Removes bars. Adds new column: depth level (May want
+    /// to use -p too for full path)
+    #[arg(short('R'), long)]
+    pub screen_reader: bool,
+
+    /// No total row will be displayed
+    #[arg(long)]
+    pub skip_total: bool,
+
+    /// Directory 'size' is number of child files instead of disk size
+    #[arg(short, long)]
+    pub filecount: bool,
+
+    /// Do not display hidden files
+    // Do not use 'h' this is used by 'help'
+    #[arg(short, long)]
+    pub ignore_hidden: bool,
+
+    /// Exclude filepaths matching this regex. To ignore png files type: -v
+    /// "\.png$"
+    #[arg(
+        short('v'),
+        long,
+        value_name("REGEX"),
+        conflicts_with("filter"),
+        conflicts_with("file_types")
+    )]
+    pub invert_filter: Option<Vec<String>>,
+
+    /// Only include filepaths matching this regex. For png files type: -e
+    /// "\.png$"
+    #[arg(short('e'), long, value_name("REGEX"), conflicts_with("file_types"))]
+    pub filter: Option<Vec<String>>,
+
+    /// show only these file types
+    #[arg(short('t'), long, conflicts_with("depth"), conflicts_with("only_dir"))]
+    pub file_types: bool,
+
+    /// Specify width of output overriding the auto detection of terminal width
+    #[arg(short('w'), long, value_name("WIDTH"))]
+    pub terminal_width: Option<usize>,
+
+    /// Disable the progress indication.
+    #[arg(short('P'), long)]
+    pub no_progress: bool,
+
+    /// Print path with errors.
+    #[arg(long)]
+    pub print_errors: bool,
+
+    /// Only directories will be displayed.
+    #[arg(
+        short('D'),
+        long,
+        conflicts_with("only_file"),
+        conflicts_with("file_types")
+    )]
+    pub only_dir: bool,
+
+    /// Only files will be displayed. (Finds your largest files)
+    #[arg(short('F'), long, conflicts_with("only_dir"))]
+    pub only_file: bool,
+
+    /// Changes output display size. si will print sizes in powers of 1000. b k
+    /// m g t kb mb gb tb will print the whole tree in that size.
+    #[arg(short, long, value_enum, value_name("FORMAT"), ignore_case(true))]
+    pub output_format: Option<OutputFormat>,
+
+    /// Specify memory to use as stack size - use if you see: 'fatal runtime
+    /// error: stack overflow' (default low memory=1048576, high
+    /// memory=1073741824)
+    #[arg(short('S'), long)]
+    pub stack_size: Option<usize>,
+
+    /// Input files or directories.
+    #[arg(value_name("PATH"), value_hint(ValueHint::AnyPath))]
+    pub params: Option<Vec<String>>,
+
+    /// Output the directory tree as json to the current directory
+    #[arg(short('j'), long)]
+    pub output_json: bool,
+
+    /// +/-n matches files modified more/less than n days ago , and n matches
+    /// files modified exactly n days ago, days are rounded down.That is +n =>
+    /// (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
+    #[arg(short('M'), long, allow_hyphen_values(true))]
+    pub mtime: Option<String>,
+
+    /// just like -mtime, but based on file access time
+    #[arg(short('A'), long, allow_hyphen_values(true))]
+    pub atime: Option<String>,
+
+    /// just like -mtime, but based on file change time
+    #[arg(short('y'), long, allow_hyphen_values(true))]
+    pub ctime: Option<String>,
+
+    /// run dust on NUL-terminated file names specified in file; if argument is
+    /// -, then read names from standard input
+    #[arg(long, value_hint(ValueHint::AnyPath))]
+    pub files0_from: Option<String>,
+
+    /// Keep these directories collapsed
+    #[arg(long, value_hint(ValueHint::AnyPath))]
+    pub collapse: Option<Vec<String>>,
+
+    /// Directory 'size' is max filetime of child files instead of disk size.
+    /// while a/c/m for last accessed/changed/modified time
+    #[arg(short('m'), long, value_enum)]
+    pub filetime: Option<FileTime>,
+}
+
+#[derive(Clone, Copy, Debug, ValueEnum)]
+#[value(rename_all = "lower")]
+pub enum OutputFormat {
+    /// SI prefix (powers of 1000)
+    SI,
+
+    /// byte (B)
+    B,
+
+    /// kibibyte (KiB)
+    #[value(name = "k", alias("kib"))]
+    KiB,
+
+    /// mebibyte (MiB)
+    #[value(name = "m", alias("mib"))]
+    MiB,
+
+    /// gibibyte (GiB)
+    #[value(name = "g", alias("gib"))]
+    GiB,
+
+    /// tebibyte (TiB)
+    #[value(name = "t", alias("tib"))]
+    TiB,
+
+    /// kilobyte (kB)
+    KB,
+
+    /// megabyte (MB)
+    MB,
+
+    /// gigabyte (GB)
+    GB,
+
+    /// terabyte (TB)
+    TB,
+}
+
+impl fmt::Display for OutputFormat {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::SI => write!(f, "si"),
+            Self::B => write!(f, "b"),
+            Self::KiB => write!(f, "k"),
+            Self::MiB => write!(f, "m"),
+            Self::GiB => write!(f, "g"),
+            Self::TiB => write!(f, "t"),
+            Self::KB => write!(f, "kb"),
+            Self::MB => write!(f, "mb"),
+            Self::GB => write!(f, "gb"),
+            Self::TB => write!(f, "tb"),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, ValueEnum)]
+pub enum FileTime {
+    /// last accessed time
+    #[value(name = "a", alias("accessed"))]
+    Accessed,
+
+    /// last changed time
+    #[value(name = "c", alias("changed"))]
+    Changed,
+
+    /// last modified time
+    #[value(name = "m", alias("modified"))]
+    Modified,
 }

src/config.rs

@@ -1,12 +1,12 @@
 use crate::node::FileTime;
 use chrono::{Local, TimeZone};
-use clap::ArgMatches;
 use config_file::FromConfigFile;
 use regex::Regex;
 use serde::Deserialize;
 use std::path::Path;
 use std::path::PathBuf;
 
+use crate::cli::Cli;
 use crate::dir_walker::Operator;
 use crate::display::get_number_format;
 
@@ -39,77 +39,68 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
-        let from_file = options.get_one::<String>("files0_from");
+    pub fn get_files_from(&self, options: &Cli) -> Option<String> {
+        let from_file = &options.files0_from;
         match from_file {
             None => self.files0_from.as_ref().map(|x| x.to_string()),
             Some(x) => Some(x.to_string()),
         }
     }
-    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_colors || options.get_flag("no_colors")
+    pub fn get_no_colors(&self, options: &Cli) -> bool {
+        Some(true) == self.no_colors || options.no_colors
     }
-    pub fn get_force_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.force_colors || options.get_flag("force_colors")
+    pub fn get_force_colors(&self, options: &Cli) -> bool {
+        Some(true) == self.force_colors || options.force_colors
     }
-    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.disable_progress || options.get_flag("disable_progress")
+    pub fn get_disable_progress(&self, options: &Cli) -> bool {
+        Some(true) == self.disable_progress || options.no_progress
     }
-    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_apparent_size || options.get_flag("display_apparent_size")
+    pub fn get_apparent_size(&self, options: &Cli) -> bool {
+        Some(true) == self.display_apparent_size || options.apparent_size
     }
-    pub fn get_ignore_hidden(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.ignore_hidden || options.get_flag("ignore_hidden")
+    pub fn get_ignore_hidden(&self, options: &Cli) -> bool {
+        Some(true) == self.ignore_hidden || options.ignore_hidden
     }
-    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_full_paths || options.get_flag("display_full_paths")
+    pub fn get_full_paths(&self, options: &Cli) -> bool {
+        Some(true) == self.display_full_paths || options.full_paths
     }
-    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.reverse || options.get_flag("reverse")
+    pub fn get_reverse(&self, options: &Cli) -> bool {
+        Some(true) == self.reverse || options.reverse
     }
-    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_bars || options.get_flag("no_bars")
+    pub fn get_no_bars(&self, options: &Cli) -> bool {
+        Some(true) == self.no_bars || options.no_percent_bars
     }
-    pub fn get_output_format(&self, options: &ArgMatches) -> String {
-        let out_fmt = options.get_one::<String>("output_format");
+    pub fn get_output_format(&self, options: &Cli) -> String {
+        let out_fmt = options.output_format;
         (match out_fmt {
             None => match &self.output_format {
                 None => "".to_string(),
                 Some(x) => x.to_string(),
             },
-            Some(x) => x.into(),
+            Some(x) => x.to_string(),
         })
         .to_lowercase()
     }
 
-    pub fn get_filetime(&self, options: &ArgMatches) -> Option<FileTime> {
-        let out_fmt = options.get_one::<String>("filetime");
-        match out_fmt {
-            None => None,
-            Some(x) => match x.as_str() {
-                "m" | "modified" => Some(FileTime::Modified),
-                "a" | "accessed" => Some(FileTime::Accessed),
-                "c" | "changed" => Some(FileTime::Changed),
-                _ => unreachable!(),
-            },
-        }
+    pub fn get_filetime(&self, options: &Cli) -> Option<FileTime> {
+        options.filetime.map(FileTime::from)
     }
 
-    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.skip_total || options.get_flag("skip_total")
+    pub fn get_skip_total(&self, options: &Cli) -> bool {
+        Some(true) == self.skip_total || options.skip_total
     }
-    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.screen_reader || options.get_flag("screen_reader")
+    pub fn get_screen_reader(&self, options: &Cli) -> bool {
+        Some(true) == self.screen_reader || options.screen_reader
     }
-    pub fn get_depth(&self, options: &ArgMatches) -> usize {
-        if let Some(v) = options.get_one::<usize>("depth") {
-            return *v;
+    pub fn get_depth(&self, options: &Cli) -> usize {
+        if let Some(v) = options.depth {
+            return v;
         }
 
         self.depth.unwrap_or(usize::MAX)
     }
-    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
-        let size_from_param = options.get_one::<String>("min_size");
+    pub fn get_min_size(&self, options: &Cli) -> Option<usize> {
+        let size_from_param = options.min_size.as_ref();
         self._get_min_size(size_from_param)
     }
     fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
@@ -123,58 +114,49 @@ impl Config {
             size_from_param
         }
     }
-    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_dir || options.get_flag("only_dir")
+    pub fn get_only_dir(&self, options: &Cli) -> bool {
+        Some(true) == self.only_dir || options.only_dir
     }
 
-    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.print_errors || options.get_flag("print_errors")
+    pub fn get_print_errors(&self, options: &Cli) -> bool {
+        Some(true) == self.print_errors || options.print_errors
     }
-    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_file || options.get_flag("only_file")
+    pub fn get_only_file(&self, options: &Cli) -> bool {
+        Some(true) == self.only_file || options.only_file
     }
-    pub fn get_bars_on_right(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.bars_on_right || options.get_flag("bars_on_right")
+    pub fn get_bars_on_right(&self, options: &Cli) -> bool {
+        Some(true) == self.bars_on_right || options.bars_on_right
     }
-    pub fn get_custom_stack_size(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("stack_size");
+    pub fn get_custom_stack_size(&self, options: &Cli) -> Option<usize> {
+        let from_cmd_line = options.stack_size;
         if from_cmd_line.is_none() {
             self.stack_size
         } else {
-            from_cmd_line.copied()
+            from_cmd_line
         }
     }
-    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("threads");
+    pub fn get_threads(&self, options: &Cli) -> Option<usize> {
+        let from_cmd_line = options.threads;
         if from_cmd_line.is_none() {
             self.threads
         } else {
-            from_cmd_line.copied()
+            from_cmd_line
         }
     }
-    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.output_json || options.get_flag("output_json")
+    pub fn get_output_json(&self, options: &Cli) -> bool {
+        Some(true) == self.output_json || options.output_json
     }
 
-    pub fn get_modified_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
-            options.get_one::<String>("mtime"),
-            get_current_date_epoch_seconds(),
-        )
+    pub fn get_modified_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+        get_filter_time_operator(options.mtime.as_ref(), get_current_date_epoch_seconds())
     }
 
-    pub fn get_accessed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
-            options.get_one::<String>("atime"),
-            get_current_date_epoch_seconds(),
-        )
+    pub fn get_accessed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+        get_filter_time_operator(options.atime.as_ref(), get_current_date_epoch_seconds())
     }
 
-    pub fn get_changed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
-            options.get_one::<String>("ctime"),
-            get_current_date_epoch_seconds(),
-        )
+    pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+        get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
     }
 }
 
@@ -250,10 +232,10 @@ fn get_config_locations(base: &Path) -> Vec<PathBuf> {
     ]
 }
 
-pub fn get_config(conf_path: Option<String>) -> Config {
+pub fn get_config(conf_path: Option<&String>) -> Config {
     match conf_path {
         Some(path_str) => {
-            let path = Path::new(&path_str);
+            let path = Path::new(path_str);
             if path.exists() {
                 match Config::from_config_file(path) {
                     Ok(config) => return config,
@@ -287,8 +269,7 @@ mod tests {
     #[allow(unused_imports)]
     use super::*;
     use chrono::{Datelike, Timelike};
-    use clap::builder::PossibleValue;
-    use clap::{Arg, ArgMatches, Command, value_parser};
+    use clap::Parser;
 
     #[test]
     fn test_get_current_date_epoch_seconds() {
@@ -357,15 +338,8 @@ mod tests {
         assert_eq!(c.get_depth(&args), 5);
     }
 
-    fn get_args(args: Vec<&str>) -> ArgMatches {
-        Command::new("Dust")
-            .arg(
-                Arg::new("depth")
-                    .long("depth")
-                    .num_args(1)
-                    .value_parser(value_parser!(usize)),
-            )
-            .get_matches_from(args)
+    fn get_args(args: Vec<&str>) -> Cli {
+        Cli::parse_from(args)
     }
 
     #[test]
@@ -403,20 +377,7 @@ mod tests {
         assert_eq!(c.get_filetime(&args), Some(FileTime::Changed));
     }
 
-    fn get_filetime_args(args: Vec<&str>) -> ArgMatches {
-        Command::new("Dust")
-        .arg(
-            Arg::new("filetime")
-                .short('m')
-                .long("filetime")
-                .num_args(1)
-                .value_parser([
-                    PossibleValue::new("a").alias("accessed"),
-                    PossibleValue::new("c").alias("changed"),
-                    PossibleValue::new("m").alias("modified"),
-                ])
-                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for accessed/changed/modified time"),
-        )
-            .get_matches_from(args)
+    fn get_filetime_args(args: Vec<&str>) -> Cli {
+        Cli::parse_from(args)
     }
 }

src/main.rs

@@ -10,9 +10,9 @@ mod platform;
 mod progress;
 mod utils;
 
-use crate::cli::build_cli;
+use crate::cli::Cli;
 use crate::progress::RuntimeErrors;
-use clap::parser::ValuesRef;
+use clap::Parser;
 use dir_walker::WalkData;
 use display::InitialDisplayData;
 use filter::AggregateData;
@@ -98,9 +98,10 @@ fn get_width_of_terminal() -> usize {
         .unwrap_or(DEFAULT_TERMINAL_WIDTH)
 }
 
-fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
+fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
     maybe_value
-        .unwrap_or_default()
+        .unwrap_or(&Vec::new())
+        .iter()
         .map(|reg| {
             Regex::new(reg).unwrap_or_else(|err| {
                 eprintln!("Ignoring bad value for regex {err:?}");
@@ -111,8 +112,8 @@ fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
 }
 
 fn main() {
-    let options = build_cli().get_matches();
-    let config = get_config(options.get_one::<String>("config").cloned());
+    let options = Cli::parse();
+    let config = get_config(options.config.as_ref());
 
     let errors = RuntimeErrors::default();
     let error_listen_for_ctrlc = Arc::new(Mutex::new(errors));
@@ -148,19 +149,19 @@ fn main() {
                 }
             }
         }
-        None => match options.get_many::<String>("params") {
-            Some(values) => values.cloned().collect(),
+        None => match options.params {
+            Some(ref values) => values.clone(),
             None => vec![".".to_owned()],
         },
     };
 
-    let summarize_file_types = options.get_flag("types");
+    let summarize_file_types = options.file_types;
 
-    let filter_regexs = get_regex_value(options.get_many("filter"));
-    let invert_filter_regexs = get_regex_value(options.get_many("invert_filter"));
+    let filter_regexs = get_regex_value(options.filter.as_ref());
+    let invert_filter_regexs = get_regex_value(options.invert_filter.as_ref());
 
-    let terminal_width: usize = match options.get_one::<usize>("width") {
-        Some(&val) => val,
+    let terminal_width: usize = match options.terminal_width {
+        Some(val) => val,
         None => get_width_of_terminal(),
     };
 
@@ -169,8 +170,8 @@ fn main() {
     // If depth is set, then we set the default number_of_lines to be max
     // instead of screen height
 
-    let number_of_lines = match options.get_one::<usize>("number_of_lines") {
-        Some(&val) => val,
+    let number_of_lines = match options.number_of_lines {
+        Some(val) => val,
         None => {
             if depth != usize::MAX {
                 usize::MAX
@@ -185,17 +186,17 @@ fn main() {
         config.get_force_colors(&options),
     );
 
-    let ignore_directories = match options.get_many::<String>("ignore_directory") {
-        Some(values) => values
-            .map(|v| v.as_str())
+    let ignore_directories = match options.ignore_directory {
+        Some(ref values) => values
+            .iter()
             .map(PathBuf::from)
             .map(canonicalize_absolute_path)
             .collect::<Vec<PathBuf>>(),
         None => vec![],
     };
 
-    let ignore_from_file_result = match options.get_one::<String>("ignore_all_in_file") {
-        Some(val) => read_to_string(val)
+    let ignore_from_file_result = match options.ignore_all_in_file {
+        Some(ref val) => read_to_string(val)
             .unwrap()
             .lines()
             .map(Regex::new)
@@ -212,10 +213,10 @@ fn main() {
         .chain(ignore_from_file)
         .collect::<Vec<Regex>>();
 
-    let by_filecount = options.get_flag("by_filecount");
+    let by_filecount = options.filecount;
     let by_filetime = config.get_filetime(&options);
-    let limit_filesystem = options.get_flag("limit_filesystem");
-    let follow_links = options.get_flag("dereference_links");
+    let limit_filesystem = options.limit_filesystem;
+    let follow_links = options.dereference_links;
 
     let allowed_filesystems = limit_filesystem
         .then(|| get_filesystem_devices(&target_dirs, follow_links))
@@ -236,8 +237,8 @@ fn main() {
         indicator.spawn(output_format.clone())
     }
 
-    let keep_collapsed: HashSet<PathBuf> = match options.get_many::<String>("collapse") {
-        Some(collapse) => {
+    let keep_collapsed: HashSet<PathBuf> = match options.collapse {
+        Some(ref collapse) => {
             let mut combined_dirs = HashSet::new();
             for collapse_dir in collapse {
                 for target_dir in target_dirs.iter() {

src/node.rs

@@ -23,6 +23,16 @@ pub enum FileTime {
     Changed,
 }
 
+impl From<crate::cli::FileTime> for FileTime {
+    fn from(time: crate::cli::FileTime) -> Self {
+        match time {
+            crate::cli::FileTime::Modified => Self::Modified,
+            crate::cli::FileTime::Accessed => Self::Accessed,
+            crate::cli::FileTime::Changed => Self::Changed,
+        }
+    }
+}
+
 #[allow(clippy::too_many_arguments)]
 pub fn build_node(
     dir: PathBuf,