fix: status mesages go to stderr not stdout

Progress spinner and status line are written to stderr
instead of stdout.

No longer any need to detect if stdout is being redirected.

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "1.2.4"
+version = "1.1.2"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
 edition = "2024"
 readme = "README.md"
@@ -27,11 +27,11 @@ lto = true
 strip = true
 
 [dependencies]
-clap = { version = "4", features = ["derive"] }
-lscolors = "0.21"
-nu-ansi-term = "0.50"
-terminal_size = "0.4"
-unicode-width = "0.2"
+ansi_term = "0.12"
+clap = "4.4"
+lscolors = "0.13"
+terminal_size = "0.2"
+unicode-width = "0.1"
 rayon = "1"
 thousands = "0.2"
 stfu8 = "0.2"
@@ -39,8 +39,9 @@ regex = "1"
 config-file = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sysinfo = "0.37"
-ctrlc = "3"
+directories = "4"
+sysinfo = "0.27"
+ctrlc = "3.4"
 chrono = "0.4"
 
 [target.'cfg(not(target_has_atomic = "64"))'.dependencies]
@@ -55,7 +56,7 @@ assert_cmd = "2"
 tempfile = "=3"
 
 [build-dependencies]
-clap = { version = "4.4", features = ["derive"] }
+clap = "4.4"
 clap_complete = "4.4"
 clap_mangen = "0.2"
 

README.md

@@ -13,17 +13,6 @@ Because I want an easy way to see where my disk is being used.
 
 ![Example](media/snap.png)
 
-Study the above picture. 
-
-* We see `target` has 1.8G
-* `target/debug` is the same size as `target` - so we know nearly all the disk usage of the 1.5G is in this folder
-* `target/debug/deps` this is 1.2G - Note the bar jumps down to 70% to indicate that most disk usage is here but not all.
-* `target/debug/deps/dust-e78c9f87a17f24f3` - This is the largest file in this folder, but it is only 46M - Note the bar jumps down to 3% to indicate the file is small.
-
-From here we can conclude:
- * `target/debug/deps` takes the majority of the space in `target` and that `target/debug/deps` has a large number of relatively small files.
-  
-
 ## Install
 
 #### Cargo <a href="https://repology.org/project/du-dust/versions"><img src="https://repology.org/badge/vertical-allrepos/du-dust.svg" alt="Packaging status" align="right"></a>
@@ -80,8 +69,6 @@ Dust will list a slightly-less-than-the-terminal-height number of the biggest su
 
 The different colors on the bars: These represent the combined tree hierarchy & disk usage. The shades of grey are used to indicate which parent folder a subfolder belongs to. For instance, look at the above screenshot. `.steam` is a folder taking 44% of the space. From the `.steam` bar is a light grey line that goes up. All these folders are inside `.steam` so if you delete `.steam` all that stuff will be gone too.
 
-If you are new to the tool I recommend to try tweaking the `-n` parameter. `dust -n 10`, `dust -n 50`.
-
 ## Usage
 
 ```
@@ -103,7 +90,7 @@ Usage: dust -B (--bars-on-right - Percent bars moved to right side of screen)
 Usage: dust -i (Do not show hidden files)
 Usage: dust -c (No colors [monochrome])
 Usage: dust -C (Force colors)
-Usage: dust -f (Count files instead of diskspace [Counts by inode, to include duplicate inodes use dust -f -s])
+Usage: dust -f (Count files instead of diskspace)
 Usage: dust -t (Group by filetype)
 Usage: dust -z 10M (min-size, Only include files larger than 10M)
 Usage: dust -e regex (Only include files matching this regex (eg dust -e "\.png$" would match png files))
@@ -115,8 +102,7 @@ Usage: dust -S (Custom Stack size - Use if you see: 'fatal runtime error: stack
 Usage: dust --skip-total (No total row will be displayed)
 Usage: dust -z 40000/30MB/20kib (Exclude output files/directories below size 40000 bytes / 30MB / 20KiB)
 Usage: dust -j (Prints JSON representation of directories, try: dust -j  | jq)
-Usage: dust --files0-from=FILE (Read NUL-terminated file paths from FILE; if FILE is '-', read from stdin)
-Usage: dust --files-from=FILE (Read newline-terminated file paths from FILE; if FILE is '-', read from stdin)
+Usage: dust --files0-from=FILE (Reads null-terminated file paths from FILE); If FILE is - then read from stdin
 Usage: dust --collapse=node-modules will keep the node-modules folder collapsed in display instead of recursively opening it
 ```
 
