style: fix clippy

refactor: pull out more methods, remove unused Option
refactor: extract function
2025-12-08 13:50:41 -08:00 · 2025-07-02 18:33:55 +01:00 · 2025-06-06 20:44:00 +01:00 · 2025-06-04 20:57:57 +01:00 · 2025-06-04 20:07:23 +01:00 · 2025-06-04 19:55:50 +01:00
21 changed files with 1094 additions and 998 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 [[package]]
 name = "aho-corasick"
@@ -37,9 +37,9 @@ dependencies = [
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -52,36 +52,37 @@ dependencies = [
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
 "utf8parse",
 ]
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
 "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
 "windows-sys 0.59.0",
 ]
 [[package]]
@@ -102,9 +103,9 @@ dependencies = [
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 [[package]]
 name = "bitflags"
@@ -114,15 +115,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 [[package]]
 name = "bstr"
-version = "1.10.0"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
 "memchr",
 "regex-automata",
@@ -131,15 +132,18 @@ dependencies = [
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 [[package]]
 name = "cc"
-version = "1.1.8"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
 "shlex",
 ]
 [[package]]
 name = "cfg-if"
@@ -149,38 +153,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "cfg_aliases"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 [[package]]
 name = "clap"
-version = "4.5.14"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c937d4061031a6d0c8da4b9a4f98a172fc2976dfb1c19213a9cf7d0d3c837e36"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
 dependencies = [
 "clap_builder",
 "clap_derive",
 ]
 [[package]]
 name = "clap_builder"
-version = "4.5.14"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85379ba512b21a328adf887e85f7742d12e96eb31f3ef077df4ffc26b506ffed"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
 dependencies = [
 "anstream",
 "anstyle",
@@ -190,24 +195,36 @@ dependencies = [
 [[package]]
 name = "clap_complete"
-version = "4.5.13"
+version = "4.5.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa3c596da3cf0983427b0df0dba359df9182c13bd5b519b585a482b0c351f4e8"
+checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
 dependencies = [
 "clap",
 ]
 [[package]]
-name = "clap_lex"
+name = "clap_derive"
-version = "0.7.2"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "clap_lex"
 version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 [[package]]
 name = "clap_mangen"
-version = "0.2.23"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb"
+checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
 dependencies = [
 "clap",
 "roff",
@@ -215,9 +232,9 @@ dependencies = [
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 [[package]]
 name = "config-file"
@@ -232,15 +249,15 @@ dependencies = [
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
 "crossbeam-epoch",
 "crossbeam-utils",
@@ -257,18 +274,18 @@ dependencies = [
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 [[package]]
 name = "ctrlc"
-version = "3.4.4"
+version = "3.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
 "nix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
@@ -305,7 +322,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 [[package]]
 name = "du-dust"
-version = "1.1.1"
+version = "1.2.1"
 dependencies = [
 "ansi_term",
 "assert_cmd",
@@ -334,25 +351,25 @@ dependencies = [
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 [[package]]
 name = "filesize"
@@ -371,9 +388,27 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 [[package]]
 name = "getrandom"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
 "cfg-if",
 "libc",
 "wasi 0.13.3+wasi-0.2.2",
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "heck"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -382,9 +417,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
@@ -422,24 +457,25 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
 "once_cell",
 "wasm-bindgen",
 ]
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 [[package]]
 name = "libredox"
@@ -447,7 +483,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 "libc",
 ]
@@ -459,15 +495,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 [[package]]
 name = "lscolors"
@@ -487,11 +523,11 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 [[package]]
 name = "nix"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -527,9 +563,9 @@ dependencies = [
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 [[package]]
 name = "overload"
@@ -539,15 +575,15 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 [[package]]
 name = "predicates"
-version = "3.1.2"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
+checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
 dependencies = [
 "anstyle",
 "difflib",
@@ -556,15 +592,15 @@ dependencies = [
 [[package]]
 name = "predicates-core"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
 [[package]]
 name = "predicates-tree"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
+checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
 dependencies = [
 "predicates-core",
 "termtree",
@@ -572,18 +608,18 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
 dependencies = [
 "proc-macro2",
 ]
@@ -610,20 +646,20 @@ dependencies = [
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 "libredox",
 "thiserror",
 ]
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -633,9 +669,9 @@ dependencies = [
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -644,9 +680,9 @@ dependencies = [
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "roff"
@@ -656,9 +692,9 @@ checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3"
 [[package]]
 name = "rustix"
-version = "0.37.27"
+version = "0.37.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
 dependencies = [
 "bitflags 1.3.2",
 "errno",
@@ -670,37 +706,43 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 "errno",
 "libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys 0.9.2",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 [[package]]
-name = "ryu"
+name = "rustversion"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
 [[package]]
 name = "ryu"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "serde"
-version = "1.0.205"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.205"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -709,9 +751,9 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.122"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
 "itoa",
 "memchr",
@@ -719,6 +761,12 @@ dependencies = [
 "serde",
 ]
 [[package]]
 name = "shlex"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 [[package]]
 name = "stfu8"
 version = "0.2.7"
@@ -733,9 +781,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -759,14 +807,15 @@ dependencies = [
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
 dependencies = [
 "cfg-if",
 "fastrand",
 "getrandom 0.3.1",
 "once_cell",
- "rustix 0.38.34",
+ "rustix 1.0.1",
 "windows-sys 0.59.0",
 ]
@@ -776,30 +825,30 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 dependencies = [
- "rustix 0.37.27",
+ "rustix 0.37.28",
 "windows-sys 0.48.0",
 ]
 [[package]]
 name = "termtree"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -823,15 +872,15 @@ dependencies = [
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 [[package]]
 name = "utf8parse"
@@ -841,9 +890,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
 "libc",
 ]
@@ -855,24 +904,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 [[package]]
-name = "wasm-bindgen"
+name = "wasi"
-version = "0.2.92"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
 dependencies = [
 "wit-bindgen-rt",
 ]
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
 "cfg-if",
 "once_cell",
 "rustversion",
 "wasm-bindgen-macro",
 ]
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
 "bumpalo",
 "log",
 "once_cell",
 "proc-macro2",
 "quote",
 "syn",
@@ -881,9 +940,9 @@ dependencies = [
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -891,9 +950,9 @@ dependencies = [
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -904,9 +963,12 @@ dependencies = [
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "winapi"
@@ -948,6 +1010,12 @@ dependencies = [
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows-link"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -957,15 +1025,6 @@ dependencies = [
 "windows-targets 0.48.5",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -1095,3 +1154,12 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
 "bitflags 2.9.0",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "1.1.1"
+version = "1.2.1"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
-edition = "2021"
+edition = "2024"
 readme = "README.md"
 documentation = "https://github.com/bootandy/dust"
@@ -28,7 +28,7 @@ strip = true
 [dependencies]
 ansi_term = "0.12"
-clap = "4.4"
+clap = { version = "4.4", features = ["derive"] }
 lscolors = "0.13"
 terminal_size = "0.2"
 unicode-width = "0.1"
@@ -56,7 +56,7 @@ assert_cmd = "2"
 tempfile = "=3"
 [build-dependencies]
-clap = "4.4"
+clap = { version = "4.4", features = ["derive"] }
 clap_complete = "4.4"
 clap_mangen = "0.2"
--- a/build.rs
+++ b/build.rs
@@ -1,3 +1,4 @@
 use clap::CommandFactory;
 use clap_complete::{generate_to, shells::*};
 use clap_mangen::Man;
 use std::fs::File;
@@ -9,7 +10,7 @@ include!("src/cli.rs");
 fn main() -> Result<(), Error> {
    let outdir = "completions";
    let app_name = "dust";
-    let mut cmd = build_cli();
+    let mut cmd = Cli::command();
    generate_to(Bash, &mut cmd, app_name, outdir)?;
    generate_to(Zsh, &mut cmd, app_name, outdir)?;
--- a/completions/_dust
+++ b/completions/_dust
@@ -15,39 +15,61 @@ _dust() {
    local context curcontext="$curcontext" state line
    _arguments "${_arguments_options[@]}" : \
-'-d+[Depth to show]:DEPTH: ' \
+'-d+[Depth to show]:DEPTH:_default' \
-'--depth=[Depth to show]:DEPTH: ' \
+'--depth=[Depth to show]:DEPTH:_default' \
-'-T+[Number of threads to use]: : ' \
+'-T+[Number of threads to use]:THREADS:_default' \
-'--threads=[Number of threads to use]: : ' \
+'--threads=[Number of threads to use]:THREADS:_default' \
 '--config=[Specify a config file to use]:FILE:_files' \
-'-n+[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER: ' \
+'-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: ' \
+'--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: ' \
+'-z+[Minimum size file to include in output]:MIN_SIZE:_default' \
-'--min-size=[Minimum size file to include in output]:MIN_SIZE: ' \
+'--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: ' \
+'(-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: ' \
+'(-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: ' \
+'(-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: ' \
+'(-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: ' \
+'-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: ' \
+'--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)' \
+'-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)"
-'--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)' \
+b\:"byte (B)"
-'-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: ' \
+k\:"kibibyte (KiB)"
-'--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: ' \
+m\:"mebibyte (MiB)"
-'-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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: : ' \
+g\:"gibibyte (GiB)"
-'--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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: : ' \
+t\:"tebibyte (TiB)"
-'-A+[just like -mtime, but based on file access time]: : ' \
+kb\:"kilobyte (kB)"
-'--atime=[just like -mtime, but based on file access time]: : ' \
+mb\:"megabyte (MB)"
-'-y+[just like -mtime, but based on file change time]: : ' \
+gb\:"gigabyte (GB)"
-'--ctime=[just like -mtime, but based on file change time]: : ' \
+tb\:"terabyte (TB)"))' \
-'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]: :_files' \
+'--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)"
-'*--collapse=[Keep these directories collapsed]: :_files' \
+b\:"byte (B)"
-'-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)' \
+k\:"kibibyte (KiB)"
-'--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)' \
+m\:"mebibyte (MiB)"
 g\:"gibibyte (GiB)"
 t\:"tebibyte (TiB)"
 kb\:"kilobyte (kB)"
 mb\:"megabyte (MB)"
 gb\:"gigabyte (GB)"
 tb\:"terabyte (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' \
 '--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]:FILES0_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"))' \
 '-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]' \
@@ -72,23 +94,23 @@ _dust() {
 '-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]' \
+'(-d --depth -D --only-dir)--file-types[show only these file types]' \
-'-P[Disable the progress indication.]' \
+'-P[Disable the progress indication]' \
-'--no-progress[Disable the progress indication.]' \
+'--no-progress[Disable the progress indication]' \
-'--print-errors[Print path with errors.]' \
+'--print-errors[Print path with errors]' \
-'(-F --only-file -t --file_types)-D[Only directories will be displayed.]' \
+'(-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.]' \
+'(-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]' \
+'-h[Print help (see more with '\''--help'\'')]' \
-'--help[Print help]' \
+'--help[Print help (see more with '\''--help'\'')]' \
 '-V[Print version]' \
 '--version[Print version]' \
-'*::params:_files' \
+'*::params -- Input files or directories:_files' \
 && ret=0
 }
--- a/completions/_dust.ps1
+++ b/completions/_dust.ps1
@@ -21,79 +21,79 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
    $completions = @(switch ($command) {
        'dust' {
-            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'Depth to show')
+            [CompletionResult]::new('-d', '-d', [CompletionResultType]::ParameterName, 'Depth to show')
-            [CompletionResult]::new('--depth', 'depth', [CompletionResultType]::ParameterName, 'Depth to show')
+            [CompletionResult]::new('--depth', '--depth', [CompletionResultType]::ParameterName, 'Depth to show')
-            [CompletionResult]::new('-T', 'T ', [CompletionResultType]::ParameterName, 'Number of threads to use')
+            [CompletionResult]::new('-T', '-T ', [CompletionResultType]::ParameterName, 'Number of threads to use')
-            [CompletionResult]::new('--threads', 'threads', [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('--config', '--config', [CompletionResultType]::ParameterName, 'Specify a config file to use')
-            [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
+            [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('--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('-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('--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('-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('--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('-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('--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('-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('--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('-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('--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('-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('--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('-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('--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('-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('--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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
+            [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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
-            [CompletionResult]::new('--mtime', 'mtime', [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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
+            [CompletionResult]::new('--mtime', '--mtime', [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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
-            [CompletionResult]::new('-A', 'A ', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
+            [CompletionResult]::new('-A', '-A ', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
-            [CompletionResult]::new('--atime', 'atime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
+            [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('-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('--ctime', '--ctime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
-            [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('--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('--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('-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')
+            [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')
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
+            [CompletionResult]::new('-p', '-p', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
-            [CompletionResult]::new('--full-paths', 'full-paths', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
+            [CompletionResult]::new('--full-paths', '--full-paths', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
-            [CompletionResult]::new('-L', 'L ', [CompletionResultType]::ParameterName, 'dereference sym links - Treat sym links as directories and go into them')
+            [CompletionResult]::new('-L', '-L ', [CompletionResultType]::ParameterName, 'dereference sym links - Treat sym links as directories and go into them')
-            [CompletionResult]::new('--dereference-links', 'dereference-links', [CompletionResultType]::ParameterName, 'dereference sym links - Treat sym links as directories and go into them')
+            [CompletionResult]::new('--dereference-links', '--dereference-links', [CompletionResultType]::ParameterName, 'dereference sym links - Treat sym links as directories and go into them')
-            [CompletionResult]::new('-x', 'x', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
+            [CompletionResult]::new('-x', '-x', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
-            [CompletionResult]::new('--limit-filesystem', 'limit-filesystem', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
+            [CompletionResult]::new('--limit-filesystem', '--limit-filesystem', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
-            [CompletionResult]::new('-s', 's', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
+            [CompletionResult]::new('-s', '-s', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
-            [CompletionResult]::new('--apparent-size', 'apparent-size', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
+            [CompletionResult]::new('--apparent-size', '--apparent-size', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
-            [CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
+            [CompletionResult]::new('-r', '-r', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
-            [CompletionResult]::new('--reverse', 'reverse', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
+            [CompletionResult]::new('--reverse', '--reverse', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
-            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
+            [CompletionResult]::new('-c', '-c', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
-            [CompletionResult]::new('--no-colors', 'no-colors', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
+            [CompletionResult]::new('--no-colors', '--no-colors', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
-            [CompletionResult]::new('-C', 'C ', [CompletionResultType]::ParameterName, 'Force colors print')
+            [CompletionResult]::new('-C', '-C ', [CompletionResultType]::ParameterName, 'Force colors print')
-            [CompletionResult]::new('--force-colors', 'force-colors', [CompletionResultType]::ParameterName, 'Force colors print')
+            [CompletionResult]::new('--force-colors', '--force-colors', [CompletionResultType]::ParameterName, 'Force colors print')
-            [CompletionResult]::new('-b', 'b', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
+            [CompletionResult]::new('-b', '-b', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
-            [CompletionResult]::new('--no-percent-bars', 'no-percent-bars', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
+            [CompletionResult]::new('--no-percent-bars', '--no-percent-bars', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
-            [CompletionResult]::new('-B', 'B ', [CompletionResultType]::ParameterName, 'percent bars moved to right side of screen')
+            [CompletionResult]::new('-B', '-B ', [CompletionResultType]::ParameterName, 'percent bars moved to right side of screen')
-            [CompletionResult]::new('--bars-on-right', 'bars-on-right', [CompletionResultType]::ParameterName, 'percent bars moved to right side of screen')
+            [CompletionResult]::new('--bars-on-right', '--bars-on-right', [CompletionResultType]::ParameterName, 'percent bars moved to right side of screen')
-            [CompletionResult]::new('-R', 'R ', [CompletionResultType]::ParameterName, 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)')
+            [CompletionResult]::new('-R', '-R ', [CompletionResultType]::ParameterName, 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)')
-            [CompletionResult]::new('--screen-reader', 'screen-reader', [CompletionResultType]::ParameterName, 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)')
+            [CompletionResult]::new('--screen-reader', '--screen-reader', [CompletionResultType]::ParameterName, 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)')
-            [CompletionResult]::new('--skip-total', 'skip-total', [CompletionResultType]::ParameterName, 'No total row will be displayed')
+            [CompletionResult]::new('--skip-total', '--skip-total', [CompletionResultType]::ParameterName, 'No total row will be displayed')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
+            [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('--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('-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('-t', '-t', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('--file_types', 'file_types', [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('-P', '-P ', [CompletionResultType]::ParameterName, 'Disable the progress indication')
-            [CompletionResult]::new('--no-progress', 'no-progress', [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('--print-errors', '--print-errors', [CompletionResultType]::ParameterName, 'Print path with errors')
-            [CompletionResult]::new('-D', 'D ', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
+            [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('--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('-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('--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('-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('--output-json', '--output-json', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help')
+            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help')
+            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
-            [CompletionResult]::new('-V', 'V ', [CompletionResultType]::ParameterName, 'Print version')
+            [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Print version')
+            [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
            break
        }
    })
--- a/completions/dust.bash
+++ b/completions/dust.bash
@@ -19,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 --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
@@ -126,7 +126,7 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --terminal_width)
+                --terminal-width)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
--- a/completions/dust.elv
+++ b/completions/dust.elv
@@ -31,14 +31,14 @@ set edit:completion:arg-completer[dust] = {|@words|
            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 -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 --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 -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 --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 --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 -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 --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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
@@ -75,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 --file-types 'show only these file types'
-            cand -P 'Disable the progress indication.'
+            cand -P 'Disable the progress indication'
-            cand --no-progress 'Disable the progress indication.'
+            cand --no-progress 'Disable the progress indication'
-            cand --print-errors 'Print path with errors.'
+            cand --print-errors 'Print path with errors'
-            cand -D 'Only directories will be displayed.'
+            cand -D 'Only directories will be displayed'
-            cand --only-dir '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'
+            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help'
+            cand --help 'Print help (see more with ''--help'')'
            cand -V 'Print version'
            cand --version 'Print version'
        }
--- a/completions/dust.fish
+++ b/completions/dust.fish
@@ -5,17 +5,28 @@ complete -c dust -s n -l number-of-lines -d 'Number of lines of output to show.
 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 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 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 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 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 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 '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'',c\t'',m\t''}"
+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 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'
@@ -28,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 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 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 -s P -l no-progress -d 'Disable the progress indication'
-complete -c dust -l print-errors -d 'Print path with errors.'
+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 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'
+complete -c dust -s h -l help -d 'Print help (see more with \'--help\')'
 complete -c dust -s V -l version -d 'Print version'
--- a/man-page/dust.1
+++ b/man-page/dust.1
@@ -1,10 +1,10 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH Dust 1  "Dust 1.1.1" 
+.TH Dust 1  "Dust 1.2.1" 
 .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\-\-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
@@ -12,7 +12,7 @@ Like du but more intuitive
 \fB\-d\fR, \fB\-\-depth\fR=\fIDEPTH\fR
 Depth to show
 .TP
-\fB\-T\fR, \fB\-\-threads\fR
+\fB\-T\fR, \fB\-\-threads\fR=\fITHREADS\fR
 Number of threads to use
 .TP
 \fB\-\-config\fR=\fIFILE\fR
@@ -66,39 +66,61 @@ 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=\fIREGEX\fR
-Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$" 
+Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$"
 .TP
 \fB\-e\fR, \fB\-\-filter\fR=\fIREGEX\fR
-Only include filepaths matching this regex. For png files type: \-e "\\.png$" 
+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=\fIWIDTH\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=\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.
+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: \fRsi, b, k, m, g, t, kb, mb, gb, tb]
+\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
 .TP
 \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)
@@ -106,35 +128,43 @@ Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error:
 \fB\-j\fR, \fB\-\-output\-json\fR
 Output the directory tree as json to the current directory
 .TP
-\fB\-M\fR, \fB\-\-mtime\fR
+\fB\-M\fR, \fB\-\-mtime\fR=\fIMTIME\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
+\fB\-A\fR, \fB\-\-atime\fR=\fIATIME\fR
 just like \-mtime, but based on file access time
 .TP
-\fB\-y\fR, \fB\-\-ctime\fR
+\fB\-y\fR, \fB\-\-ctime\fR=\fICTIME\fR
 just like \-mtime, but based on file change time
 .TP
-\fB\-\-files0\-from\fR
+\fB\-\-files0\-from\fR=\fIFILES0_FROM\fR
 run dust on NUL\-terminated file names specified in file; if argument is \-, then read names from standard input
 .TP
-\fB\-\-collapse\fR
+\fB\-\-collapse\fR=\fICOLLAPSE\fR
 Keep these directories collapsed
 .TP
-\fB\-m\fR, \fB\-\-filetime\fR
+\fB\-m\fR, \fB\-\-filetime\fR=\fIFILETIME\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: \fRa, c, m]
+\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
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Print help
+Print help (see a summary with \*(Aq\-h\*(Aq)
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .TP
 [\fIPATH\fR]
-
+Input files or directories
 .SH VERSION
-v1.1.1
+v1.2.1
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,326 +1,258 @@
-use clap::{builder::PossibleValue, value_parser, Arg, Command};
+use std::fmt;
 use clap::{Parser, ValueEnum, ValueHint};
 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
-pub fn build_cli() -> Command {
+/// Like du but more intuitive
-    Command::new("Dust")
+#[derive(Debug, Parser)]
-        .about("Like du but more intuitive")
+#[command(name("Dust"), version)]
-        .version(env!("CARGO_PKG_VERSION"))
+pub struct Cli {
-        .arg(
+    /// Depth to show
-            Arg::new("depth")
+    #[arg(short, long)]
-                .short('d')
+    pub depth: Option<usize>,
-                .long("depth")
+
-                .value_name("DEPTH")
+    /// Number of threads to use
-                .value_parser(value_parser!(usize))
+    #[arg(short('T'), long)]
-                .help("Depth to show")
+    pub threads: Option<usize>,
-                .num_args(1)
+
-        )
+    /// Specify a config file to use
-        .arg(
+    #[arg(long, value_name("FILE"), value_hint(ValueHint::FilePath))]
-            Arg::new("threads")
+    pub config: Option<String>,
-                .short('T')
+
-                .long("threads")
+    /// Number of lines of output to show. (Default is terminal_height - 10)
-                .value_parser(value_parser!(usize))
+    #[arg(short, long, value_name("NUMBER"))]
-                .help("Number of threads to use")
+    pub number_of_lines: Option<usize>,
-                .num_args(1)
+
-        )
+    /// Subdirectories will not have their path shortened
-        .arg(
+    #[arg(short('p'), long)]
-            Arg::new("config")
+    pub full_paths: bool,
-                .long("config")
+
-                .help("Specify a config file to use")
+    /// Exclude any file or directory with this path
-                .value_name("FILE")
+    #[arg(short('X'), long, value_name("PATH"), value_hint(ValueHint::AnyPath))]
-                .value_hint(clap::ValueHint::FilePath)
+    pub ignore_directory: Option<Vec<String>>,
-                .value_parser(value_parser!(String))
+
-                .num_args(1)
+    /// 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
-        .arg(
+    /// --invert_filter
-            Arg::new("number_of_lines")
+    #[arg(short('I'), long, value_name("FILE"), value_hint(ValueHint::FilePath))]
-                .short('n')
+    pub ignore_all_in_file: Option<String>,
-                .long("number-of-lines")
+
-                .value_name("NUMBER")
+    /// dereference sym links - Treat sym links as directories and go into them
-                .value_parser(value_parser!(usize))
+    #[arg(short('L'), long)]
-                .help("Number of lines of output to show. (Default is terminal_height - 10)")
+    pub dereference_links: bool,
-                .num_args(1)
+
-        )
+    /// Only count the files and directories on the same filesystem as the
-        .arg(
+    /// supplied directory
-            Arg::new("display_full_paths")
+    #[arg(short('x'), long)]
-                .short('p')
+    pub limit_filesystem: bool,
-                .long("full-paths")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Use file length instead of blocks
-                .help("Subdirectories will not have their path shortened"),
+    #[arg(short('s'), long)]
-        )
+    pub apparent_size: bool,
-        .arg(
+
-            Arg::new("ignore_directory")
+    /// Print tree upside down (biggest highest)
-                .short('X')
+    #[arg(short, long)]
-                .long("ignore-directory")
+    pub reverse: bool,
-                .value_name("PATH")
+
-                .value_hint(clap::ValueHint::AnyPath)
+    /// No colors will be printed (Useful for commands like: watch)
-                .action(clap::ArgAction::Append)
+    #[arg(short('c'), long)]
-                .help("Exclude any file or directory with this path"),
+    pub no_colors: bool,
-        )
+
-        .arg(
+    /// Force colors print
-            Arg::new("ignore_all_in_file")
+    #[arg(short('C'), long)]
-                .short('I')
+    pub force_colors: bool,
-                .long("ignore-all-in-file")
+
-                .value_name("FILE")
+    /// No percent bars or percentages will be displayed
-                .value_hint(clap::ValueHint::FilePath)
+    #[arg(short('b'), long)]
-                .value_parser(value_parser!(String))
+    pub no_percent_bars: bool,
-                .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"),
+
-        )
+    /// percent bars moved to right side of screen
-         .arg(
+    #[arg(short('B'), long)]
-            Arg::new("dereference_links")
+    pub bars_on_right: bool,
-                .short('L')
+
-                .long("dereference-links")
+    /// Minimum size file to include in output
-                .action(clap::ArgAction::SetTrue)
+    #[arg(short('z'), long)]
-                .help("dereference sym links - Treat sym links as directories and go into them"),
+    pub min_size: Option<String>,
-        )
+
-        .arg(
+    /// For screen readers. Removes bars. Adds new column: depth level (May want
-            Arg::new("limit_filesystem")
+    /// to use -p too for full path)
-                .short('x')
+    #[arg(short('R'), long)]
-                .long("limit-filesystem")
+    pub screen_reader: bool,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Only count the files and directories on the same filesystem as the supplied directory"),
+    /// No total row will be displayed
-        )
+    #[arg(long)]
-        .arg(
+    pub skip_total: bool,
-            Arg::new("display_apparent_size")
+
-                .short('s')
+    /// Directory 'size' is number of child files instead of disk size
-                .long("apparent-size")
+    #[arg(short, long)]
-                .action(clap::ArgAction::SetTrue)
+    pub filecount: bool,
-                .help("Use file length instead of blocks"),
+
-        )
+    /// Do not display hidden files
-        .arg(
+    // Do not use 'h' this is used by 'help'
-            Arg::new("reverse")
+    #[arg(short, long)]
-                .short('r')
+    pub ignore_hidden: bool,
-                .long("reverse")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Exclude filepaths matching this regex. To ignore png files type: -v
-                .help("Print tree upside down (biggest highest)"),
+    /// "\.png$"
-        )
+    #[arg(
-        .arg(
+        short('v'),
-            Arg::new("no_colors")
+        long,
-                .short('c')
+        value_name("REGEX"),
-                .long("no-colors")
+        conflicts_with("filter"),
-                .action(clap::ArgAction::SetTrue)
+        conflicts_with("file_types")
-                .help("No colors will be printed (Useful for commands like: watch)"),
+    )]
-        )
+    pub invert_filter: Option<Vec<String>>,
-        .arg(
+
-            Arg::new("force_colors")
+    /// Only include filepaths matching this regex. For png files type: -e
-                .short('C')
+    /// "\.png$"
-                .long("force-colors")
+    #[arg(short('e'), long, value_name("REGEX"), conflicts_with("file_types"))]
-                .action(clap::ArgAction::SetTrue)
+    pub filter: Option<Vec<String>>,
-                .help("Force colors print"),
+
-        )
+    /// show only these file types
-        .arg(
+    #[arg(short('t'), long, conflicts_with("depth"), conflicts_with("only_dir"))]
-            Arg::new("no_bars")
+    pub file_types: bool,
-                .short('b')
+
-                .long("no-percent-bars")
+    /// Specify width of output overriding the auto detection of terminal width
-                .action(clap::ArgAction::SetTrue)
+    #[arg(short('w'), long, value_name("WIDTH"))]
-                .help("No percent bars or percentages will be displayed"),
+    pub terminal_width: Option<usize>,
-        )
+
-        .arg(
+    /// Disable the progress indication.
-            Arg::new("bars_on_right")
+    #[arg(short('P'), long)]
-                .short('B')
+    pub no_progress: bool,
-                .long("bars-on-right")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Print path with errors.
-                .help("percent bars moved to right side of screen"),
+    #[arg(long)]
-        )
+    pub print_errors: bool,
-        .arg(
+
-            Arg::new("min_size")
+    /// Only directories will be displayed.
-                .short('z')
+    #[arg(
-                .long("min-size")
+        short('D'),
-                .value_name("MIN_SIZE")
+        long,
-                .num_args(1)
+        conflicts_with("only_file"),
-                .help("Minimum size file to include in output"),
+        conflicts_with("file_types")
-        )
+    )]
-        .arg(
+    pub only_dir: bool,
-            Arg::new("screen_reader")
+
-                .short('R')
+    /// Only files will be displayed. (Finds your largest files)
-                .long("screen-reader")
+    #[arg(short('F'), long, conflicts_with("only_dir"))]
-                .action(clap::ArgAction::SetTrue)
+    pub only_file: bool,
-                .help("For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)"),
+
-        )
+    /// Changes output display size. si will print sizes in powers of 1000. b k
-        .arg(
+    /// m g t kb mb gb tb will print the whole tree in that size.
-            Arg::new("skip_total")
+    #[arg(short, long, value_enum, value_name("FORMAT"), ignore_case(true))]
-                .long("skip-total")
+    pub output_format: Option<OutputFormat>,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("No total row will be displayed"),
+    /// Specify memory to use as stack size - use if you see: 'fatal runtime
-        )
+    /// error: stack overflow' (default low memory=1048576, high
-        .arg(
+    /// memory=1073741824)
-            Arg::new("by_filecount")
+    #[arg(short('S'), long)]
-                .short('f')
+    pub stack_size: Option<usize>,
-                .long("filecount")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Input files or directories.
-                .help("Directory 'size' is number of child files instead of disk size"),
+    #[arg(value_name("PATH"), value_hint(ValueHint::AnyPath))]
-        )
+    pub params: Option<Vec<String>>,
-        .arg(
+
-            Arg::new("ignore_hidden")
+    /// Output the directory tree as json to the current directory
-                .short('i') // Do not use 'h' this is used by 'help'
+    #[arg(short('j'), long)]
-                .long("ignore_hidden")
+    pub output_json: bool,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Do not display hidden files"),
+    /// +/-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 =>
-        .arg(
+    /// (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
-            Arg::new("invert_filter")
+    #[arg(short('M'), long, allow_hyphen_values(true))]
-                .short('v')
+    pub mtime: Option<String>,
-                .long("invert-filter")
+
-                .value_name("REGEX")
+    /// just like -mtime, but based on file access time
-                .action(clap::ArgAction::Append)
+    #[arg(short('A'), long, allow_hyphen_values(true))]
-                .conflicts_with("filter")
+    pub atime: Option<String>,
-                .conflicts_with("types")
+
-                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
+    /// just like -mtime, but based on file change time
-        )
+    #[arg(short('y'), long, allow_hyphen_values(true))]
-        .arg(
+    pub ctime: Option<String>,
-            Arg::new("filter")
+
-                .short('e')
+    /// run dust on NUL-terminated file names specified in file; if argument is
-                .long("filter")
+    /// -, then read names from standard input
-                .value_name("REGEX")
+    #[arg(long, value_hint(ValueHint::AnyPath))]
-                .action(clap::ArgAction::Append)
+    pub files0_from: Option<String>,
-                .conflicts_with("types")
+
-                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
+    /// Keep these directories collapsed
-        )
+    #[arg(long, value_hint(ValueHint::AnyPath))]
-        .arg(
+    pub collapse: Option<Vec<String>>,
-            Arg::new("types")
+
-                .short('t')
+    /// Directory 'size' is max filetime of child files instead of disk size.
-                .long("file_types")
+    /// while a/c/m for last accessed/changed/modified time
-                .conflicts_with("depth")
+    #[arg(short('m'), long, value_enum)]
-                .conflicts_with("only_dir")
+    pub filetime: Option<FileTime>,
-                .action(clap::ArgAction::SetTrue)
+}
-                .help("show only these file types"),
+
-        )
+#[derive(Clone, Copy, Debug, ValueEnum)]
-        .arg(
+#[value(rename_all = "lower")]
-            Arg::new("width")
+pub enum OutputFormat {
-                .short('w')
+    /// SI prefix (powers of 1000)
-                .long("terminal_width")
+    SI,
-                .value_name("WIDTH")
+
-                .value_parser(value_parser!(usize))
+    /// byte (B)
-                .num_args(1)
+    B,
-                .help("Specify width of output overriding the auto detection of terminal width"),
+
-        )
+    /// kibibyte (KiB)
-        .arg(
+    #[value(name = "k", alias("kib"))]
-            Arg::new("disable_progress")
+    KiB,
-                .short('P')
+
-                .long("no-progress")
+    /// mebibyte (MiB)
-                .action(clap::ArgAction::SetTrue)
+    #[value(name = "m", alias("mib"))]
-                .help("Disable the progress indication."),
+    MiB,
-        )
+
-        .arg(
+    /// gibibyte (GiB)
-            Arg::new("print_errors")
+    #[value(name = "g", alias("gib"))]
-                .long("print-errors")
+    GiB,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Print path with errors."),
+    /// tebibyte (TiB)
-        )
+    #[value(name = "t", alias("tib"))]
-        .arg(
+    TiB,
-            Arg::new("only_dir")
+
-                .short('D')
+    /// kilobyte (kB)
-                .long("only-dir")
+    KB,
-                .conflicts_with("only_file")
+
-                .conflicts_with("types")
+    /// megabyte (MB)
-                .action(clap::ArgAction::SetTrue)
+    MB,
-                .help("Only directories will be displayed."),
+
-        )
+    /// gigabyte (GB)
-        .arg(
+    GB,
-            Arg::new("only_file")
+
-                .short('F')
+    /// terabyte (TB)
-                .long("only-file")
+    TB,
-                .conflicts_with("only_dir")
+}
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Only files will be displayed. (Finds your largest files)"),
+impl fmt::Display for OutputFormat {
-        )
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        .arg(
+        match self {
-            Arg::new("output_format")
+            Self::SI => write!(f, "si"),
-                .short('o')
+            Self::B => write!(f, "b"),
-                .long("output-format")
+            Self::KiB => write!(f, "k"),
-                .value_name("FORMAT")
+            Self::MiB => write!(f, "m"),
-                .value_parser([
+            Self::GiB => write!(f, "g"),
-                    PossibleValue::new("si"),
+            Self::TiB => write!(f, "t"),
-                    PossibleValue::new("b"),
+            Self::KB => write!(f, "kb"),
-                    PossibleValue::new("k").alias("kib"),
+            Self::MB => write!(f, "mb"),
-                    PossibleValue::new("m").alias("mib"),
+            Self::GB => write!(f, "gb"),
-                    PossibleValue::new("g").alias("gib"),
+            Self::TB => write!(f, "tb"),
-                    PossibleValue::new("t").alias("tib"),
+        }
-                    PossibleValue::new("kb"),
+    }
-                    PossibleValue::new("mb"),
+}
-                    PossibleValue::new("gb"),
+
-                    PossibleValue::new("tb"),
+#[derive(Clone, Copy, Debug, ValueEnum)]
-                ])
+pub enum FileTime {
-                .ignore_case(true)
+    /// last accessed time
-                .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.")
+    #[value(name = "a", alias("accessed"))]
-        )
+    Accessed,
-        .arg(
+
-            Arg::new("stack_size")
+    /// last changed time
-                .short('S')
+    #[value(name = "c", alias("changed"))]
-                .long("stack-size")
+    Changed,
-                .value_name("STACK_SIZE")
+
-                .value_parser(value_parser!(usize))
+    /// last modified time
-                .num_args(1)
+    #[value(name = "m", alias("modified"))]
-                .help("Specify memory to use as stack size - use if you see: 'fatal runtime error: stack overflow' (default low memory=1048576, high memory=1073741824)"),
+    Modified,
        )
        .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"),
        )
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,13 +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::io::IsTerminal;
 use std::path::Path;
 use std::path::PathBuf;
 use crate::cli::Cli;
 use crate::dir_walker::Operator;
 use crate::display::get_number_format;
@@ -40,79 +39,68 @@ pub struct Config {
 }
 impl Config {
-    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
+    pub fn get_files_from(&self, options: &Cli) -> Option<String> {
-        let from_file = options.get_one::<String>("files0_from");
+        let from_file = &options.files0_from;
        match from_file {
            None => self.files0_from.as_ref().map(|x| x.to_string()),
            Some(x) => Some(x.to_string()),
        }
    }
-    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
+    pub fn get_no_colors(&self, options: &Cli) -> bool {
-        Some(true) == self.no_colors || options.get_flag("no_colors")
+        Some(true) == self.no_colors || options.no_colors
    }
-    pub fn get_force_colors(&self, options: &ArgMatches) -> bool {
+    pub fn get_force_colors(&self, options: &Cli) -> bool {
-        Some(true) == self.force_colors || options.get_flag("force_colors")
+        Some(true) == self.force_colors || options.force_colors
    }
-    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
+    pub fn get_disable_progress(&self, options: &Cli) -> bool {
-        Some(true) == self.disable_progress
+        Some(true) == self.disable_progress || options.no_progress
            || options.get_flag("disable_progress")
            || !std::io::stdout().is_terminal()
    }
-    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
+    pub fn get_apparent_size(&self, options: &Cli) -> bool {
-        Some(true) == self.display_apparent_size || options.get_flag("display_apparent_size")
+        Some(true) == self.display_apparent_size || options.apparent_size
    }
-    pub fn get_ignore_hidden(&self, options: &ArgMatches) -> bool {
+    pub fn get_ignore_hidden(&self, options: &Cli) -> bool {
-        Some(true) == self.ignore_hidden || options.get_flag("ignore_hidden")
+        Some(true) == self.ignore_hidden || options.ignore_hidden
    }
-    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
+    pub fn get_full_paths(&self, options: &Cli) -> bool {
-        Some(true) == self.display_full_paths || options.get_flag("display_full_paths")
+        Some(true) == self.display_full_paths || options.full_paths
    }
-    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
+    pub fn get_reverse(&self, options: &Cli) -> bool {
-        Some(true) == self.reverse || options.get_flag("reverse")
+        Some(true) == self.reverse || options.reverse
    }
-    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
+    pub fn get_no_bars(&self, options: &Cli) -> bool {
-        Some(true) == self.no_bars || options.get_flag("no_bars")
+        Some(true) == self.no_bars || options.no_percent_bars
    }
-    pub fn get_output_format(&self, options: &ArgMatches) -> String {
+    pub fn get_output_format(&self, options: &Cli) -> String {
-        let out_fmt = options.get_one::<String>("output_format");
+        let out_fmt = options.output_format;
        (match out_fmt {
            None => match &self.output_format {
                None => "".to_string(),
                Some(x) => x.to_string(),
            },
-            Some(x) => x.into(),
+            Some(x) => x.to_string(),
        })
        .to_lowercase()
    }
-    pub fn get_filetime(&self, options: &ArgMatches) -> Option<FileTime> {
+    pub fn get_filetime(&self, options: &Cli) -> Option<FileTime> {
-        let out_fmt = options.get_one::<String>("filetime");
+        options.filetime.map(FileTime::from)
        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: &ArgMatches) -> bool {
+    pub fn get_skip_total(&self, options: &Cli) -> bool {
-        Some(true) == self.skip_total || options.get_flag("skip_total")
+        Some(true) == self.skip_total || options.skip_total
    }
-    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
+    pub fn get_screen_reader(&self, options: &Cli) -> bool {
-        Some(true) == self.screen_reader || options.get_flag("screen_reader")
+        Some(true) == self.screen_reader || options.screen_reader
    }
-    pub fn get_depth(&self, options: &ArgMatches) -> usize {
+    pub fn get_depth(&self, options: &Cli) -> usize {
-        if let Some(v) = options.get_one::<usize>("depth") {
+        if let Some(v) = options.depth {
-            return *v;
+            return v;
        }
        self.depth.unwrap_or(usize::MAX)
    }
-    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_min_size(&self, options: &Cli) -> Option<usize> {
-        let size_from_param = options.get_one::<String>("min_size");
+        let size_from_param = options.min_size.as_ref();
        self._get_min_size(size_from_param)
    }
    fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
@@ -126,58 +114,49 @@ impl Config {
            size_from_param
        }
    }
-    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
+    pub fn get_only_dir(&self, options: &Cli) -> bool {
-        Some(true) == self.only_dir || options.get_flag("only_dir")
+        Some(true) == self.only_dir || options.only_dir
    }
-    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
+    pub fn get_print_errors(&self, options: &Cli) -> bool {
-        Some(true) == self.print_errors || options.get_flag("print_errors")
+        Some(true) == self.print_errors || options.print_errors
    }
-    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
+    pub fn get_only_file(&self, options: &Cli) -> bool {
-        Some(true) == self.only_file || options.get_flag("only_file")
+        Some(true) == self.only_file || options.only_file
    }
-    pub fn get_bars_on_right(&self, options: &ArgMatches) -> bool {
+    pub fn get_bars_on_right(&self, options: &Cli) -> bool {
-        Some(true) == self.bars_on_right || options.get_flag("bars_on_right")
+        Some(true) == self.bars_on_right || options.bars_on_right
    }
-    pub fn get_custom_stack_size(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_custom_stack_size(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("stack_size");
+        let from_cmd_line = options.stack_size;
        if from_cmd_line.is_none() {
            self.stack_size
        } else {
-            from_cmd_line.copied()
+            from_cmd_line
        }
    }
-    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_threads(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("threads");
+        let from_cmd_line = options.threads;
        if from_cmd_line.is_none() {
            self.threads
        } else {
-            from_cmd_line.copied()
+            from_cmd_line
        }
    }
-    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
+    pub fn get_output_json(&self, options: &Cli) -> bool {
-        Some(true) == self.output_json || options.get_flag("output_json")
+        Some(true) == self.output_json || options.output_json
    }
-    pub fn get_modified_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
+    pub fn get_modified_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
+        get_filter_time_operator(options.mtime.as_ref(), get_current_date_epoch_seconds())
            options.get_one::<String>("mtime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_accessed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
+    pub fn get_accessed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
+        get_filter_time_operator(options.atime.as_ref(), get_current_date_epoch_seconds())
            options.get_one::<String>("atime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_changed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
+    pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
+        get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
            options.get_one::<String>("ctime"),
            get_current_date_epoch_seconds(),
        )
    }
 }
@@ -253,10 +232,10 @@ fn get_config_locations(base: &Path) -> Vec<PathBuf> {
    ]
 }
-pub fn get_config(conf_path: Option<String>) -> Config {
+pub fn get_config(conf_path: Option<&String>) -> Config {
    match conf_path {
        Some(path_str) => {
-            let path = Path::new(&path_str);
+            let path = Path::new(path_str);
            if path.exists() {
                match Config::from_config_file(path) {
                    Ok(config) => return config,
@@ -290,8 +269,7 @@ mod tests {
    #[allow(unused_imports)]
    use super::*;
    use chrono::{Datelike, Timelike};
-    use clap::builder::PossibleValue;
+    use clap::Parser;
    use clap::{value_parser, Arg, ArgMatches, Command};
    #[test]
    fn test_get_current_date_epoch_seconds() {
@@ -360,15 +338,8 @@ mod tests {
        assert_eq!(c.get_depth(&args), 5);
    }
-    fn get_args(args: Vec<&str>) -> ArgMatches {
+    fn get_args(args: Vec<&str>) -> Cli {
-        Command::new("Dust")
+        Cli::parse_from(args)
            .arg(
                Arg::new("depth")
                    .long("depth")
                    .num_args(1)
                    .value_parser(value_parser!(usize)),
            )
            .get_matches_from(args)
    }
    #[test]
@@ -406,20 +377,7 @@ mod tests {
        assert_eq!(c.get_filetime(&args), Some(FileTime::Changed));
    }
-    fn get_filetime_args(args: Vec<&str>) -> ArgMatches {
+    fn get_filetime_args(args: Vec<&str>) -> Cli {
-        Command::new("Dust")
+        Cli::parse_from(args)
        .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)
    }
 }
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -5,10 +5,10 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use crate::node::Node;
 use crate::progress::ORDERING;
 use crate::progress::Operation;
 use crate::progress::PAtomicInfo;
 use crate::progress::RuntimeErrors;
 use crate::progress::ORDERING;
 use crate::utils::is_filtered_out_due_to_file_time;
 use crate::utils::is_filtered_out_due_to_invert_regex;
 use crate::utils::is_filtered_out_due_to_regex;
@@ -125,9 +125,33 @@ fn sort_by_inode(a: &Node, b: &Node) -> std::cmp::Ordering {
    }
 }
 // Check if `path` is inside ignored directory
 fn is_ignored_path(path: &Path, walk_data: &WalkData) -> bool {
    if walk_data.ignore_directories.contains(path) {
        return true;
    }
    // Entry is inside an ignored absolute path
    // Absolute paths should be canonicalized before being added to `WalkData.ignore_directories`
    for ignored_path in walk_data.ignore_directories.iter() {
        if !ignored_path.is_absolute() {
            continue;
        }
        let absolute_entry_path = std::fs::canonicalize(path).unwrap_or_default();
        if absolute_entry_path.starts_with(ignored_path) {
            return true;
        }
    }
    false
 }
 fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
    if is_ignored_path(&entry.path(), walk_data) {
        return true;
    }
    let is_dot_file = entry.file_name().to_str().unwrap_or("").starts_with('.');
    let is_ignored_path = walk_data.ignore_directories.contains(&entry.path());
    let follow_links = walk_data.follow_links && entry.file_type().is_ok_and(|ft| ft.is_symlink());
    if !walk_data.allowed_filesystems.is_empty() {
@@ -175,17 +199,13 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
        return true;
    }
-    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
+    is_dot_file && walk_data.ignore_hidden
 }
 fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
    let prog_data = &walk_data.progress_data;
    let errors = &walk_data.errors;
    if errors.lock().unwrap().abort {
        return None;
    }
    let children = if dir.is_dir() {
        let read_dir = fs::read_dir(&dir);
        match read_dir {
@@ -284,7 +304,6 @@ 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;
            if editable_error.interrupted_error > 3 {
                panic!("Multiple Interrupted Errors occurred while scanning filesystem. Aborting");
--- a/src/display.rs
+++ b/src/display.rs
@@ -11,13 +11,8 @@ use stfu8::encode_u8;
 use chrono::{DateTime, Local, TimeZone, Utc};
 use std::cmp::max;
 use std::cmp::min;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::collections::VecDeque;
 use std::fs;
-use std::hash::Hash;
+use std::iter::repeat_n;
 use std::iter::repeat;
 use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
 use thousands::Separable;
@@ -42,7 +37,6 @@ pub struct DisplayData {
    pub base_size: u64,
    pub longest_string_length: usize,
    pub ls_colors: LsColors,
    pub duplicate_names: HashMap<String, u32>,
 }
 impl DisplayData {
@@ -77,11 +71,7 @@ impl DisplayData {
    fn percent_size(&self, node: &DisplayNode) -> f32 {
        let result = node.size as f32 / self.base_size as f32;
-        if result.is_normal() {
+        if result.is_normal() { result } else { 0.0 }
            result
        } else {
            0.0
        }
    }
 }
@@ -135,14 +125,11 @@ 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 duplicate_names = check_for_dup_names(&root_node);
    let num_chars_needed_on_left_most = if idd.by_filecount {
        let max_size = root_node.size;
        max_size.separate_with_commas().chars().count()
@@ -157,12 +144,10 @@ pub fn draw_it(
        "Not enough terminal width"
    );
    // let duplicate_dir_names = find_duplicate_names(root_node, idd.short_paths);
    let allowed_width = terminal_width - num_chars_needed_on_left_most - 2;
    let num_indent_chars = 3;
    let longest_string_length =
-        find_longest_dir_name(root_node, num_indent_chars, allowed_width, &idd, &duplicate_names);
+        find_longest_dir_name(root_node, num_indent_chars, allowed_width, &idd);
    let max_bar_length = if no_percent_bars || longest_string_length + 7 >= allowed_width {
        0
@@ -170,7 +155,7 @@ pub fn draw_it(
        allowed_width - longest_string_length - 7
    };
-    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
+    let first_size_bar = repeat_n(BLOCKS[0], max_bar_length).collect();
    let display_data = DisplayData {
        initial: idd,
@@ -178,7 +163,6 @@ pub fn draw_it(
        base_size: root_node.size,
        longest_string_length,
        ls_colors: LsColors::from_env().unwrap_or_default(),
        duplicate_names
    };
    let draw_data = DrawData {
        indent: "".to_string(),
@@ -199,82 +183,6 @@ pub fn draw_it(
        }
    }
 }
 fn check_for_dup_names(result:&DisplayNode) -> HashMap<String, u32> {
    let mut names = HashMap::new();
    let mut dup_names = HashMap::new();
    // let empty = HashSet::new();
    let mut results = VecDeque::new();
    results.push_back((result, 0));
    while results.len() > 0 {
        let (current, level) = results.pop_front().unwrap();
        let mut folders = current.name.iter().rev(); 
        let mut s = String::new();
        // Look at parent folder names - if they differ and we are printing them
        // we dont need the helper
        for _ in  0..level {
            s.push_str( &encode_u8(folders.next().unwrap().as_bytes()));
        }
        if names.contains_key(&s){
            // TODO: compare s with names[s] 
            // and walk back until you find a difference.
            dup_names.insert(s, level);
        } else {
            names.insert(s, vec![&current.name]);
        }
        current.children.iter().for_each(|node| {results.push_back((&node, level+1));});
    }
    println!("{:?}", names);
    println!("{:?}", dup_names);
    dup_names
 }
 pub fn get_printable_name(node: &DisplayNode, short_paths: bool, dup_names: &HashMap<String, u32>) -> String {
    let dir_name = &node.name;
    let printable_name = {
        if short_paths {
            match dir_name.parent() {
                Some(prefix) => match dir_name.strip_prefix(prefix) {
                    Ok(base) => base,
                    Err(_) => dir_name,
                },
                None => dir_name,
            }
        } else {
            dir_name
        }
    };
    let core = encode_u8(printable_name.display().to_string().as_bytes());
    if dup_names.contains_key(&core) {
        let level = dup_names[&core];
        let mut folders = node.name.iter().rev(); 
        folders.next();
        let mut extra = VecDeque::new();
        for _ in (0..level){
            extra.push_back( encode_u8(folders.next().unwrap().as_bytes()) );
        }
        let h = extra.iter().fold(String::new(), |acc, entry| {
            acc + entry
        });
        // let helper = extra.make_contiguous().iter().collect::<Vec<&String>>();
        // let h = helper.join("/");
        // let mut folders = dir_name.iter().rev(); //.next().next().unwrap();
        // folders.next();
        // let par = encode_u8(folders.next().unwrap().as_bytes());
        format!("{core} ({h})")
    } else {
        core
    }
 }
 fn find_biggest_size_str(node: &DisplayNode, output_format: &str) -> usize {
    let mut mx = human_readable_number(node.size, output_format)
@@ -291,9 +199,8 @@ fn find_longest_dir_name(
    indent: usize,
    terminal: usize,
    idd: &InitialDisplayData,
    dup_names: &HashMap<String, u32>,
 ) -> usize {
-    let printable_name = get_printable_name(&node, idd.short_paths, dup_names);
+    let printable_name = get_printable_name(&node.name, idd.short_paths);
    let longest = if idd.is_screen_reader {
        UnicodeWidthStr::width(&*printable_name) + 1
@@ -307,7 +214,7 @@ fn find_longest_dir_name(
    // each none root tree drawing is 2 more chars, hence we increment indent by 2
    node.children
        .iter()
-        .map(|c| find_longest_dir_name(c, indent + 2, terminal, idd, dup_names))
+        .map(|c| find_longest_dir_name(c, indent + 2, terminal, idd))
        .fold(longest, max)
 }
@@ -362,8 +269,26 @@ fn clean_indentation_string(s: &str) -> String {
    is
 }
 pub fn get_printable_name<P: AsRef<Path>>(dir_name: &P, short_paths: bool) -> String {
    let dir_name = dir_name.as_ref();
    let printable_name = {
        if short_paths {
            match dir_name.parent() {
                Some(prefix) => match dir_name.strip_prefix(prefix) {
                    Ok(base) => base,
                    Err(_) => dir_name,
                },
                None => dir_name,
            }
        } else {
            dir_name
        }
    };
    encode_u8(printable_name.display().to_string().as_bytes())
 }
 fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &DisplayData) -> String {
-    let name = get_printable_name(&node, display_data.initial.short_paths, &display_data.duplicate_names);
+    let name = get_printable_name(&node.name, display_data.initial.short_paths);
    let indent_and_name = format!("{indent} {name}");
    let width = UnicodeWidthStr::width(&*indent_and_name);
@@ -373,12 +298,9 @@ 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.
-    let name_and_padding = name
+    name + " "
-        + " "
+        .repeat(display_data.longest_string_length - width)
-            .repeat(display_data.longest_string_length - width)
+        .as_str()
            .as_str();
    name_and_padding
 }
 fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
@@ -438,7 +360,7 @@ fn get_name_percent(
        let name_and_padding = pad_or_trim_filename(node, indent, display_data);
        (percents, name_and_padding)
    } else {
-        let n = get_printable_name(&node, display_data.initial.short_paths, &display_data.duplicate_names);
+        let n = get_printable_name(&node.name, display_data.initial.short_paths);
        let name = maybe_trim_filename(n, indent, display_data);
        ("".into(), name)
    }
@@ -669,7 +591,7 @@ mod tests {
            size: 2_u64.pow(size),
            children: vec![],
        };
-        let first_size_bar = repeat(BLOCKS[0]).take(13).collect();
+        let first_size_bar = repeat_n(BLOCKS[0], 13).collect();
        let dd = DrawData {
            indent: "".into(),
            percent_bar: first_size_bar,
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -1,3 +1,6 @@
 use stfu8::encode_u8;
 use crate::display::get_printable_name;
 use crate::display_node::DisplayNode;
 use crate::node::FileTime;
 use crate::node::Node;
@@ -14,55 +17,52 @@ pub struct AggregateData {
    pub number_of_lines: usize,
    pub depth: usize,
    pub using_a_filter: bool,
    pub short_paths: bool,
 }
 pub fn get_biggest(
-    mut top_level_nodes: Vec<Node>,
+    top_level_nodes: Vec<Node>,
    display_data: AggregateData,
    by_filetime: &Option<FileTime>,
    keep_collapsed: HashSet<PathBuf>,
-) -> Option<DisplayNode> {
+) -> 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 > 1 {
+    if number_top_level_nodes == 0 {
-        let size = if by_filetime.is_some() {
+        root = total_node_builder(0, vec![])
            top_level_nodes
                .iter()
                .map(|node| node.size)
                .max()
                .unwrap_or(0)
        } else {
            top_level_nodes.iter().map(|node| node.size).sum()
        };
        root = Node {
            name: PathBuf::from("(total)"),
            size,
            children: top_level_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();
+        if number_top_level_nodes > 1 {
            let size = if by_filetime.is_some() {
                top_level_nodes
                    .iter()
                    .map(|node| node.size)
                    .max()
                    .unwrap_or(0)
            } else {
                top_level_nodes.iter().map(|node| node.size).sum()
            };
            let nodes = handle_duplicate_top_level_names(top_level_nodes, display_data.short_paths);
            root = total_node_builder(size, nodes);
        } else {
            root = top_level_nodes.into_iter().next().unwrap();
        }
        heap = add_children(&display_data, &root, heap);
    }
-    let result = fill_remaining_lines(
+    fill_remaining_lines(heap, &root, display_data, keep_collapsed)
-        heap,
+}
-        &root,
+
-        display_data,
+fn total_node_builder(size: u64, children: Vec<Node>) -> Node {
-        keep_collapsed,
+    Node {
-    );
+        name: PathBuf::from("(total)"),
-    Some(result)
+        size,
        children,
        inode_device: None,
        depth: 0,
    }
 }
 pub fn fill_remaining_lines<'a>(
@@ -77,6 +77,8 @@ pub fn fill_remaining_lines<'a>(
        let line = heap.pop();
        match line {
            Some(line) => {
                // If we are not doing only_file OR if we are doing
                // only_file and it has no children (ie is a file not a dir)
                if !display_data.only_file || line.children.is_empty() {
                    allowed_nodes.insert(line.name.as_path(), line);
                }
@@ -158,10 +160,63 @@ fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> Displ
 fn build_display_node(mut new_children: Vec<DisplayNode>, current: &Node) -> DisplayNode {
    new_children.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
    // println!("{:?}", current.name);
    DisplayNode {
-        name: PathBuf::from(current.name.display().to_string()),
+        name: current.name.clone(),
        size: current.size,
        children: new_children,
    }
 }
 fn names_have_dup(top_level_nodes: &Vec<Node>) -> bool {
    let mut stored = HashSet::new();
    for node in top_level_nodes {
        let name = get_printable_name(&node.name, true);
        if stored.contains(&name) {
            return true;
        }
        stored.insert(name);
    }
    false
 }
 fn handle_duplicate_top_level_names(top_level_nodes: Vec<Node>, short_paths: bool) -> Vec<Node> {
    // If we have top level names that are the same - we need to tweak them:
    if short_paths && names_have_dup(&top_level_nodes) {
        let mut new_top_nodes = top_level_nodes.clone();
        let mut dir_walk_up_count = 0;
        while names_have_dup(&new_top_nodes) && dir_walk_up_count < 10 {
            dir_walk_up_count += 1;
            let mut newer = vec![];
            for node in new_top_nodes.iter() {
                let mut folders = node.name.iter().rev();
                // Get parent folder (if second time round get grandparent and so on)
                for _ in 0..dir_walk_up_count {
                    folders.next();
                }
                match folders.next() {
                    // Add (parent_name) to path of Node
                    Some(data) => {
                        let parent = encode_u8(data.as_encoded_bytes());
                        let current_node = node.name.display();
                        let n = Node {
                            name: PathBuf::from(format!("{current_node}({parent})")),
                            size: node.size,
                            children: node.children.clone(),
                            inode_device: node.inode_device,
                            depth: node.depth,
                        };
                        newer.push(n)
                    }
                    // Node does not have a parent
                    None => newer.push(node.clone()),
                }
            }
            new_top_nodes = newer;
        }
        new_top_nodes
    } else {
        top_level_nodes
    }
 }
--- a/src/filter_type.rs
+++ b/src/filter_type.rs
@@ -15,7 +15,7 @@ pub fn get_all_file_types(
    top_level_nodes: &[Node],
    n: usize,
    by_filetime: &Option<FileTime>,
-) -> Option<DisplayNode> {
+) -> DisplayNode {
    let ext_nodes = {
        let mut extension_cumulative_sizes = HashMap::new();
        build_by_all_file_types(top_level_nodes, &mut extension_cumulative_sizes);
@@ -67,13 +67,11 @@ pub fn get_all_file_types(
        displayed.iter().map(|node| node.size).sum()
    };
-    let result = DisplayNode {
+    DisplayNode {
        name: PathBuf::from("(total)"),
        size: actual_size,
        children: displayed,
-    };
+    }
    Some(result)
 }
 fn build_by_all_file_types<'a>(
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,9 +10,12 @@ mod platform;
 mod progress;
 mod utils;
-use crate::cli::build_cli;
+use crate::cli::Cli;
 use crate::config::Config;
 use crate::display_node::DisplayNode;
 use crate::node::FileTime;
 use crate::progress::RuntimeErrors;
-use clap::parser::ValuesRef;
+use clap::Parser;
 use dir_walker::WalkData;
 use display::InitialDisplayData;
 use filter::AggregateData;
@@ -24,11 +27,10 @@ use std::fs::read_to_string;
 use std::io;
 use std::panic;
 use std::process;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::Mutex;
 use sysinfo::{System, SystemExt};
 use utils::canonicalize_absolute_path;
 use self::display::draw_it;
 use config::get_config;
@@ -39,7 +41,7 @@ use filter_type::get_all_file_types;
 use regex::Regex;
 use std::cmp::max;
 use std::path::PathBuf;
-use terminal_size::{terminal_size, Height, Width};
+use terminal_size::{Height, Width, terminal_size};
 use utils::get_filesystem_devices;
 use utils::simplify_dir_names;
@@ -99,9 +101,10 @@ fn get_width_of_terminal() -> usize {
        .unwrap_or(DEFAULT_TERMINAL_WIDTH)
 }
-fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
+fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
    maybe_value
-        .unwrap_or_default()
+        .unwrap_or(&Vec::new())
        .iter()
        .map(|reg| {
            Regex::new(reg).unwrap_or_else(|err| {
                eprintln!("Ignoring bad value for regex {err:?}");
@@ -112,26 +115,19 @@ fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
 }
 fn main() {
-    let options = build_cli().get_matches();
+    let options = Cli::parse();
-    let config = get_config(options.get_one::<String>("config").cloned());
+    let config = get_config(options.config.as_ref());
    let errors = RuntimeErrors::default();
    let error_listen_for_ctrlc = Arc::new(Mutex::new(errors));
    let errors_for_rayon = error_listen_for_ctrlc.clone();
    let errors_final = error_listen_for_ctrlc.clone();
    let is_in_listing = Arc::new(AtomicBool::new(false));
    let cloned_is_in_listing = Arc::clone(&is_in_listing);
    ctrlc::set_handler(move || {
        error_listen_for_ctrlc.lock().unwrap().abort = true;
        println!("\nAborting");
-        if cloned_is_in_listing.load(Ordering::Relaxed) {
+        process::exit(1);
            process::exit(1);
        }
    })
    .expect("Error setting Ctrl-C handler");
    is_in_listing.store(true, Ordering::Relaxed);
    let target_dirs = match config.get_files_from(&options) {
        Some(path) => {
            if path == "-" {
@@ -156,20 +152,19 @@ fn main() {
                }
            }
        }
-        None => match options.get_many::<String>("params") {
+        None => match options.params {
-            Some(values) => values.cloned().collect(),
+            Some(ref values) => values.clone(),
            None => vec![".".to_owned()],
        },
    };
    is_in_listing.store(false, Ordering::Relaxed);
-    let summarize_file_types = options.get_flag("types");
+    let summarize_file_types = options.file_types;
-    let filter_regexs = get_regex_value(options.get_many("filter"));
+    let filter_regexs = get_regex_value(options.filter.as_ref());
-    let invert_filter_regexs = get_regex_value(options.get_many("invert_filter"));
+    let invert_filter_regexs = get_regex_value(options.invert_filter.as_ref());
-    let terminal_width: usize = match options.get_one::<usize>("width") {
+    let terminal_width: usize = match options.terminal_width {
-        Some(&val) => val,
+        Some(val) => val,
        None => get_width_of_terminal(),
    };
@@ -178,8 +173,8 @@ fn main() {
    // If depth is set, then we set the default number_of_lines to be max
    // instead of screen height
-    let number_of_lines = match options.get_one::<usize>("number_of_lines") {
+    let number_of_lines = match options.number_of_lines {
-        Some(&val) => val,
+        Some(val) => val,
        None => {
            if depth != usize::MAX {
                usize::MAX
@@ -194,16 +189,17 @@ fn main() {
        config.get_force_colors(&options),
    );
-    let ignore_directories = match options.get_many::<String>("ignore_directory") {
+    let ignore_directories = match options.ignore_directory {
-        Some(values) => values
+        Some(ref values) => values
-            .map(|v| v.as_str())
+            .iter()
            .map(PathBuf::from)
            .map(canonicalize_absolute_path)
            .collect::<Vec<PathBuf>>(),
        None => vec![],
    };
-    let ignore_from_file_result = match options.get_one::<String>("ignore_all_in_file") {
+    let ignore_from_file_result = match options.ignore_all_in_file {
-        Some(val) => read_to_string(val)
+        Some(ref val) => read_to_string(val)
            .unwrap()
            .lines()
            .map(Regex::new)
@@ -220,14 +216,17 @@ fn main() {
        .chain(ignore_from_file)
        .collect::<Vec<Regex>>();
-    let by_filecount = options.get_flag("by_filecount");
+    let by_filecount = options.filecount;
    let by_filetime = config.get_filetime(&options);
-    let limit_filesystem = options.get_flag("limit_filesystem");
+    let limit_filesystem = options.limit_filesystem;
-    let follow_links = options.get_flag("dereference_links");
+    let follow_links = options.dereference_links;
    let allowed_filesystems = if limit_filesystem {
        get_filesystem_devices(&target_dirs, follow_links)
    } else {
        Default::default()
    };
    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
@@ -244,8 +243,8 @@ fn main() {
        indicator.spawn(output_format.clone())
    }
-    let keep_collapsed: HashSet<PathBuf> = match options.get_many::<String>("collapse") {
+    let keep_collapsed: HashSet<PathBuf> = match options.collapse {
-        Some(collapse) => {
+        Some(ref collapse) => {
            let mut combined_dirs = HashSet::new();
            for collapse_dir in collapse {
                for target_dir in target_dirs.iter() {
@@ -293,6 +292,7 @@ fn main() {
                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)
        }
@@ -301,11 +301,60 @@ fn main() {
    // Must have stopped indicator before we print to stderr
    indicator.stop();
-    if errors_final.lock().unwrap().abort {
+    let print_errors = config.get_print_errors(&options);
-        return;
+    print_any_errors(print_errors, walk_data.errors);
    }
-    let final_errors = walk_data.errors.lock().unwrap();
+    print_output(
        config,
        options,
        tree,
        walk_data.by_filecount,
        by_filetime,
        is_colors,
        terminal_width,
    )
 }
 fn print_output(
    config: Config,
    options: Cli,
    tree: DisplayNode,
    by_filecount: bool,
    by_filetime: Option<FileTime>,
    is_colors: bool,
    terminal_width: usize,
 ) {
    let output_format = config.get_output_format(&options);
    if config.get_output_json(&options) {
        OUTPUT_TYPE.with(|wrapped| {
            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,
            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, errors: Arc<Mutex<RuntimeErrors>>) {
    let final_errors = errors.lock().unwrap();
    if !final_errors.file_not_found.is_empty() {
        let err = final_errors
            .file_not_found
@@ -313,17 +362,17 @@ fn main() {
            .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 config.get_print_errors(&options) {
+        if print_errors {
            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)"
@@ -337,35 +386,7 @@ fn main() {
            .map(|a| a.as_ref())
            .collect::<Vec<&str>>()
            .join(", ");
-        eprintln!("Unknown Error: {}", err);
+        eprintln!("Unknown Error: {err}");
    }
    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 {
            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),
            };
            draw_it(
                idd,
                config.get_no_bars(&options),
                terminal_width,
                &root_node,
                config.get_skip_total(&options),
            )
        }
    }
 }
--- a/src/node.rs
+++ b/src/node.rs
@@ -23,6 +23,16 @@ pub enum FileTime {
    Changed,
 }
 impl From<crate::cli::FileTime> for FileTime {
    fn from(time: crate::cli::FileTime) -> Self {
        match time {
            crate::cli::FileTime::Modified => Self::Modified,
            crate::cli::FileTime::Accessed => Self::Accessed,
            crate::cli::FileTime::Changed => Self::Changed,
        }
    }
 }
 #[allow(clippy::too_many_arguments)]
 pub fn build_node(
    dir: PathBuf,
@@ -48,9 +58,9 @@ pub fn build_node(
            || is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &dir)
            || by_filecount && !is_file
            || [
-                (&walk_data.filter_modified_time, data.2 .0),
+                (&walk_data.filter_modified_time, data.2.0),
-                (&walk_data.filter_accessed_time, data.2 .1),
+                (&walk_data.filter_accessed_time, data.2.1),
-                (&walk_data.filter_changed_time, data.2 .2),
+                (&walk_data.filter_changed_time, data.2.2),
            ]
            .iter()
            .any(|(filter_time, actual_time)| {
@@ -61,9 +71,9 @@ pub fn build_node(
            1
        } else if by_filetime.is_some() {
            match by_filetime {
-                Some(FileTime::Modified) => data.2 .0.unsigned_abs(),
+                Some(FileTime::Modified) => data.2.0.unsigned_abs(),
-                Some(FileTime::Accessed) => data.2 .1.unsigned_abs(),
+                Some(FileTime::Accessed) => data.2.1.unsigned_abs(),
-                Some(FileTime::Changed) => data.2 .2.unsigned_abs(),
+                Some(FileTime::Changed) => data.2.2.unsigned_abs(),
                None => unreachable!(),
            }
        } else {
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -27,15 +27,32 @@ pub fn get_metadata<P: AsRef<Path>>(
    };
    match metadata {
        Ok(md) => {
            let file_size = md.len();
            if use_apparent_size {
                Some((
-                    md.len(),
+                    file_size,
                    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((
-                    md.blocks() * get_block_size(),
+                    allocated_size,
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -3,9 +3,9 @@ use std::{
    io::Write,
    path::Path,
    sync::{
        Arc, RwLock,
        atomic::{AtomicU8, AtomicUsize, Ordering},
        mpsc::{self, RecvTimeoutError, Sender},
        Arc, RwLock,
    },
    thread::JoinHandle,
    time::Duration,
@@ -79,7 +79,6 @@ pub struct RuntimeErrors {
    pub file_not_found: HashSet<String>,
    pub unknown_error: HashSet<String>,
    pub interrupted_error: i32,
    pub abort: bool,
 }
 /* -------------------------------------------------------------------------- */
@@ -119,7 +118,7 @@ impl PIndicator {
        let time_info_thread = std::thread::spawn(move || {
            let mut progress_char_i: usize = 0;
-            let mut stdout = std::io::stdout();
+            let mut stderr = std::io::stderr();
            let mut msg = "".to_string();
            // While the timeout triggers we go round the loop
@@ -128,7 +127,8 @@ impl PIndicator {
                receiver.recv_timeout(Duration::from_millis(SPINNER_SLEEP_TIME))
            {
                // Clear the text written by 'write!'& Return at the start of line
-                print!("\r{:width$}", " ", width = msg.len());
+                let clear = format!("\r{:width$}", " ", width = msg.len());
                write!(stderr, "{clear}").unwrap();
                let prog_char = PROGRESS_CHARS[progress_char_i];
                msg = match data.state.load(ORDERING) {
@@ -137,15 +137,17 @@ impl PIndicator {
                    _ => panic!("Unknown State"),
                };
-                write!(stdout, "\r{msg}").unwrap();
+                write!(stderr, "\r{msg}").unwrap();
-                stdout.flush().unwrap();
+                stderr.flush().unwrap();
                progress_char_i += 1;
                progress_char_i %= PROGRESS_CHARS_LEN;
            }
-            print!("\r{:width$}", " ", width = msg.len());
+
-            print!("\r");
+            let clear = format!("\r{:width$}", " ", width = msg.len());
-            stdout.flush().unwrap();
+            write!(stderr, "{clear}").unwrap();
            write!(stderr, "\r").unwrap();
            stderr.flush().unwrap();
        });
        self.thread = Some((stop_handler, time_info_thread))
    }
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -67,6 +67,17 @@ pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
    path.as_ref().components().collect()
 }
 // Canonicalize the path only if it is an absolute path
 pub fn canonicalize_absolute_path(path: PathBuf) -> PathBuf {
    if !path.is_absolute() {
        return path;
    }
    match std::fs::canonicalize(&path) {
        Ok(canonicalized_path) => canonicalized_path,
        Err(_) => path,
    }
 }
 pub fn is_filtered_out_due_to_regex(filter_regex: &[Regex], dir: &Path) -> bool {
    if filter_regex.is_empty() {
        false
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -10,6 +10,9 @@ use std::str;
 fn build_command<T: AsRef<OsStr>>(command_args: Vec<T>) -> String {
    let mut cmd = &mut Command::cargo_bin("dust").unwrap();
    // Hide progress bar
    cmd = cmd.arg("-P");
    for p in command_args {
        cmd = cmd.arg(p);
    }
@@ -261,3 +264,19 @@ pub fn test_collapse() {
    assert!(output.contains("many"));
    assert!(!output.contains("hello_file"));
 }
 #[test]
 pub fn test_handle_duplicate_names() {
    // Check that even if we run on a multiple directories with the same name
    // we still show the distinct parent dir in the output
    let output = build_command(vec![
        "tests/test_dir_matching/dave/dup_name",
        "tests/test_dir_matching/andy/dup_name",
        "ci",
    ]);
    assert!(output.contains("andy"));
    assert!(output.contains("dave"));
    assert!(output.contains("ci"));
    assert!(output.contains("dup_name"));
    assert!(!output.contains("test_dir_matching"));
 }
Author	SHA1	Message	Date
andy.boot	b2b56029da	style: fix clippy	2025-07-02 18:33:55 +01:00
andy.boot	74ffd78901	refactor: pull out more methods, remove unused Option	2025-06-06 20:44:00 +01:00
andy.boot	9b2dc4655d	refactor: extract function	2025-06-04 20:57:57 +01:00
andy.boot	29441eda19	version: increment version	2025-06-04 20:07:23 +01:00
andy.boot	e6f90362a7	fix: bug: Remove bad error handling This may be causing dust to lock up as we were accidentally creating a second editable_error causing threads to lock. https://github.com/bootandy/dust/issues/495	2025-06-04 19:55:50 +01:00
Shun Sakai	702f0f0fe9	chore(cli): Migrate to Derive API Change the definition of CLI from the Builder API to the Derive API.	2025-05-16 22:09:27 +01:00
andy.boot	6a14d7e8b3	style: Fix clippy New clippy has new standards. Clean up get_metadata by removing unused return	2025-04-20 19:55:36 +01:00
Teemu Pätsi	4e2d93f362	refactor: Fix clippy warnings (#488 ) * refactor: Use `repeat_n` instead of `repeat` and `take` Fixes `clippy::manual_repeat_n` * refactor: Remove unnecessary let binding	2025-04-20 18:48:11 +01:00
Teemu Pätsi	b616378ba0	Fix: miscalculation of NTFS mount file sizes inside WSL (#487 ) * fix: Limit file size based on the file system I/O block size * fix: Take possible file pre-allocation into account * refactor: Reduce indenting with early return * refactor: Fix clippy::manual_div_ceil * fix: Use target_size instead of max_size * fix: Take possible pre-allocation for a file into account https://github.com/bootandy/dust/pull/487#issuecomment-2816885444	2025-04-20 08:50:09 +01:00
andy.boot	646cdd976d	release: increment version (#485 )	2025-04-01 23:19:59 +01:00
andy.boot	9a49221ac1	fix: status mesages go to stderr not stdout (#483 ) Progress spinner and status line are written to stderr instead of stdout. No longer any need to detect if stdout is being redirected.	2025-04-01 23:19:36 +01:00
andy.boot	1b4116e39d	fix: all arguments now use '-' instead of '_' (#484 ) * cli: unify long arguments (dashes instead of underscores) * completions: autoregen completions --------- Co-authored-by: Pavel Kulyov <kulyov.pavel@gmail.com>	2025-04-01 23:18:49 +01:00
Aidan Beggs	733abb2a3f	feat: Abort immedietly when ^C is received. (#478 ) Previously, we attempted to perform a clean shutdown, which could take a significant period of time on slow filesystems. This commit changes the shutdown logic to abort immedietly when ^C is received by the program.	2025-03-30 17:35:28 +01:00
andy.boot	dd799706fb	deps: cargo update (#474 ) * deps: cargo update * deps: Update edition 2024 and run cargo update	2025-03-11 00:38:38 +00:00
Teemu Pätsi	b219981c52	rewrite: Reduce indentation with guard clause	2025-03-10 21:25:13 +00:00
Teemu Pätsi	c31468b199	perf: Canonicalize ignored absolute path only once	2025-03-10 21:25:13 +00:00
Teemu Pätsi	28d409ea27	refactor: Extract is_ignored_path function	2025-03-10 21:25:13 +00:00
Teemu Pätsi	aa319e3599	perf: Do not canonicalize non-absolute ignored path	2025-03-10 21:25:13 +00:00
Teemu Pätsi	c2a4c4573a	fix: Ignoring absolute path with `-X` option	2025-03-10 21:25:13 +00:00
andy.boot	d876cc28a7	release: Increment version	2025-02-27 22:08:38 +00:00
andy.boot	137e366eca	feat: Handle duplicate dir names better If we run `dust /usr/*/Trash` We see several 'Trash' directories in the output but do not know which user they belong to. This fix means if we see duplicate names in a directory we will display the parent directory name as well	2025-02-20 22:08:06 +00:00
andy.boot	a962b80eec	deps: cargo update	2025-02-06 00:30:39 +00:00