@@ -136,16 +122,6 @@ reverse=true
 - [dua](https://github.com/Byron/dua-cli/)
 - [pdu](https://github.com/KSXGitHub/parallel-disk-usage)
 - [dirstat-rs](https://github.com/scullionw/dirstat-rs)
-- `du -d 1 -h | sort -h`
-
-## Why to use Dust over the Alternatives
-
-Dust simply Does The Right Thing when handling lots of small files & directories. Dust keeps the output simple by only showing large entries.
-
-Tools like ncdu & baobab, give you a view of directory sizes but you have no idea where the largest files are. For example directory A could have a size larger than directory B, but in fact the largest file is in B and not A. Finding this out via these other tools is not trivial whereas Dust will show the large file clearly in the tree hierarchy 
-
-Dust will not count hard links multiple times (unless you want to `-s`).
-
-Typing `dust -n 90` will show you your 90 largest entries. `-n` is not quite like `head -n` or `tail -n`, dust is intelligent and chooses the largest entries
-
+- du -d 1 -h | sort -h
 
+Note: Apparent-size is calculated slightly differently in dust to gdu. In dust each hard link is counted as using file_length space. In gdu only the first entry is counted.

build.rs

@@ -1,4 +1,3 @@
-use clap::CommandFactory;
 use clap_complete::{generate_to, shells::*};
 use clap_mangen::Man;
 use std::fs::File;
@@ -10,7 +9,7 @@ include!("src/cli.rs");
 fn main() -> Result<(), Error> {
     let outdir = "completions";
     let app_name = "dust";
-    let mut cmd = Cli::command();
+    let mut cmd = build_cli();
 
     generate_to(Bash, &mut cmd, app_name, outdir)?;
     generate_to(Zsh, &mut cmd, app_name, outdir)?;

completions/_dust

@@ -17,60 +17,37 @@ _dust() {
     _arguments "${_arguments_options[@]}" : \
 '-d+[Depth to show]:DEPTH:_default' \
 '--depth=[Depth to show]:DEPTH:_default' \
-'-T+[Number of threads to use]:THREADS:_default' \
-'--threads=[Number of threads to use]:THREADS:_default' \
+'-T+[Number of threads to use]: :_default' \
+'--threads=[Number of threads to use]: :_default' \
 '--config=[Specify a config file to use]:FILE:_files' \
-'-n+[Display the '\''n'\'' largest entries. (Default is terminal_height)]:NUMBER:_default' \
-'--number-of-lines=[Display the '\''n'\'' largest entries. (Default is terminal_height)]:NUMBER:_default' \
+'-n+[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
+'--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
 '*-X+[Exclude any file or directory with this path]:PATH:_files' \
 '*--ignore-directory=[Exclude any file or directory with this path]:PATH:_files' \
 '-I+[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]:FILE:_files' \
 '--ignore-all-in-file=[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]:FILE:_files' \
 '-z+[Minimum size file to include in output]:MIN_SIZE:_default' \
 '--min-size=[Minimum size file to include in output]:MIN_SIZE:_default' \
-'(-e --filter -t --file-types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$"]:REGEX:_default' \
-'(-e --filter -t --file-types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$"]:REGEX:_default' \
-'(-t --file-types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$"]:REGEX:_default' \
-'(-t --file-types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$"]:REGEX:_default' \
+'(-e --filter -t --file_types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX:_default' \
+'(-e --filter -t --file_types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX:_default' \
+'(-t --file_types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX:_default' \
+'(-t --file_types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX:_default' \
 '-w+[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
-'--terminal-width=[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
-'-o+[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]:FORMAT:((si\:"SI prefix (powers of 1000)"
-b\:"byte (B)"
-k\:"kibibyte (KiB)"
-m\:"mebibyte (MiB)"
-g\:"gibibyte (GiB)"
-t\:"tebibyte (TiB)"
-kb\:"kilobyte (kB)"
-mb\:"megabyte (MB)"
-gb\:"gigabyte (GB)"
-tb\:"terabyte (TB)"))' \
-'--output-format=[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]:FORMAT:((si\:"SI prefix (powers of 1000)"
-b\:"byte (B)"
-k\:"kibibyte (KiB)"
-m\:"mebibyte (MiB)"
-g\:"gibibyte (GiB)"
-t\:"tebibyte (TiB)"
-kb\:"kilobyte (kB)"
-mb\:"megabyte (MB)"
-gb\:"gigabyte (GB)"
-tb\:"terabyte (TB)"))' \
+'--terminal_width=[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
+'-o+[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.]:FORMAT:(si b k m g t kb mb gb tb)' \
+'--output-format=[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.]:FORMAT:(si b k m g t kb mb gb tb)' \
 '-S+[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]:STACK_SIZE:_default' \
 '--stack-size=[Specify memory to use as stack size - use if you see\: '\''fatal runtime error\: stack overflow'\'' (default low memory=1048576, high memory=1073741824)]:STACK_SIZE:_default' \
-'-M+[+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]:MTIME:_default' \
-'--mtime=[+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]:MTIME:_default' \
-'-A+[just like -mtime, but based on file access time]:ATIME:_default' \
-'--atime=[just like -mtime, but based on file access time]:ATIME:_default' \
-'-y+[just like -mtime, but based on file change time]:CTIME:_default' \
-'--ctime=[just like -mtime, but based on file change time]:CTIME:_default' \
-'(--files-from)--files0-from=[Read NUL-terminated paths from FILE (use \`-\` for stdin)]:FILES0_FROM:_files' \
-'(--files0-from)--files-from=[Read newline-terminated paths from FILE (use \`-\` for stdin)]:FILES_FROM:_files' \
-'*--collapse=[Keep these directories collapsed]:COLLAPSE:_files' \
-'-m+[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]:FILETIME:((a\:"last accessed time"
-c\:"last changed time"
-m\:"last modified time"))' \
-'--filetime=[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]:FILETIME:((a\:"last accessed time"
-c\:"last changed time"
-m\:"last modified time"))' \
+'-M+[+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
+'--mtime=[+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
+'-A+[just like -mtime, but based on file access time]: :_default' \
+'--atime=[just like -mtime, but based on file access time]: :_default' \
+'-y+[just like -mtime, but based on file change time]: :_default' \
+'--ctime=[just like -mtime, but based on file change time]: :_default' \
+'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]: :_files' \
+'*--collapse=[Keep these directories collapsed]: :_files' \
+'-m+[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]: :(a c m)' \
+'--filetime=[Directory '\''size'\'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time]: :(a c m)' \
 '-p[Subdirectories will not have their path shortened]' \
 '--full-paths[Subdirectories will not have their path shortened]' \
 '-L[dereference sym links - Treat sym links as directories and go into them]' \
@@ -95,23 +72,23 @@ m\:"last modified time"))' \
 '-f[Directory '\''size'\'' is number of child files instead of disk size]' \
 '--filecount[Directory '\''size'\'' is number of child files instead of disk size]' \
 '-i[Do not display hidden files]' \
-'--ignore-hidden[Do not display hidden files]' \
+'--ignore_hidden[Do not display hidden files]' \
 '(-d --depth -D --only-dir)-t[show only these file types]' \
-'(-d --depth -D --only-dir)--file-types[show only these file types]' \
-'-P[Disable the progress indication]' \
-'--no-progress[Disable the progress indication]' \
-'--print-errors[Print path with errors]' \
-'(-F --only-file -t --file-types)-D[Only directories will be displayed]' \
-'(-F --only-file -t --file-types)--only-dir[Only directories will be displayed]' \
+'(-d --depth -D --only-dir)--file_types[show only these file types]' \
+'-P[Disable the progress indication.]' \
+'--no-progress[Disable the progress indication.]' \
+'--print-errors[Print path with errors.]' \
+'(-F --only-file -t --file_types)-D[Only directories will be displayed.]' \
+'(-F --only-file -t --file_types)--only-dir[Only directories will be displayed.]' \
 '(-D --only-dir)-F[Only files will be displayed. (Finds your largest files)]' \
 '(-D --only-dir)--only-file[Only files will be displayed. (Finds your largest files)]' \
 '-j[Output the directory tree as json to the current directory]' \
 '--output-json[Output the directory tree as json to the current directory]' \
-'-h[Print help (see more with '\''--help'\'')]' \
-'--help[Print help (see more with '\''--help'\'')]' \
+'-h[Print help]' \
+'--help[Print help]' \
 '-V[Print version]' \
 '--version[Print version]' \
-'*::params -- Input files or directories:_files' \
+'*::params:_files' \
 && ret=0
 }
 

completions/_dust.ps1

@@ -26,22 +26,22 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
             [CompletionResult]::new('-T', '-T ', [CompletionResultType]::ParameterName, 'Number of threads to use')
             [CompletionResult]::new('--threads', '--threads', [CompletionResultType]::ParameterName, 'Number of threads to use')
             [CompletionResult]::new('--config', '--config', [CompletionResultType]::ParameterName, 'Specify a config file to use')
-            [CompletionResult]::new('-n', '-n', [CompletionResultType]::ParameterName, 'Display the ''n'' largest entries. (Default is terminal_height)')
-            [CompletionResult]::new('--number-of-lines', '--number-of-lines', [CompletionResultType]::ParameterName, 'Display the ''n'' largest entries. (Default is terminal_height)')
+            [CompletionResult]::new('-n', '-n', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
+            [CompletionResult]::new('--number-of-lines', '--number-of-lines', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
             [CompletionResult]::new('-X', '-X ', [CompletionResultType]::ParameterName, 'Exclude any file or directory with this path')
             [CompletionResult]::new('--ignore-directory', '--ignore-directory', [CompletionResultType]::ParameterName, 'Exclude any file or directory with this path')
             [CompletionResult]::new('-I', '-I ', [CompletionResultType]::ParameterName, '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')
             [CompletionResult]::new('--ignore-all-in-file', '--ignore-all-in-file', [CompletionResultType]::ParameterName, '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')
             [CompletionResult]::new('-z', '-z', [CompletionResultType]::ParameterName, 'Minimum size file to include in output')
             [CompletionResult]::new('--min-size', '--min-size', [CompletionResultType]::ParameterName, 'Minimum size file to include in output')
-            [CompletionResult]::new('-v', '-v', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"')
-            [CompletionResult]::new('--invert-filter', '--invert-filter', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"')
-            [CompletionResult]::new('-e', '-e', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$"')
-            [CompletionResult]::new('--filter', '--filter', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$"')
+            [CompletionResult]::new('-v', '-v', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" ')
+            [CompletionResult]::new('--invert-filter', '--invert-filter', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" ')
+            [CompletionResult]::new('-e', '-e', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
+            [CompletionResult]::new('--filter', '--filter', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
             [CompletionResult]::new('-w', '-w', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('--terminal-width', '--terminal-width', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('-o', '-o', [CompletionResultType]::ParameterName, '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')
-            [CompletionResult]::new('--output-format', '--output-format', [CompletionResultType]::ParameterName, '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')
+            [CompletionResult]::new('--terminal_width', '--terminal_width', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
+            [CompletionResult]::new('-o', '-o', [CompletionResultType]::ParameterName, '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.')
+            [CompletionResult]::new('--output-format', '--output-format', [CompletionResultType]::ParameterName, '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.')
             [CompletionResult]::new('-S', '-S ', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
             [CompletionResult]::new('--stack-size', '--stack-size', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
             [CompletionResult]::new('-M', '-M ', [CompletionResultType]::ParameterName, '+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
@@ -50,8 +50,7 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
             [CompletionResult]::new('--atime', '--atime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
             [CompletionResult]::new('-y', '-y', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
             [CompletionResult]::new('--ctime', '--ctime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
-            [CompletionResult]::new('--files0-from', '--files0-from', [CompletionResultType]::ParameterName, 'Read NUL-terminated paths from FILE (use `-` for stdin)')
-            [CompletionResult]::new('--files-from', '--files-from', [CompletionResultType]::ParameterName, 'Read newline-terminated paths from FILE (use `-` for stdin)')
+            [CompletionResult]::new('--files0-from', '--files0-from', [CompletionResultType]::ParameterName, 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input')
             [CompletionResult]::new('--collapse', '--collapse', [CompletionResultType]::ParameterName, 'Keep these directories collapsed')
             [CompletionResult]::new('-m', '-m', [CompletionResultType]::ParameterName, 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time')
             [CompletionResult]::new('--filetime', '--filetime', [CompletionResultType]::ParameterName, 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time')
@@ -79,20 +78,20 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
             [CompletionResult]::new('-f', '-f', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
             [CompletionResult]::new('--filecount', '--filecount', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
             [CompletionResult]::new('-i', '-i', [CompletionResultType]::ParameterName, 'Do not display hidden files')
-            [CompletionResult]::new('--ignore-hidden', '--ignore-hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
+            [CompletionResult]::new('--ignore_hidden', '--ignore_hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
             [CompletionResult]::new('-t', '-t', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('--file-types', '--file-types', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('-P', '-P ', [CompletionResultType]::ParameterName, 'Disable the progress indication')
-            [CompletionResult]::new('--no-progress', '--no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication')
-            [CompletionResult]::new('--print-errors', '--print-errors', [CompletionResultType]::ParameterName, 'Print path with errors')
-            [CompletionResult]::new('-D', '-D ', [CompletionResultType]::ParameterName, 'Only directories will be displayed')
-            [CompletionResult]::new('--only-dir', '--only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed')
+            [CompletionResult]::new('--file_types', '--file_types', [CompletionResultType]::ParameterName, 'show only these file types')
+            [CompletionResult]::new('-P', '-P ', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
+            [CompletionResult]::new('--no-progress', '--no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
+            [CompletionResult]::new('--print-errors', '--print-errors', [CompletionResultType]::ParameterName, 'Print path with errors.')
+            [CompletionResult]::new('-D', '-D ', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
+            [CompletionResult]::new('--only-dir', '--only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
             [CompletionResult]::new('-F', '-F ', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
             [CompletionResult]::new('--only-file', '--only-file', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
             [CompletionResult]::new('-j', '-j', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
             [CompletionResult]::new('--output-json', '--output-json', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
-            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
-            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help')
+            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help')
             [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
             [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
             break

completions/dust.bash

@@ -1,16 +1,12 @@
 _dust() {
     local i cur prev opts cmd
     COMPREPLY=()
-    if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
-        cur="$2"
-    else
-        cur="${COMP_WORDS[COMP_CWORD]}"
-    fi
-    prev="$3"
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
     cmd=""
     opts=""
 
-    for i in "${COMP_WORDS[@]:0:COMP_CWORD}"
+    for i in ${COMP_WORDS[@]}
     do
         case "${cmd},${i}" in
             ",$1")
@@ -23,7 +19,7 @@ _dust() {
 
     case "${cmd}" in
         dust)
-            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore-hidden --invert-filter --filter --file-types --terminal-width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --files-from --collapse --filetime --help --version [PATH]..."
+            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --collapse --filetime --help --version [PATH]..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -130,7 +126,7 @@ _dust() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                --terminal-width)
+                --terminal_width)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -182,10 +178,6 @@ _dust() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                --files-from)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
                 --collapse)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0

completions/dust.elv

@@ -23,22 +23,22 @@ set edit:completion:arg-completer[dust] = {|@words|
             cand -T 'Number of threads to use'
             cand --threads 'Number of threads to use'
             cand --config 'Specify a config file to use'
-            cand -n 'Display the ''n'' largest entries. (Default is terminal_height)'
-            cand --number-of-lines 'Display the ''n'' largest entries. (Default is terminal_height)'
+            cand -n 'Number of lines of output to show. (Default is terminal_height - 10)'
+            cand --number-of-lines 'Number of lines of output to show. (Default is terminal_height - 10)'
             cand -X 'Exclude any file or directory with this path'
             cand --ignore-directory 'Exclude any file or directory with this path'
             cand -I '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'
             cand --ignore-all-in-file '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'
             cand -z 'Minimum size file to include in output'
             cand --min-size 'Minimum size file to include in output'
-            cand -v 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"'
-            cand --invert-filter 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"'
-            cand -e 'Only include filepaths matching this regex. For png files type: -e "\.png$"'
-            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$"'
+            cand -v 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" '
+            cand --invert-filter 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" '
+            cand -e 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
+            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
             cand -w 'Specify width of output overriding the auto detection of terminal width'
-            cand --terminal-width 'Specify width of output overriding the auto detection of terminal width'
-            cand -o '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'
-            cand --output-format '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'
+            cand --terminal_width 'Specify width of output overriding the auto detection of terminal width'
+            cand -o '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.'
+            cand --output-format '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.'
             cand -S 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
             cand --stack-size 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
             cand -M '+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
@@ -47,8 +47,7 @@ set edit:completion:arg-completer[dust] = {|@words|
             cand --atime 'just like -mtime, but based on file access time'
             cand -y 'just like -mtime, but based on file change time'
             cand --ctime 'just like -mtime, but based on file change time'
-            cand --files0-from 'Read NUL-terminated paths from FILE (use `-` for stdin)'
-            cand --files-from 'Read newline-terminated paths from FILE (use `-` for stdin)'
+            cand --files0-from 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input'
             cand --collapse 'Keep these directories collapsed'
             cand -m 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time'
             cand --filetime 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time'
@@ -76,20 +75,20 @@ set edit:completion:arg-completer[dust] = {|@words|
             cand -f 'Directory ''size'' is number of child files instead of disk size'
             cand --filecount 'Directory ''size'' is number of child files instead of disk size'
             cand -i 'Do not display hidden files'
-            cand --ignore-hidden 'Do not display hidden files'
+            cand --ignore_hidden 'Do not display hidden files'
             cand -t 'show only these file types'
-            cand --file-types 'show only these file types'
-            cand -P 'Disable the progress indication'
-            cand --no-progress 'Disable the progress indication'
-            cand --print-errors 'Print path with errors'
-            cand -D 'Only directories will be displayed'
-            cand --only-dir 'Only directories will be displayed'
+            cand --file_types 'show only these file types'
+            cand -P 'Disable the progress indication.'
+            cand --no-progress 'Disable the progress indication.'
+            cand --print-errors 'Print path with errors.'
+            cand -D 'Only directories will be displayed.'
+            cand --only-dir 'Only directories will be displayed.'
             cand -F 'Only files will be displayed. (Finds your largest files)'
             cand --only-file 'Only files will be displayed. (Finds your largest files)'
             cand -j 'Output the directory tree as json to the current directory'
             cand --output-json 'Output the directory tree as json to the current directory'
-            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help (see more with ''--help'')'
+            cand -h 'Print help'
+            cand --help 'Print help'
             cand -V 'Print version'
             cand --version 'Print version'
         }

completions/dust.fish

@@ -1,33 +1,32 @@
 complete -c dust -s d -l depth -d 'Depth to show' -r
 complete -c dust -s T -l threads -d 'Number of threads to use' -r
 complete -c dust -l config -d 'Specify a config file to use' -r -F
-complete -c dust -s n -l number-of-lines -d 'Display the \'n\' largest entries. (Default is terminal_height)' -r
+complete -c dust -s n -l number-of-lines -d 'Number of lines of output to show. (Default is terminal_height - 10)' -r
 complete -c dust -s X -l ignore-directory -d 'Exclude any file or directory with this path' -r -F
 complete -c dust -s I -l ignore-all-in-file -d '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' -r -F
 complete -c dust -s z -l min-size -d 'Minimum size file to include in output' -r
-complete -c dust -s v -l invert-filter -d 'Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$"' -r
-complete -c dust -s e -l filter -d 'Only include filepaths matching this regex. For png files type: -e "\\.png$"' -r
-complete -c dust -s w -l terminal-width -d 'Specify width of output overriding the auto detection of terminal width' -r
-complete -c dust -s o -l output-format -d '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' -r -f -a "si\t'SI prefix (powers of 1000)'
-b\t'byte (B)'
-k\t'kibibyte (KiB)'
-m\t'mebibyte (MiB)'
-g\t'gibibyte (GiB)'
-t\t'tebibyte (TiB)'
-kb\t'kilobyte (kB)'
-mb\t'megabyte (MB)'
-gb\t'gigabyte (GB)'
-tb\t'terabyte (TB)'"
+complete -c dust -s v -l invert-filter -d 'Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$" ' -r
+complete -c dust -s e -l filter -d 'Only include filepaths matching this regex. For png files type: -e "\\.png$" ' -r
+complete -c dust -s w -l terminal_width -d 'Specify width of output overriding the auto detection of terminal width' -r
+complete -c dust -s o -l output-format -d '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.' -r -f -a "si\t''
+b\t''
+k\t''
+m\t''
+g\t''
+t\t''
+kb\t''
+mb\t''
+gb\t''
+tb\t''"
 complete -c dust -s S -l stack-size -d 'Specify memory to use as stack size - use if you see: \'fatal runtime error: stack overflow\' (default low memory=1048576, high memory=1073741824)' -r
 complete -c dust -s M -l mtime -d '+/-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)' -r
 complete -c dust -s A -l atime -d 'just like -mtime, but based on file access time' -r
 complete -c dust -s y -l ctime -d 'just like -mtime, but based on file change time' -r
-complete -c dust -l files0-from -d 'Read NUL-terminated paths from FILE (use `-` for stdin)' -r -F
-complete -c dust -l files-from -d 'Read newline-terminated paths from FILE (use `-` for stdin)' -r -F
+complete -c dust -l files0-from -d 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input' -r -F
 complete -c dust -l collapse -d 'Keep these directories collapsed' -r -F
-complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t'last accessed time'
-c\t'last changed time'
-m\t'last modified time'"
+complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t''
+c\t''
+m\t''"
 complete -c dust -s p -l full-paths -d 'Subdirectories will not have their path shortened'
 complete -c dust -s L -l dereference-links -d 'dereference sym links - Treat sym links as directories and go into them'
 complete -c dust -s x -l limit-filesystem -d 'Only count the files and directories on the same filesystem as the supplied directory'
@@ -40,12 +39,12 @@ complete -c dust -s B -l bars-on-right -d 'percent bars moved to right side of s
 complete -c dust -s R -l screen-reader -d 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
 complete -c dust -l skip-total -d 'No total row will be displayed'
 complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child files instead of disk size'
-complete -c dust -s i -l ignore-hidden -d 'Do not display hidden files'
-complete -c dust -s t -l file-types -d 'show only these file types'
-complete -c dust -s P -l no-progress -d 'Disable the progress indication'
-complete -c dust -l print-errors -d 'Print path with errors'
-complete -c dust -s D -l only-dir -d 'Only directories will be displayed'
+complete -c dust -s i -l ignore_hidden -d 'Do not display hidden files'
+complete -c dust -s t -l file_types -d 'show only these file types'
+complete -c dust -s P -l no-progress -d 'Disable the progress indication.'
+complete -c dust -l print-errors -d 'Print path with errors.'
+complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'
 complete -c dust -s F -l only-file -d 'Only files will be displayed. (Finds your largest files)'
 complete -c dust -s j -l output-json -d 'Output the directory tree as json to the current directory'
-complete -c dust -s h -l help -d 'Print help (see more with \'--help\')'
+complete -c dust -s h -l help -d 'Print help'
 complete -c dust -s V -l version -d 'Print version'

config/config.toml

@@ -25,9 +25,4 @@ skip-total=true
 ignore-hidden=true
 
 # print sizes in powers of 1000 (e.g., 1.1G)
-output-format="si"
-
-number-of-lines=5   
-
-# To keep the .git directory collapsed
-collapse=[".git"]
+output-format="si"

man-page/dust.1

@@ -1,33 +1,33 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH Dust 1  "Dust 1.2.4" 
+.TH Dust 1  "Dust 1.1.2" 
 .SH NAME
 Dust \- Like du but more intuitive
 .SH SYNOPSIS
-\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore\-hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file\-types\fR] [\fB\-w\fR|\fB\-\-terminal\-width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-files\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
+\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
 .SH DESCRIPTION
 Like du but more intuitive
 .SH OPTIONS
 .TP
-\fB\-d\fR, \fB\-\-depth\fR \fI<DEPTH>\fR
+\fB\-d\fR, \fB\-\-depth\fR=\fIDEPTH\fR
 Depth to show
 .TP
-\fB\-T\fR, \fB\-\-threads\fR \fI<THREADS>\fR
+\fB\-T\fR, \fB\-\-threads\fR
 Number of threads to use
 .TP
-\fB\-\-config\fR \fI<FILE>\fR
+\fB\-\-config\fR=\fIFILE\fR
 Specify a config file to use
 .TP
-\fB\-n\fR, \fB\-\-number\-of\-lines\fR \fI<NUMBER>\fR
-Display the \*(Aqn\*(Aq largest entries. (Default is terminal_height)
+\fB\-n\fR, \fB\-\-number\-of\-lines\fR=\fINUMBER\fR
+Number of lines of output to show. (Default is terminal_height \- 10)
 .TP
 \fB\-p\fR, \fB\-\-full\-paths\fR
 Subdirectories will not have their path shortened
 .TP
-\fB\-X\fR, \fB\-\-ignore\-directory\fR \fI<PATH>\fR
+\fB\-X\fR, \fB\-\-ignore\-directory\fR=\fIPATH\fR
 Exclude any file or directory with this path
 .TP
-\fB\-I\fR, \fB\-\-ignore\-all\-in\-file\fR \fI<FILE>\fR
+\fB\-I\fR, \fB\-\-ignore\-all\-in\-file\fR=\fIFILE\fR
 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
 .TP
 \fB\-L\fR, \fB\-\-dereference\-links\fR
@@ -54,7 +54,7 @@ No percent bars or percentages will be displayed
 \fB\-B\fR, \fB\-\-bars\-on\-right\fR
 percent bars moved to right side of screen
 .TP
-\fB\-z\fR, \fB\-\-min\-size\fR \fI<MIN_SIZE>\fR
+\fB\-z\fR, \fB\-\-min\-size\fR=\fIMIN_SIZE\fR
 Minimum size file to include in output
 .TP
 \fB\-R\fR, \fB\-\-screen\-reader\fR
@@ -66,108 +66,75 @@ No total row will be displayed
 \fB\-f\fR, \fB\-\-filecount\fR
 Directory \*(Aqsize\*(Aq is number of child files instead of disk size
 .TP
-\fB\-i\fR, \fB\-\-ignore\-hidden\fR
+\fB\-i\fR, \fB\-\-ignore_hidden\fR
 Do not display hidden files
 .TP
-\fB\-v\fR, \fB\-\-invert\-filter\fR \fI<REGEX>\fR
-Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$"
+\fB\-v\fR, \fB\-\-invert\-filter\fR=\fIREGEX\fR
+Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$" 
 .TP
-\fB\-e\fR, \fB\-\-filter\fR \fI<REGEX>\fR
-Only include filepaths matching this regex. For png files type: \-e "\\.png$"
+\fB\-e\fR, \fB\-\-filter\fR=\fIREGEX\fR
+Only include filepaths matching this regex. For png files type: \-e "\\.png$" 
 .TP
-\fB\-t\fR, \fB\-\-file\-types\fR
+\fB\-t\fR, \fB\-\-file_types\fR
 show only these file types
 .TP
-\fB\-w\fR, \fB\-\-terminal\-width\fR \fI<WIDTH>\fR
+\fB\-w\fR, \fB\-\-terminal_width\fR=\fIWIDTH\fR
 Specify width of output overriding the auto detection of terminal width
 .TP
 \fB\-P\fR, \fB\-\-no\-progress\fR
-Disable the progress indication
+Disable the progress indication.
 .TP
 \fB\-\-print\-errors\fR
-Print path with errors
+Print path with errors.
 .TP
 \fB\-D\fR, \fB\-\-only\-dir\fR
-Only directories will be displayed
+Only directories will be displayed.
 .TP
 \fB\-F\fR, \fB\-\-only\-file\fR
 Only files will be displayed. (Finds your largest files)
 .TP
-\fB\-o\fR, \fB\-\-output\-format\fR \fI<FORMAT>\fR
-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
+\fB\-o\fR, \fB\-\-output\-format\fR=\fIFORMAT\fR
+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.
 .br
 
 .br
-\fIPossible values:\fR
-.RS 14
-.IP \(bu 2
-si: SI prefix (powers of 1000)
-.IP \(bu 2
-b: byte (B)
-.IP \(bu 2
-k: kibibyte (KiB)
-.IP \(bu 2
-m: mebibyte (MiB)
-.IP \(bu 2
-g: gibibyte (GiB)
-.IP \(bu 2
-t: tebibyte (TiB)
-.IP \(bu 2
-kb: kilobyte (kB)
-.IP \(bu 2
-mb: megabyte (MB)
-.IP \(bu 2
-gb: gigabyte (GB)
-.IP \(bu 2
-tb: terabyte (TB)
-.RE
+[\fIpossible values: \fRsi, b, k, m, g, t, kb, mb, gb, tb]
 .TP
-\fB\-S\fR, \fB\-\-stack\-size\fR \fI<STACK_SIZE>\fR
+\fB\-S\fR, \fB\-\-stack\-size\fR=\fISTACK_SIZE\fR
 Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error: stack overflow\*(Aq (default low memory=1048576, high memory=1073741824)
 .TP
 \fB\-j\fR, \fB\-\-output\-json\fR
 Output the directory tree as json to the current directory
 .TP
-\fB\-M\fR, \fB\-\-mtime\fR \fI<MTIME>\fR
+\fB\-M\fR, \fB\-\-mtime\fR
 +/\-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)
 .TP
-\fB\-A\fR, \fB\-\-atime\fR \fI<ATIME>\fR
+\fB\-A\fR, \fB\-\-atime\fR
 just like \-mtime, but based on file access time
 .TP
-\fB\-y\fR, \fB\-\-ctime\fR \fI<CTIME>\fR
+\fB\-y\fR, \fB\-\-ctime\fR
 just like \-mtime, but based on file change time
 .TP
-\fB\-\-files0\-from\fR \fI<FILES0_FROM>\fR
-Read NUL\-terminated paths from FILE (use `\-` for stdin)
+\fB\-\-files0\-from\fR
+run dust on NUL\-terminated file names specified in file; if argument is \-, then read names from standard input
 .TP
-\fB\-\-files\-from\fR \fI<FILES_FROM>\fR
-Read newline\-terminated paths from FILE (use `\-` for stdin)
-.TP
-\fB\-\-collapse\fR \fI<COLLAPSE>\fR
+\fB\-\-collapse\fR
 Keep these directories collapsed
 .TP
-\fB\-m\fR, \fB\-\-filetime\fR \fI<FILETIME>\fR
+\fB\-m\fR, \fB\-\-filetime\fR
 Directory \*(Aqsize\*(Aq is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time
 .br
 
 .br
-\fIPossible values:\fR
-.RS 14
-.IP \(bu 2
-a: last accessed time
-.IP \(bu 2
-c: last changed time
-.IP \(bu 2
-m: last modified time
-.RE
+[\fIpossible values: \fRa, c, m]
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Print help (see a summary with \*(Aq\-h\*(Aq)
+Print help
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .TP
 [\fIPATH\fR]
-Input files or directories
+
 .SH VERSION
-v1.2.4
+v1.1.2

src/cli.rs

@@ -1,261 +1,326 @@
-use std::fmt;
-
-use clap::{Parser, ValueEnum, ValueHint};
+use clap::{Arg, Command, builder::PossibleValue, value_parser};
 
 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
 
-/// 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>,
-
-    /// Display the 'n' largest entries. (Default is terminal_height)
-    #[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>,
-
-    /// Read NUL-terminated paths from FILE (use `-` for stdin).
-    #[arg(long, value_hint(ValueHint::AnyPath), conflicts_with("files_from"))]
-    pub files0_from: Option<String>,
-
-    /// Read newline-terminated paths from FILE (use `-` for stdin).
-    #[arg(long, value_hint(ValueHint::AnyPath), conflicts_with("files0_from"))]
-    pub files_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,
+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"),
+        )
 }

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;
 
@@ -36,82 +36,80 @@ pub struct Config {
     pub output_json: Option<bool>,
     pub print_errors: Option<bool>,
     pub files0_from: Option<String>,
-    pub number_of_lines: Option<usize>,
-    pub files_from: Option<String>,
-    pub collapse: Option<Vec<String>>,
 }
 
 impl Config {
-    pub fn get_files0_from(&self, options: &Cli) -> Option<String> {
-        let from_file = &options.files0_from;
+    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
+        let from_file = options.get_one::<String>("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_files_from(&self, options: &Cli) -> Option<String> {
-        let from_file = &options.files_from;
-        match from_file {
-            None => self.files_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: &Cli) -> String {
-        let out_fmt = options.output_format;
+    pub fn get_output_format(&self, options: &ArgMatches) -> String {
+        let out_fmt = options.get_one::<String>("output_format");
         (match out_fmt {
             None => match &self.output_format {
                 None => "".to_string(),
                 Some(x) => x.to_string(),
             },
-            Some(x) => x.to_string(),
+            Some(x) => x.into(),
         })
         .to_lowercase()
     }
 
-    pub fn get_filetime(&self, options: &Cli) -> Option<FileTime> {
-        options.filetime.map(FileTime::from)
+    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_skip_total(&self, options: &Cli) -> bool {
-        Some(true) == self.skip_total || options.skip_total
+    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.skip_total || options.get_flag("skip_total")
     }
-    pub fn get_screen_reader(&self, options: &Cli) -> bool {
-        Some(true) == self.screen_reader || options.screen_reader
+    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.screen_reader || options.get_flag("screen_reader")
     }
-    pub fn get_depth(&self, options: &Cli) -> usize {
-        if let Some(v) = options.depth {
-            return v;
+    pub fn get_depth(&self, options: &ArgMatches) -> usize {
+        if let Some(v) = options.get_one::<usize>("depth") {
+            return *v;
         }
 
         self.depth.unwrap_or(usize::MAX)
     }
-    pub fn get_min_size(&self, options: &Cli) -> Option<usize> {
-        let size_from_param = options.min_size.as_ref();
+    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
+        let size_from_param = options.get_one::<String>("min_size");
         self._get_min_size(size_from_param)
     }
     fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
@@ -125,66 +123,58 @@ impl Config {
             size_from_param
         }
     }
-    pub fn get_only_dir(&self, options: &Cli) -> bool {
-        Some(true) == self.only_dir || options.only_dir
+    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.only_dir || options.get_flag("only_dir")
     }
 
-    pub fn get_print_errors(&self, options: &Cli) -> bool {
-        Some(true) == self.print_errors || options.print_errors
+    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.print_errors || options.get_flag("print_errors")
     }
-    pub fn get_only_file(&self, options: &Cli) -> bool {
-        Some(true) == self.only_file || options.only_file
+    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.only_file || options.get_flag("only_file")
     }
-    pub fn get_bars_on_right(&self, options: &Cli) -> bool {
-        Some(true) == self.bars_on_right || options.bars_on_right
+    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_custom_stack_size(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.stack_size;
+    pub fn get_custom_stack_size(&self, options: &ArgMatches) -> Option<usize> {
+        let from_cmd_line = options.get_one::<usize>("stack_size");
         if from_cmd_line.is_none() {
             self.stack_size
         } else {
-            from_cmd_line
+            from_cmd_line.copied()
         }
     }
-    pub fn get_threads(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.threads;
+    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
+        let from_cmd_line = options.get_one::<usize>("threads");
         if from_cmd_line.is_none() {
             self.threads
         } else {
-            from_cmd_line
+            from_cmd_line.copied()
         }
     }
-    pub fn get_output_json(&self, options: &Cli) -> bool {
-        Some(true) == self.output_json || options.output_json
+    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
+        Some(true) == self.output_json || options.get_flag("output_json")
     }
 
-    pub fn get_number_of_lines(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.number_of_lines;
-        if from_cmd_line.is_none() {
-            self.number_of_lines
-        } else {
-            from_cmd_line
-        }
+    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: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
-    }
-
-    pub fn get_collapse(&self, options: &Cli) -> Option<Vec<String>> {
-        if self.collapse.is_none() {
-            options.collapse.clone()
-        } else {
-            self.collapse.clone()
-        }
+    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(),
+        )
     }
 }
 
@@ -253,17 +243,17 @@ fn convert_min_size(input: &str) -> Option<usize> {
     }
 }
 
-fn get_config_locations(base: PathBuf) -> Vec<PathBuf> {
+fn get_config_locations(base: &Path) -> Vec<PathBuf> {
     vec![
         base.join(".dust.toml"),
         base.join(".config").join("dust").join("config.toml"),
     ]
 }
 
-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,
@@ -276,12 +266,12 @@ pub fn get_config(conf_path: Option<&String>) -> Config {
             }
         }
         None => {
-            if let Some(home) = std::env::home_dir() {
-                for path in get_config_locations(home) {
-                    if path.exists()
-                        && let Ok(config) = Config::from_config_file(&path)
-                    {
-                        return config;
+            if let Some(home) = directories::BaseDirs::new() {
+                for path in get_config_locations(home.home_dir()) {
+                    if path.exists() {
+                        if let Ok(config) = Config::from_config_file(&path) {
+                            return config;
+                        }
                     }
                 }
             }
@@ -297,7 +287,8 @@ mod tests {
     #[allow(unused_imports)]
     use super::*;
     use chrono::{Datelike, Timelike};
-    use clap::Parser;
+    use clap::builder::PossibleValue;
+    use clap::{Arg, ArgMatches, Command, value_parser};
 
     #[test]
     fn test_get_current_date_epoch_seconds() {
@@ -366,8 +357,15 @@ mod tests {
         assert_eq!(c.get_depth(&args), 5);
     }
 
-    fn get_args(args: Vec<&str>) -> Cli {
-        Cli::parse_from(args)
+    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)
     }
 
     #[test]
@@ -405,36 +403,20 @@ mod tests {
         assert_eq!(c.get_filetime(&args), Some(FileTime::Changed));
     }
 
-    fn get_filetime_args(args: Vec<&str>) -> Cli {
-        Cli::parse_from(args)
-    }
-
-    #[test]
-    fn test_get_number_of_lines() {
-        // No config and no flag.
-        let c = Config::default();
-        let args = get_args(vec![]);
-        assert_eq!(c.get_number_of_lines(&args), None);
-
-        // Config is not defined and flag is defined.
-        let c = Config::default();
-        let args = get_args(vec!["dust", "--number-of-lines", "5"]);
-        assert_eq!(c.get_number_of_lines(&args), Some(5));
-
-        // Config is defined and flag is not defined.
-        let c = Config {
-            number_of_lines: Some(3),
-            ..Default::default()
-        };
-        let args = get_args(vec![]);
-        assert_eq!(c.get_number_of_lines(&args), Some(3));
-
-        // Both config and flag are defined.
-        let c = Config {
-            number_of_lines: Some(3),
-            ..Default::default()
-        };
-        let args = get_args(vec!["dust", "--number-of-lines", "5"]);
-        assert_eq!(c.get_number_of_lines(&args), Some(5));
+    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)
     }
 }

src/dir_walker.rs

@@ -69,11 +69,12 @@ pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: &WalkData) -> Vec<Node> {
 
 // Remove files which have the same inode, we don't want to double count them.
 fn clean_inodes(x: Node, inodes: &mut HashSet<(u64, u64)>, walk_data: &WalkData) -> Option<Node> {
-    if !walk_data.use_apparent_size
-        && let Some(id) = x.inode_device
-        && !inodes.insert(id)
-    {
-        return None;
+    if !walk_data.use_apparent_size {
+        if let Some(id) = x.inode_device {
+            if !inodes.insert(id) {
+                return None;
+            }
+        }
     }
 
     // Sort Nodes so iteration order is predictable
@@ -155,10 +156,10 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
 
     if !walk_data.allowed_filesystems.is_empty() {
         let size_inode_device = get_metadata(entry.path(), false, follow_links);
-        if let Some((_size, Some((_id, dev)), _gunk)) = size_inode_device
-            && !walk_data.allowed_filesystems.contains(&dev)
-        {
-            return true;
+        if let Some((_size, Some((_id, dev)), _gunk)) = size_inode_device {
+            if !walk_data.allowed_filesystems.contains(&dev) {
+                return true;
+            }
         }
     }
     if walk_data.filter_accessed_time.is_some()
@@ -166,19 +167,20 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
         || walk_data.filter_changed_time.is_some()
     {
         let size_inode_device = get_metadata(entry.path(), false, follow_links);
-        if let Some((_, _, (modified_time, accessed_time, changed_time))) = size_inode_device
-            && entry.path().is_file()
-            && [
-                (&walk_data.filter_modified_time, modified_time),
-                (&walk_data.filter_accessed_time, accessed_time),
-                (&walk_data.filter_changed_time, changed_time),
-            ]
-            .iter()
-            .any(|(filter_time, actual_time)| {
-                is_filtered_out_due_to_file_time(filter_time, *actual_time)
-            })
-        {
-            return true;
+        if let Some((_, _, (modified_time, accessed_time, changed_time))) = size_inode_device {
+            if entry.path().is_file()
+                && [
+                    (&walk_data.filter_modified_time, modified_time),
+                    (&walk_data.filter_accessed_time, accessed_time),
+                    (&walk_data.filter_changed_time, changed_time),
+                ]
+                .iter()
+                .any(|(filter_time, actual_time)| {
+                    is_filtered_out_due_to_file_time(filter_time, *actual_time)
+                })
+            {
+                return true;
+            }
         }
     }
 
@@ -220,30 +222,32 @@ fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
 
                                 // return walk(entry.path(), walk_data, depth)
 
-                                if !ignore_file(entry, walk_data)
-                                    && let Ok(data) = entry.file_type()
-                                {
-                                    if data.is_dir()
-                                        || (walk_data.follow_links && data.is_symlink())
-                                    {
-                                        return walk(entry.path(), walk_data, depth + 1);
+                                if !ignore_file(entry, walk_data) {
+                                    if let Ok(data) = entry.file_type() {
+                                        if data.is_dir()
+                                            || (walk_data.follow_links && data.is_symlink())
+                                        {
+                                            return walk(entry.path(), walk_data, depth + 1);
+                                        }
+
+                                        let node = build_node(
+                                            entry.path(),
+                                            vec![],
+                                            data.is_symlink(),
+                                            data.is_file(),
+                                            depth,
+                                            walk_data,
+                                        );
+
+                                        prog_data.num_files.fetch_add(1, ORDERING);
+                                        if let Some(ref file) = node {
+                                            prog_data
+                                                .total_file_size
+                                                .fetch_add(file.size, ORDERING);
+                                        }
+
+                                        return node;
                                     }
-
-                                    let node = build_node(
-                                        entry.path(),
-                                        vec![],
-                                        data.is_symlink(),
-                                        data.is_file(),
-                                        depth,
-                                        walk_data,
-                                    );
-
-                                    prog_data.num_files.fetch_add(1, ORDERING);
-                                    if let Some(ref file) = node {
-                                        prog_data.total_file_size.fetch_add(file.size, ORDERING);
-                                    }
-
-                                    return node;
                                 }
                             }
                             Err(ref failed) => {
@@ -300,10 +304,9 @@ fn handle_error_and_retry(failed: &Error, dir: &Path, walk_data: &WalkData) -> b
             editable_error.file_not_found.insert(failed.to_string());
         }
         std::io::ErrorKind::Interrupted => {
+            let mut editable_error = walk_data.errors.lock().unwrap();
             editable_error.interrupted_error += 1;
-            // This does happen on some systems. It was set to 3 but sometimes dust runs would exceed this
-            // However, if there is no limit this results in infinite retrys and dust never finishes
-            if editable_error.interrupted_error > 999 {
+            if editable_error.interrupted_error > 3 {
                 panic!("Multiple Interrupted Errors occurred while scanning filesystem. Aborting");
             } else {
                 return true;

src/display.rs

@@ -1,8 +1,8 @@
 use crate::display_node::DisplayNode;
 use crate::node::FileTime;
 
+use ansi_term::Colour::Red;
 use lscolors::{LsColors, Style};
-use nu_ansi_term::Color::Red;
 
 use unicode_width::UnicodeWidthStr;
 
@@ -12,7 +12,7 @@ use chrono::{DateTime, Local, TimeZone, Utc};
 use std::cmp::max;
 use std::cmp::min;
 use std::fs;
-use std::iter::repeat_n;
+use std::iter::repeat;
 use std::path::Path;
 use thousands::Separable;
 
@@ -125,9 +125,9 @@ impl DrawData<'_> {
 
 pub fn draw_it(
     idd: InitialDisplayData,
-    root_node: &DisplayNode,
     no_percent_bars: bool,
     terminal_width: usize,
+    root_node: &DisplayNode,
     skip_total: bool,
 ) {
     let num_chars_needed_on_left_most = if idd.by_filecount {
@@ -155,7 +155,7 @@ pub fn draw_it(
         allowed_width - longest_string_length - 7
     };
 
-    let first_size_bar = repeat_n(BLOCKS[0], max_bar_length).collect();
+    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
 
     let display_data = DisplayData {
         initial: idd,
@@ -298,9 +298,12 @@ fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &Display
     );
 
     // Add spaces after the filename so we can draw the % used bar chart.
-    name + " "
-        .repeat(display_data.longest_string_length - width)
-        .as_str()
+    let name_and_padding = name
+        + " "
+            .repeat(display_data.longest_string_length - width)
+            .as_str();
+
+    name_and_padding
 }
 
 fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
@@ -403,7 +406,7 @@ fn get_pretty_name(
             .ls_colors
             .style_for_path_with_metadata(&node.name, meta_result.as_ref().ok());
         let ansi_style = directory_color
-            .map(Style::to_nu_ansi_term_style)
+            .map(Style::to_ansi_term_style)
             .unwrap_or_default();
         let out = ansi_style.paint(name_and_padding);
         format!("{out}")
@@ -439,9 +442,6 @@ pub fn get_number_format(output_str: &str) -> Option<(u64, char)> {
 }
 
 pub fn human_readable_number(size: u64, output_str: &str) -> String {
-    if output_str == "count" {
-        return size.to_string();
-    };
     match get_number_format(output_str) {
         Some((x, u)) => {
             format!("{}{}", (size / x), u)
@@ -542,13 +542,6 @@ mod tests {
         assert_eq!(s, "short               3  4.0K 100%");
     }
 
-    #[test]
-    fn test_machine_readable_filecount() {
-        assert_eq!(human_readable_number(1, "count"), "1");
-        assert_eq!(human_readable_number(1000, "count"), "1000");
-        assert_eq!(human_readable_number(1024, "count"), "1024");
-    }
-
     #[test]
     fn test_human_readable_number() {
         assert_eq!(human_readable_number(1, ""), "1B");
@@ -601,7 +594,7 @@ mod tests {
             size: 2_u64.pow(size),
             children: vec![],
         };
-        let first_size_bar = repeat_n(BLOCKS[0], 13).collect();
+        let first_size_bar = repeat(BLOCKS[0]).take(13).collect();
         let dd = DrawData {
             indent: "".into(),
             percent_bar: first_size_bar,

src/filter.rs

@@ -25,14 +25,16 @@ pub fn get_biggest(
     display_data: AggregateData,
     by_filetime: &Option<FileTime>,
     keep_collapsed: HashSet<PathBuf>,
-) -> DisplayNode {
+) -> Option<DisplayNode> {
+    if top_level_nodes.is_empty() {
+        // perhaps change this, bring back Error object?
+        return None;
+    }
     let mut heap = BinaryHeap::new();
     let number_top_level_nodes = top_level_nodes.len();
     let root;
 
-    if number_top_level_nodes == 0 {
-        root = total_node_builder(0, vec![])
-    } else if number_top_level_nodes > 1 {
+    if number_top_level_nodes > 1 {
         let size = if by_filetime.is_some() {
             top_level_nodes
                 .iter()
@@ -44,24 +46,28 @@ pub fn get_biggest(
         };
 
         let nodes = handle_duplicate_top_level_names(top_level_nodes, display_data.short_paths);
-        root = total_node_builder(size, nodes);
+
+        root = Node {
+            name: PathBuf::from("(total)"),
+            size,
+            children: nodes,
+            inode_device: None,
+            depth: 0,
+        };
+
+        // Always include the base nodes if we add a 'parent' (total) node
         heap = always_add_children(&display_data, &root, heap);
     } else {
         root = top_level_nodes.into_iter().next().unwrap();
         heap = add_children(&display_data, &root, heap);
     }
 
-    fill_remaining_lines(heap, &root, display_data, keep_collapsed)
-}
-
-fn total_node_builder(size: u64, children: Vec<Node>) -> Node {
-    Node {
-        name: PathBuf::from("(total)"),
-        size,
-        children,
-        inode_device: None,
-        depth: 0,
-    }
+    Some(fill_remaining_lines(
+        heap,
+        &root,
+        display_data,
+        keep_collapsed,
+    ))
 }
 
 pub fn fill_remaining_lines<'a>(

src/filter_type.rs

@@ -15,7 +15,7 @@ pub fn get_all_file_types(
     top_level_nodes: &[Node],
     n: usize,
     by_filetime: &Option<FileTime>,
-) -> DisplayNode {
+) -> Option<DisplayNode> {
     let ext_nodes = {
         let mut extension_cumulative_sizes = HashMap::new();
         build_by_all_file_types(top_level_nodes, &mut extension_cumulative_sizes);
@@ -67,11 +67,13 @@ pub fn get_all_file_types(
         displayed.iter().map(|node| node.size).sum()
     };
 
-    DisplayNode {
+    let result = DisplayNode {
         name: PathBuf::from("(total)"),
         size: actual_size,
         children: displayed,
-    }
+    };
+
+    Some(result)
 }
 
 fn build_by_all_file_types<'a>(

src/main.rs

@@ -10,11 +10,9 @@ mod platform;
 mod progress;
 mod utils;
 
-use crate::cli::Cli;
-use crate::config::Config;
-use crate::display_node::DisplayNode;
+use crate::cli::build_cli;
 use crate::progress::RuntimeErrors;
-use clap::Parser;
+use clap::parser::ValuesRef;
 use dir_walker::WalkData;
 use display::InitialDisplayData;
 use filter::AggregateData;
@@ -22,14 +20,13 @@ use progress::PIndicator;
 use regex::Error;
 use std::collections::HashSet;
 use std::env;
-use std::fs::{read, read_to_string};
+use std::fs::read_to_string;
 use std::io;
-use std::io::Read;
 use std::panic;
 use std::process;
 use std::sync::Arc;
 use std::sync::Mutex;
-use sysinfo::System;
+use sysinfo::{System, SystemExt};
 use utils::canonicalize_absolute_path;
 
 use self::display::draw_it;
@@ -69,7 +66,7 @@ fn should_init_color(no_color: bool, force_color: bool) -> bool {
     {
         // Required for windows 10
         // Fails to resolve for windows 8 so disable color
-        match nu_ansi_term::enable_ansi_support() {
+        match ansi_term::enable_ansi_support() {
             Ok(_) => true,
             Err(_) => {
                 eprintln!("This version of Windows does not support ANSI colors");
@@ -101,10 +98,9 @@ fn get_width_of_terminal() -> usize {
         .unwrap_or(DEFAULT_TERMINAL_WIDTH)
 }
 
-fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
+fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
     maybe_value
-        .unwrap_or(&Vec::new())
-        .iter()
+        .unwrap_or_default()
         .map(|reg| {
             Regex::new(reg).unwrap_or_else(|err| {
                 eprintln!("Ignoring bad value for regex {err:?}");
@@ -115,8 +111,8 @@ fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
 }
 
 fn main() {
-    let options = Cli::parse();
-    let config = get_config(options.config.as_ref());
+    let options = build_cli().get_matches();
+    let config = get_config(options.get_one::<String>("config").cloned());
 
     let errors = RuntimeErrors::default();
     let error_listen_for_ctrlc = Arc::new(Mutex::new(errors));
@@ -128,24 +124,43 @@ fn main() {
     })
     .expect("Error setting Ctrl-C handler");
 
-    let target_dirs = if let Some(path) = config.get_files0_from(&options) {
-        read_paths_from_source(&path, true)
-    } else if let Some(path) = config.get_files_from(&options) {
-        read_paths_from_source(&path, false)
-    } else {
-        match options.params {
-            Some(ref values) => values.clone(),
-            None => vec![".".to_owned()],
+    let target_dirs = match config.get_files_from(&options) {
+        Some(path) => {
+            if path == "-" {
+                let mut targets_to_add = io::stdin()
+                    .lines()
+                    .map_while(Result::ok)
+                    .collect::<Vec<String>>();
+
+                if targets_to_add.is_empty() {
+                    eprintln!("No input provided, defaulting to current directory");
+                    targets_to_add.push(".".to_owned());
+                }
+                targets_to_add
+            } else {
+                // read file
+                match read_to_string(path) {
+                    Ok(file_content) => file_content.lines().map(|x| x.to_string()).collect(),
+                    Err(e) => {
+                        eprintln!("Error reading file: {e}");
+                        vec![".".to_owned()]
+                    }
+                }
+            }
         }
+        None => match options.get_many::<String>("params") {
+            Some(values) => values.cloned().collect(),
+            None => vec![".".to_owned()],
+        },
     };
 
-    let summarize_file_types = options.file_types;
+    let summarize_file_types = options.get_flag("types");
 
-    let filter_regexs = get_regex_value(options.filter.as_ref());
-    let invert_filter_regexs = get_regex_value(options.invert_filter.as_ref());
+    let filter_regexs = get_regex_value(options.get_many("filter"));
+    let invert_filter_regexs = get_regex_value(options.get_many("invert_filter"));
 
-    let terminal_width: usize = match options.terminal_width {
-        Some(val) => val,
+    let terminal_width: usize = match options.get_one::<usize>("width") {
+        Some(&val) => val,
         None => get_width_of_terminal(),
     };
 
@@ -154,8 +169,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 config.get_number_of_lines(&options) {
-        Some(val) => val,
+    let number_of_lines = match options.get_one::<usize>("number_of_lines") {
+        Some(&val) => val,
         None => {
             if depth != usize::MAX {
                 usize::MAX
@@ -170,17 +185,17 @@ fn main() {
         config.get_force_colors(&options),
     );
 
-    let ignore_directories = match options.ignore_directory {
-        Some(ref values) => values
-            .iter()
+    let ignore_directories = match options.get_many::<String>("ignore_directory") {
+        Some(values) => values
+            .map(|v| v.as_str())
             .map(PathBuf::from)
             .map(canonicalize_absolute_path)
             .collect::<Vec<PathBuf>>(),
         None => vec![],
     };
 
-    let ignore_from_file_result = match options.ignore_all_in_file {
-        Some(ref val) => read_to_string(val)
+    let ignore_from_file_result = match options.get_one::<String>("ignore_all_in_file") {
+        Some(val) => read_to_string(val)
             .unwrap()
             .lines()
             .map(Regex::new)
@@ -197,17 +212,14 @@ fn main() {
         .chain(ignore_from_file)
         .collect::<Vec<Regex>>();
 
-    let by_filecount = options.filecount;
+    let by_filecount = options.get_flag("by_filecount");
     let by_filetime = config.get_filetime(&options);
-    let limit_filesystem = options.limit_filesystem;
-    let follow_links = options.dereference_links;
-
-    let allowed_filesystems = if limit_filesystem {
-        get_filesystem_devices(&target_dirs, follow_links)
-    } else {
-        Default::default()
-    };
+    let limit_filesystem = options.get_flag("limit_filesystem");
+    let follow_links = options.get_flag("dereference_links");
 
+    let allowed_filesystems = limit_filesystem
+        .then(|| get_filesystem_devices(&target_dirs, follow_links))
+        .unwrap_or_default();
     let simplified_dirs = simplify_dir_names(&target_dirs);
 
     let ignored_full_path: HashSet<PathBuf> = ignore_directories
@@ -224,8 +236,8 @@ fn main() {
         indicator.spawn(output_format.clone())
     }
 
-    let keep_collapsed: HashSet<PathBuf> = match config.get_collapse(&options) {
-        Some(ref collapse) => {
+    let keep_collapsed: HashSet<PathBuf> = match options.get_many::<String>("collapse") {
+        Some(collapse) => {
             let mut combined_dirs = HashSet::new();
             for collapse_dir in collapse {
                 for target_dir in target_dirs.iter() {
@@ -257,98 +269,32 @@ fn main() {
         progress_data: indicator.data.clone(),
         errors: errors_for_rayon,
     };
-
     let threads_to_use = config.get_threads(&options);
     let stack_size = config.get_custom_stack_size(&options);
+    init_rayon(&stack_size, &threads_to_use);
 
-    init_rayon(&stack_size, &threads_to_use).install(|| {
-        let top_level_nodes = walk_it(simplified_dirs, &walk_data);
+    let top_level_nodes = walk_it(simplified_dirs, &walk_data);
 
-        let tree = match summarize_file_types {
-            true => get_all_file_types(&top_level_nodes, number_of_lines, walk_data.by_filetime),
-            false => {
-                let agg_data = AggregateData {
-                    min_size: config.get_min_size(&options),
-                    only_dir: config.get_only_dir(&options),
-                    only_file: config.get_only_file(&options),
-                    number_of_lines,
-                    depth,
-                    using_a_filter: !filter_regexs.is_empty() || !invert_filter_regexs.is_empty(),
-                    short_paths: !config.get_full_paths(&options),
-                };
-                get_biggest(
-                    top_level_nodes,
-                    agg_data,
-                    walk_data.by_filetime,
-                    keep_collapsed,
-                )
-            }
-        };
-
-        // Must have stopped indicator before we print to stderr
-        indicator.stop();
-
-        let print_errors = config.get_print_errors(&options);
-        let final_errors = walk_data.errors.lock().unwrap();
-        print_any_errors(print_errors, &final_errors);
-
-        if tree.children.is_empty() && !final_errors.file_not_found.is_empty() {
-            std::process::exit(1)
-        } else {
-            print_output(
-                config,
-                options,
-                tree,
-                walk_data.by_filecount,
-                is_colors,
-                terminal_width,
-            )
+    let tree = match summarize_file_types {
+        true => get_all_file_types(&top_level_nodes, number_of_lines, &by_filetime),
+        false => {
+            let agg_data = AggregateData {
+                min_size: config.get_min_size(&options),
+                only_dir: config.get_only_dir(&options),
+                only_file: config.get_only_file(&options),
+                number_of_lines,
+                depth,
+                using_a_filter: !filter_regexs.is_empty() || !invert_filter_regexs.is_empty(),
+                short_paths: !config.get_full_paths(&options),
+            };
+            get_biggest(top_level_nodes, agg_data, &by_filetime, keep_collapsed)
         }
-    });
-}
+    };
 
-fn print_output(
-    config: Config,
-    options: Cli,
-    tree: DisplayNode,
-    by_filecount: bool,
-    is_colors: bool,
-    terminal_width: usize,
-) {
-    let output_format = config.get_output_format(&options);
+    // Must have stopped indicator before we print to stderr
+    indicator.stop();
 
-    if config.get_output_json(&options) {
-        OUTPUT_TYPE.with(|wrapped| {
-            if by_filecount {
-                wrapped.replace("count".to_string());
-            } else {
-                wrapped.replace(output_format);
-            }
-        });
-        println!("{}", serde_json::to_string(&tree).unwrap());
-    } else {
-        let idd = InitialDisplayData {
-            short_paths: !config.get_full_paths(&options),
-            is_reversed: !config.get_reverse(&options),
-            colors_on: is_colors,
-            by_filecount,
-            by_filetime: config.get_filetime(&options),
-            is_screen_reader: config.get_screen_reader(&options),
-            output_format,
-            bars_on_right: config.get_bars_on_right(&options),
-        };
-
-        draw_it(
-            idd,
-            &tree,
-            config.get_no_bars(&options),
-            terminal_width,
-            config.get_skip_total(&options),
-        )
-    }
-}
-
-fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
+    let final_errors = walk_data.errors.lock().unwrap();
     if !final_errors.file_not_found.is_empty() {
         let err = final_errors
             .file_not_found
@@ -356,17 +302,17 @@ fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
             .map(|a| a.as_ref())
             .collect::<Vec<&str>>()
             .join(", ");
-        eprintln!("No such file or directory: {err}");
+        eprintln!("No such file or directory: {}", err);
     }
     if !final_errors.no_permissions.is_empty() {
-        if print_errors {
+        if config.get_print_errors(&options) {
             let err = final_errors
                 .no_permissions
                 .iter()
                 .map(|a| a.as_ref())
                 .collect::<Vec<&str>>()
                 .join(", ");
-            eprintln!("Did not have permissions for directories: {err}");
+            eprintln!("Did not have permissions for directories: {}", err);
         } else {
             eprintln!(
                 "Did not have permissions for all directories (add --print-errors to see errors)"
@@ -380,105 +326,76 @@ fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
             .map(|a| a.as_ref())
             .collect::<Vec<&str>>()
             .join(", ");
-        eprintln!("Unknown Error: {err}");
+        eprintln!("Unknown Error: {}", err);
     }
-}
 
-fn read_paths_from_source(path: &str, null_terminated: bool) -> Vec<String> {
-    let from_stdin = path == "-";
-
-    let result: Result<Vec<String>, Option<String>> = (|| {
-        // 1) read bytes
-        let bytes = if from_stdin {
-            let mut b = Vec::new();
-            io::stdin().lock().read_to_end(&mut b).map_err(|_| None)?;
-            b
+    if let Some(root_node) = tree {
+        if config.get_output_json(&options) {
+            OUTPUT_TYPE.with(|wrapped| {
+                wrapped.replace(output_format);
+            });
+            println!("{}", serde_json::to_string(&root_node).unwrap());
         } else {
-            read(path).map_err(|e| Some(e.to_string()))?
-        };
+            let idd = InitialDisplayData {
+                short_paths: !config.get_full_paths(&options),
+                is_reversed: !config.get_reverse(&options),
+                colors_on: is_colors,
+                by_filecount,
+                by_filetime,
+                is_screen_reader: config.get_screen_reader(&options),
+                output_format,
+                bars_on_right: config.get_bars_on_right(&options),
+            };
 
-        let text = std::str::from_utf8(&bytes).map_err(|e| {
-            if from_stdin {
-                None
-            } else {
-                Some(e.to_string())
-            }
-        })?;
-        let items: Vec<String> = if null_terminated {
-            text.split('\0')
-                .filter(|s| !s.is_empty())
-                .map(str::to_owned)
-                .collect()
-        } else {
-            text.lines().map(str::to_owned).collect()
-        };
-        if from_stdin && items.is_empty() {
-            return Err(None);
-        }
-        Ok(items)
-    })();
-
-    match result {
-        Ok(v) => v,
-        Err(None) => {
-            eprintln!("No files provided, defaulting to current directory");
-            vec![".".to_owned()]
-        }
-        Err(Some(msg)) => {
-            eprintln!("Failed to read file: {msg}");
-            vec![".".to_owned()]
+            draw_it(
+                idd,
+                config.get_no_bars(&options),
+                terminal_width,
+                &root_node,
+                config.get_skip_total(&options),
+            )
         }
     }
 }
 
-fn init_rayon(stack: &Option<usize>, threads: &Option<usize>) -> rayon::ThreadPool {
-    let stack_size = match stack {
-        Some(s) => Some(*s),
-        None => {
-            // Do not increase the stack size on a 32 bit system, it will fail
-            if cfg!(target_pointer_width = "32") {
-                None
-            } else {
-                let large_stack = usize::pow(1024, 3);
-                let mut sys = System::new_all();
-                sys.refresh_memory();
-                // Larger stack size if possible to handle cases with lots of nested directories
-                let available = sys.available_memory();
-                if available > (large_stack * threads.unwrap_or(1)).try_into().unwrap() {
-                    Some(large_stack)
-                } else {
-                    None
-                }
-            }
-        }
-    };
-
-    match build_thread_pool(stack_size, threads) {
-        Ok(pool) => pool,
-        Err(err) => {
-            eprintln!("Problem initializing rayon, try: export RAYON_NUM_THREADS=1");
-            if stack.is_none() && stack_size.is_some() {
-                // stack parameter was none, try with default stack size
-                if let Ok(pool) = build_thread_pool(None, threads) {
-                    eprintln!("WARNING: not using large stack size, got error: {err}");
-                    return pool;
-                }
-            }
-            panic!("{err}");
+fn init_rayon(stack_size: &Option<usize>, threads: &Option<usize>) {
+    // Rayon seems to raise this error on 32-bit builds
+    // The global thread pool has not been initialized.: ThreadPoolBuildError { kind: GlobalPoolAlreadyInitialized }
+    if cfg!(target_pointer_width = "64") {
+        let result = panic::catch_unwind(|| build_thread_pool(*stack_size, *threads));
+        if result.is_err() {
+            eprintln!("Problem initializing rayon, try: export RAYON_NUM_THREADS=1")
         }
     }
 }
 
 fn build_thread_pool(
-    stack_size: Option<usize>,
-    threads: &Option<usize>,
-) -> Result<rayon::ThreadPool, rayon::ThreadPoolBuildError> {
-    let mut pool_builder = rayon::ThreadPoolBuilder::new();
-    if let Some(stack_size_param) = stack_size {
-        pool_builder = pool_builder.stack_size(stack_size_param);
-    }
+    stack: Option<usize>,
+    threads: Option<usize>,
+) -> Result<(), rayon::ThreadPoolBuildError> {
+    let mut pool = rayon::ThreadPoolBuilder::new();
+
     if let Some(thread_count) = threads {
-        pool_builder = pool_builder.num_threads(*thread_count);
+        pool = pool.num_threads(thread_count);
     }
-    pool_builder.build()
+
+    let stack_size = match stack {
+        Some(s) => Some(s),
+        None => {
+            let large_stack = usize::pow(1024, 3);
+            let mut s = System::new();
+            s.refresh_memory();
+            // Larger stack size if possible to handle cases with lots of nested directories
+            let available = s.available_memory();
+            if available > large_stack.try_into().unwrap() {
+                Some(large_stack)
+            } else {
+                None
+            }
+        }
+    };
+    if let Some(stack_size_param) = stack_size {
+        pool = pool.stack_size(stack_size_param);
+    }
+    pool.build_global()
 }

src/node.rs

@@ -23,16 +23,6 @@ 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,

src/platform.rs

@@ -27,32 +27,15 @@ pub fn get_metadata<P: AsRef<Path>>(
     };
     match metadata {
         Ok(md) => {
-            let file_size = md.len();
             if use_apparent_size {
                 Some((
-                    file_size,
+                    md.len(),
                     Some((md.ino(), md.dev())),
                     (md.mtime(), md.atime(), md.ctime()),
                 ))
             } else {
-                // On NTFS mounts, the reported block count can be unexpectedly large.
-                // To avoid overestimating disk usage, cap the allocated size to what the
-                // file should occupy based on the file system I/O block size (blksize).
-                // Related: https://github.com/bootandy/dust/issues/295
-                let blksize = md.blksize();
-                let target_size = file_size.div_ceil(blksize) * blksize;
-                let reported_size = md.blocks() * get_block_size();
-
-                // File systems can pre-allocate more space for a file than what would be necessary
-                let pre_allocation_buffer = blksize * 65536;
-                let max_size = target_size + pre_allocation_buffer;
-                let allocated_size = if reported_size > max_size {
-                    target_size
-                } else {
-                    reported_size
-                };
                 Some((
-                    allocated_size,
+                    md.blocks() * get_block_size(),
                     Some((md.ino(), md.dev())),
                     (md.mtime(), md.atime(), md.ctime()),
                 ))

tests/test_dir_files_from/files_from.txt

@@ -1,2 +0,0 @@
-tests/test_dir_files_from/a_file
-tests/test_dir_files_from/hello_file

tests/test_dir_files_from/hello_file

@@ -1 +0,0 @@
-hello

tests/test_exact_output.rs

@@ -1,4 +1,4 @@
-use assert_cmd::{Command, cargo_bin_cmd};
+use assert_cmd::Command;
 use std::ffi::OsStr;
 use std::process::Output;
 use std::sync::Once;
@@ -61,11 +61,9 @@ fn initialize() {
 
 fn run_cmd<T: AsRef<OsStr>>(command_args: &[T]) -> Output {
     initialize();
-    let mut to_run = cargo_bin_cmd!("dust");
-    // Hide progress bar
-    to_run.arg("-P");
+    let mut to_run = &mut Command::cargo_bin("dust").unwrap();
     for p in command_args {
-        to_run.arg(p);
+        to_run = to_run.arg(p);
     }
     to_run.unwrap()
 }

tests/test_flags.rs

@@ -1,4 +1,4 @@
-use assert_cmd::cargo_bin_cmd;
+use assert_cmd::Command;
 use std::ffi::OsStr;
 use std::str;
 
@@ -9,16 +9,17 @@ use std::str;
  */
 
 fn build_command<T: AsRef<OsStr>>(command_args: Vec<T>) -> String {
-    let mut cmd = cargo_bin_cmd!("dust");
-
+    let mut cmd = &mut Command::cargo_bin("dust").unwrap();
     // Hide progress bar
-    cmd.arg("-P");
+    cmd = cmd.arg("-P");
 
     for p in command_args {
-        cmd.arg(p);
+        cmd = cmd.arg(p);
     }
     let finished = &cmd.unwrap();
-    assert_eq!(str::from_utf8(&finished.stderr).unwrap(), "");
+    let stderr = str::from_utf8(&finished.stderr).unwrap();
+    assert_eq!(stderr, "");
+
     str::from_utf8(&finished.stdout).unwrap().into()
 }
 
@@ -61,14 +62,6 @@ pub fn test_d_flag_works() {
     assert!(!output.contains("hello_file"));
 }
 
-#[test]
-pub fn test_d0_works_on_multiple() {
-    // We should see the top level directory but not the sub dirs / files:
-    let output = build_command(vec!["-d", "0", "tests/test_dir/", "tests/test_dir2"]);
-    assert!(output.contains("test_dir "));
-    assert!(output.contains("test_dir2"));
-}
-
 #[test]
 pub fn test_threads_flag_works() {
     let output = build_command(vec!["-T", "1", "tests/test_dir/"]);
@@ -103,60 +96,10 @@ pub fn test_ignore_all_in_file() {
     assert!(!output.contains(".secret"));
 }
 
-#[test]
-pub fn test_files_from_flag_file() {
-    let output = build_command(vec![
-        "--files-from",
-        "tests/test_dir_files_from/files_from.txt",
-    ]);
-    assert!(output.contains("a_file"));
-    assert!(output.contains("hello_file"));
-}
-
-#[test]
-pub fn test_files0_from_flag_file() {
-    let output = build_command(vec![
-        "--files0-from",
-        "tests/test_dir_files_from/files0_from.txt",
-    ]);
-    assert!(output.contains("a_file"));
-    assert!(output.contains("hello_file"));
-}
-
-#[test]
-pub fn test_files_from_flag_stdin() {
-    let mut cmd = cargo_bin_cmd!("dust");
-    cmd.arg("-P").arg("--files-from").arg("-");
-    let input = b"tests/test_dir_files_from/a_file\ntests/test_dir_files_from/hello_file\n";
-    cmd.write_stdin(input.as_ref());
-    let finished = &cmd.unwrap();
-    let stderr = std::str::from_utf8(&finished.stderr).unwrap();
-    assert_eq!(stderr, "");
-    let output = std::str::from_utf8(&finished.stdout).unwrap();
-    assert!(output.contains("a_file"));
-    assert!(output.contains("hello_file"));
-}
-
-#[test]
-pub fn test_files0_from_flag_stdin() {
-    let mut cmd = cargo_bin_cmd!("dust");
-    cmd.arg("-P").arg("--files0-from").arg("-");
-    let input = b"tests/test_dir_files_from/a_file\0tests/test_dir_files_from/hello_file\0";
-    cmd.write_stdin(input.as_ref());
-    let finished = &cmd.unwrap();
-    let stderr = std::str::from_utf8(&finished.stderr).unwrap();
-    assert_eq!(stderr, "");
-    let output = std::str::from_utf8(&finished.stdout).unwrap();
-    assert!(output.contains("a_file"));
-    assert!(output.contains("hello_file"));
-}
-
 #[test]
 pub fn test_with_bad_param() {
-    let mut cmd = cargo_bin_cmd!("dust");
-    cmd.arg("-P").arg("bad_place");
-    let output_error = cmd.unwrap_err();
-    let result = output_error.as_output().unwrap();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let result = cmd.arg("bad_place").unwrap();
     let stderr = str::from_utf8(&result.stderr).unwrap();
     assert!(stderr.contains("No such file or directory"));
 }

tests/tests_symlinks.rs

@@ -1,4 +1,4 @@
-use assert_cmd::{Command, cargo_bin_cmd};
+use assert_cmd::Command;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
@@ -44,7 +44,7 @@ pub fn test_soft_sym_link() {
     let b = format!(" ┌── {}", file_path_s);
     let a = format!("─┴ {}", dir_s);
 
-    let mut cmd = cargo_bin_cmd!("dust");
+    let mut cmd = Command::cargo_bin("dust").unwrap();
     // Mac test runners create long filenames in tmp directories
     let output = cmd
         .args(["-p", "-c", "-s", "-w", "999", dir_s])
@@ -72,7 +72,7 @@ pub fn test_hard_sym_link() {
     let file_output = format!(" ┌── {}", file_path_s);
     let dirs_output = format!("─┴ {}", dir_s);
 
-    let mut cmd = cargo_bin_cmd!("dust");
+    let mut cmd = Command::cargo_bin("dust").unwrap();
     // Mac test runners create long filenames in tmp directories
     let output = cmd.args(["-p", "-c", "-w", "999", dir_s]).unwrap().stdout;
 
@@ -96,7 +96,7 @@ pub fn test_hard_sym_link_no_dup_multi_arg() {
     let link_name = dir_link.path().join("the_link");
     let link_name_s = link_it(link_name, file_path_s, false);
 
-    let mut cmd = cargo_bin_cmd!("dust");
+    let mut cmd = Command::cargo_bin("dust").unwrap();
 
     // Mac test runners create long filenames in tmp directories
     let output = cmd
@@ -123,7 +123,7 @@ pub fn test_recursive_sym_link() {
     let a = format!("─┬ {}", dir_s);
     let b = format!(" └── {}", link_name_s);
 
-    let mut cmd = cargo_bin_cmd!("dust");
+    let mut cmd = Command::cargo_bin("dust").unwrap();
     let output = cmd
         .arg("-p")
         .arg("-c")