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
2026-06-08 11:29:05 +03:00 · 2025-02-07 20:15:11 +00:00
27 changed files with 1012 additions and 1313 deletions
@@ -11,6 +11,12 @@ dependencies = [
 "memchr",
 ]
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -31,9 +37,9 @@ dependencies = [
 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -46,44 +52,44 @@ dependencies = [
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
 "utf8parse",
 ]
 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
 "anstyle",
- "once_cell_polyfill",
+ "once_cell",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 name = "assert_cmd"
-version = "2.0.17"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
 dependencies = [
 "anstyle",
 "bstr",
@@ -97,9 +103,9 @@ dependencies = [
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 [[package]]
 name = "bitflags"
@@ -109,15 +115,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 [[package]]
 name = "bstr"
-version = "1.12.0"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
 "memchr",
 "regex-automata",
@@ -126,25 +132,24 @@ dependencies = [
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 [[package]]
 name = "cc"
-version = "1.2.40"
+version = "1.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb"
+checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
 dependencies = [
 "find-msvc-tools",
 "shlex",
 ]
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "cfg_aliases"
@@ -154,32 +159,32 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "windows-link",
+ "windows-targets 0.52.6",
 ]
 [[package]]
 name = "clap"
-version = "4.5.48"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
+checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff"
 dependencies = [
 "clap_builder",
 "clap_derive",
 ]
 [[package]]
 name = "clap_builder"
-version = "4.5.48"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
+checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
 dependencies = [
 "anstream",
 "anstyle",
@@ -189,36 +194,24 @@ dependencies = [
 [[package]]
 name = "clap_complete"
-version = "4.5.58"
+version = "4.5.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75bf0b32ad2e152de789bb635ea4d3078f6b838ad7974143e99b99f45a04af4a"
+checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6"
 dependencies = [
 "clap",
 ]
 [[package]]
 name = "clap_derive"
 version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 [[package]]
 name = "clap_mangen"
-version = "0.2.29"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b4c3c54b30f0d9adcb47f25f61fcce35c4dd8916638c6b82fbd5f4fb4179e2"
+checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
 dependencies = [
 "clap",
 "roff",
@@ -226,9 +219,9 @@ dependencies = [
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 [[package]]
 name = "config-file"
@@ -274,13 +267,12 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 [[package]]
 name = "ctrlc"
-version = "3.5.0"
+version = "3.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881c5d0a13b2f1498e2306e82cbada78390e152d4b1378fb28a84f4dcd0dc4f3"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
 "dispatch",
 "nix",
- "windows-sys 0.61.1",
+ "windows-sys 0.59.0",
 ]
 [[package]]
@@ -309,12 +301,6 @@ dependencies = [
 "winapi",
 ]
 [[package]]
 name = "dispatch"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -323,7 +309,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 [[package]]
 name = "du-dust"
-version = "1.2.3"
+version = "1.1.1"
 dependencies = [
 "ansi_term",
 "assert_cmd",
@@ -352,18 +338,18 @@ dependencies = [
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "errno"
-version = "0.3.14"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
 "libc",
- "windows-sys 0.61.1",
+ "windows-sys 0.59.0",
 ]
 [[package]]
@@ -381,41 +367,29 @@ dependencies = [
 "winapi",
 ]
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
 "cfg-if",
 "libc",
- "r-efi",
+ "wasi 0.13.3+wasi-0.2.2",
- "wasi 0.14.7+wasi-0.2.4",
+ "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"
@@ -424,15 +398,14 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 [[package]]
 name = "iana-time-zone"
-version = "0.1.64"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
 "iana-time-zone-haiku",
 "js-sys",
 "log",
 "wasm-bindgen",
 "windows-core",
 ]
@@ -465,15 +438,15 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
 "once_cell",
 "wasm-bindgen",
@@ -481,17 +454,17 @@ dependencies = [
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.8.0",
 "libc",
 ]
@@ -503,15 +476,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 [[package]]
 name = "lscolors"
@@ -525,17 +498,17 @@ dependencies = [
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 [[package]]
 name = "nix"
-version = "0.30.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.8.0",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -571,15 +544,9 @@ dependencies = [
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 [[package]]
 name = "once_cell_polyfill"
 version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 [[package]]
 name = "overload"
@@ -589,9 +556,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 [[package]]
 name = "predicates"
@@ -622,33 +589,27 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
 "proc-macro2",
 ]
 [[package]]
 name = "r-efi"
 version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
 "either",
 "rayon-core",
@@ -656,9 +617,9 @@ dependencies = [
 [[package]]
 name = "rayon-core"
-version = "1.13.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
 "crossbeam-deque",
 "crossbeam-utils",
@@ -670,16 +631,16 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
 "libredox",
 "thiserror",
 ]
 [[package]]
 name = "regex"
-version = "1.11.3"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -689,9 +650,9 @@ dependencies = [
 [[package]]
 name = "regex-automata"
-version = "0.4.11"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -700,9 +661,9 @@ dependencies = [
 [[package]]
 name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "roff"
@@ -726,53 +687,43 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.8.0",
 "errno",
 "libc",
- "linux-raw-sys 0.11.0",
+ "linux-raw-sys 0.4.15",
- "windows-sys 0.61.1",
+ "windows-sys 0.59.0",
 ]
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
 "serde_core",
 "serde_derive",
 ]
 [[package]]
 name = "serde_core"
 version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -781,15 +732,14 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
 "itoa",
 "memchr",
 "ryu",
 "serde",
 "serde_core",
 ]
 [[package]]
@@ -812,9 +762,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -838,15 +788,16 @@ dependencies = [
 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
 dependencies = [
 "cfg-if",
 "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.1",
 "once_cell",
- "rustix 1.1.2",
+ "rustix 0.38.44",
- "windows-sys 0.61.1",
+ "windows-sys 0.59.0",
 ]
 [[package]]
@@ -902,9 +853,9 @@ dependencies = [
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 [[package]]
 name = "unicode-width"
@@ -929,46 +880,36 @@ dependencies = [
 [[package]]
 name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 [[package]]
 name = "wasi"
-version = "0.14.7+wasi-0.2.4"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
 dependencies = [
- "wasip2",
+ "wit-bindgen-rt",
 ]
 [[package]]
 name = "wasip2"
 version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
 "wit-bindgen",
 ]
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
 "cfg-if",
 "once_cell",
 "rustversion",
 "wasm-bindgen-macro",
 "wasm-bindgen-shared",
 ]
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
 "bumpalo",
 "log",
@@ -980,9 +921,9 @@ dependencies = [
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -990,9 +931,9 @@ dependencies = [
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1003,9 +944,9 @@ dependencies = [
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
 dependencies = [
 "unicode-ident",
 ]
@@ -1028,11 +969,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 [[package]]
 name = "winapi-util"
-version = "0.1.11"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.61.1",
+ "windows-sys 0.59.0",
 ]
 [[package]]
@@ -1043,61 +984,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "windows-core"
-version = "0.62.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-implement",
+ "windows-targets 0.52.6",
 "windows-interface",
 "windows-link",
 "windows-result",
 "windows-strings",
 ]
 [[package]]
 name = "windows-implement"
 version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "windows-interface"
 version = "0.59.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 [[package]]
 name = "windows-result"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
 dependencies = [
 "windows-link",
 ]
 [[package]]
 name = "windows-strings"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
 dependencies = [
 "windows-link",
 ]
 [[package]]
@@ -1111,20 +1002,11 @@ dependencies = [
 [[package]]
 name = "windows-sys"
-version = "0.60.2"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.53.4",
+ "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
 dependencies = [
 "windows-link",
 ]
 [[package]]
@@ -1144,19 +1026,18 @@ dependencies = [
 [[package]]
 name = "windows-targets"
-version = "0.53.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows-link",
+ "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.52.6",
- "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.52.6",
 "windows_i686_gnu 0.53.1",
 "windows_i686_gnullvm",
- "windows_i686_msvc 0.53.1",
+ "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.53.1",
+ "windows_x86_64_msvc 0.52.6",
 ]
 [[package]]
@@ -1167,9 +1048,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1179,9 +1060,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 [[package]]
 name = "windows_i686_gnu"
@@ -1191,15 +1072,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 [[package]]
 name = "windows_i686_msvc"
@@ -1209,9 +1090,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1221,9 +1102,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1233,9 +1114,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1245,12 +1126,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
-name = "wit-bindgen"
+name = "wit-bindgen-rt"
-version = "0.46.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
 "bitflags 2.8.0",
 ]
@@ -1,9 +1,9 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "1.2.3"
+version = "1.1.1"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
-edition = "2024"
+edition = "2021"
 readme = "README.md"
 documentation = "https://github.com/bootandy/dust"
@@ -28,7 +28,7 @@ strip = true
 [dependencies]
 ansi_term = "0.12"
-clap = { version = "4.4", features = ["derive"] }
+clap = "4.4"
 lscolors = "0.13"
 terminal_size = "0.2"
 unicode-width = "0.1"
@@ -56,7 +56,7 @@ assert_cmd = "2"
 tempfile = "=3"
 [build-dependencies]
-clap = { version = "4.4", features = ["derive"] }
+clap = "4.4"
 clap_complete = "4.4"
 clap_mangen = "0.2"
@@ -90,7 +90,7 @@ Usage: dust -B (--bars-on-right - Percent bars moved to right side of screen)
 Usage: dust -i (Do not show hidden files)
 Usage: dust -c (No colors [monochrome])
 Usage: dust -C (Force colors)
-Usage: dust -f (Count files instead of diskspace [Counts by inode, to include duplicate inodes use dust -f -s])
+Usage: dust -f (Count files instead of diskspace)
 Usage: dust -t (Group by filetype)
 Usage: dust -z 10M (min-size, Only include files larger than 10M)
 Usage: dust -e regex (Only include files matching this regex (eg dust -e "\.png$" would match png files))
@@ -102,8 +102,7 @@ Usage: dust -S (Custom Stack size - Use if you see: 'fatal runtime error: stack
 Usage: dust --skip-total (No total row will be displayed)
 Usage: dust -z 40000/30MB/20kib (Exclude output files/directories below size 40000 bytes / 30MB / 20KiB)
 Usage: dust -j (Prints JSON representation of directories, try: dust -j  | jq)
-Usage: dust --files0-from=FILE (Read NUL-terminated file paths from FILE; if FILE is '-', read from stdin)
+Usage: dust --files0-from=FILE (Reads null-terminated file paths from FILE); If FILE is - then read from stdin
 Usage: dust --files-from=FILE (Read newline-terminated file paths from FILE; if FILE is '-', read from stdin)
 Usage: dust --collapse=node-modules will keep the node-modules folder collapsed in display instead of recursively opening it
 ```
@@ -123,6 +122,6 @@ reverse=true
 - [dua](https://github.com/Byron/dua-cli/)
 - [pdu](https://github.com/KSXGitHub/parallel-disk-usage)
 - [dirstat-rs](https://github.com/scullionw/dirstat-rs)
- `du -d 1 -h | sort -h`
+- du -d 1 -h | sort -h
 Note: Apparent-size is calculated slightly differently in dust to gdu. In dust each hard link is counted as using file_length space. In gdu only the first entry is counted.
@@ -1,4 +1,3 @@
 use clap::CommandFactory;
 use clap_complete::{generate_to, shells::*};
 use clap_mangen::Man;
 use std::fs::File;
@@ -10,7 +9,7 @@ include!("src/cli.rs");
 fn main() -> Result<(), Error> {
    let outdir = "completions";
    let app_name = "dust";
-    let mut cmd = Cli::command();
+    let mut cmd = build_cli();
    generate_to(Bash, &mut cmd, app_name, outdir)?;
    generate_to(Zsh, &mut cmd, app_name, outdir)?;
@@ -17,8 +17,8 @@ _dust() {
    _arguments "${_arguments_options[@]}" : \
 '-d+[Depth to show]:DEPTH:_default' \
 '--depth=[Depth to show]:DEPTH:_default' \
-'-T+[Number of threads to use]:THREADS:_default' \
+'-T+[Number of threads to use]: :_default' \
-'--threads=[Number of threads to use]:THREADS:_default' \
+'--threads=[Number of threads to use]: :_default' \
 '--config=[Specify a config file to use]:FILE:_files' \
 '-n+[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
 '--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
@@ -28,49 +28,26 @@ _dust() {
 '--ignore-all-in-file=[Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter]:FILE:_files' \
 '-z+[Minimum size file to include in output]:MIN_SIZE:_default' \
 '--min-size=[Minimum size file to include in output]:MIN_SIZE:_default' \
-'(-e --filter -t --file-types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$"]:REGEX:_default' \
+'(-e --filter -t --file_types)*-v+[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX:_default' \
-'(-e --filter -t --file-types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$"]:REGEX:_default' \
+'(-e --filter -t --file_types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type\: -v "\\.png\$" ]:REGEX:_default' \
-'(-t --file-types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$"]:REGEX:_default' \
+'(-t --file_types)*-e+[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX:_default' \
-'(-t --file-types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$"]:REGEX:_default' \
+'(-t --file_types)*--filter=[Only include filepaths matching this regex. For png files type\: -e "\\.png\$" ]:REGEX:_default' \
 '-w+[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
-'--terminal-width=[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
+'--terminal_width=[Specify width of output overriding the auto detection of terminal width]:WIDTH:_default' \
-'-o+[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size]:FORMAT:((si\:"SI prefix (powers of 1000)"
+'-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)' \
-b\:"byte (B)"
+'--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)' \
 k\:"kibibyte (KiB)"
 m\:"mebibyte (MiB)"
 g\:"gibibyte (GiB)"
 t\:"tebibyte (TiB)"
 kb\:"kilobyte (kB)"
 mb\:"megabyte (MB)"
 gb\:"gigabyte (GB)"
 tb\:"terabyte (TB)"))' \
 '--output-format=[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size]:FORMAT:((si\:"SI prefix (powers of 1000)"
 b\:"byte (B)"
 k\:"kibibyte (KiB)"
 m\:"mebibyte (MiB)"
 g\:"gibibyte (GiB)"
 t\:"tebibyte (TiB)"
 kb\:"kilobyte (kB)"
 mb\:"megabyte (MB)"
 gb\:"gigabyte (GB)"
 tb\:"terabyte (TB)"))' \
 '-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' \
+'-M+[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
-'--mtime=[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
-'-A+[just like -mtime, but based on file access time]:ATIME:_default' \
+'-A+[just like -mtime, but based on file access time]: :_default' \
-'--atime=[just like -mtime, but based on file access time]:ATIME:_default' \
+'--atime=[just like -mtime, but based on file access time]: :_default' \
-'-y+[just like -mtime, but based on file change time]:CTIME:_default' \
+'-y+[just like -mtime, but based on file change time]: :_default' \
-'--ctime=[just like -mtime, but based on file change time]:CTIME:_default' \
+'--ctime=[just like -mtime, but based on file change time]: :_default' \
-'(--files-from)--files0-from=[Read NUL-terminated paths from FILE (use \`-\` for stdin)]:FILES0_FROM:_files' \
+'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]: :_files' \
-'(--files0-from)--files-from=[Read newline-terminated paths from FILE (use \`-\` for stdin)]:FILES_FROM:_files' \
+'*--collapse=[Keep these directories collapsed]: :_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]: :(a c m)' \
-'-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"
+'--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)' \
 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]' \
@@ -95,23 +72,23 @@ m\:"last modified time"))' \
 '-f[Directory '\''size'\'' is number of child files instead of disk size]' \
 '--filecount[Directory '\''size'\'' is number of child files instead of disk size]' \
 '-i[Do not display hidden files]' \
-'--ignore-hidden[Do not display hidden files]' \
+'--ignore_hidden[Do not display hidden files]' \
 '(-d --depth -D --only-dir)-t[show only these file types]' \
-'(-d --depth -D --only-dir)--file-types[show only these file types]' \
+'(-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 (see more with '\''--help'\'')]' \
+'-h[Print help]' \
-'--help[Print help (see more with '\''--help'\'')]' \
+'--help[Print help]' \
 '-V[Print version]' \
 '--version[Print version]' \
-'*::params -- Input files or directories:_files' \
+'*::params:_files' \
 && ret=0
 }
@@ -34,14 +34,14 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--ignore-all-in-file', '--ignore-all-in-file', [CompletionResultType]::ParameterName, 'Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter')
            [CompletionResult]::new('-z', '-z', [CompletionResultType]::ParameterName, 'Minimum size file to include in output')
            [CompletionResult]::new('--min-size', '--min-size', [CompletionResultType]::ParameterName, 'Minimum size file to include in output')
-            [CompletionResult]::new('-v', '-v', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"')
+            [CompletionResult]::new('-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('--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('--stack-size', '--stack-size', [CompletionResultType]::ParameterName, 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)')
            [CompletionResult]::new('-M', '-M ', [CompletionResultType]::ParameterName, '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
@@ -50,8 +50,7 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('--atime', '--atime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file access time')
            [CompletionResult]::new('-y', '-y', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
            [CompletionResult]::new('--ctime', '--ctime', [CompletionResultType]::ParameterName, 'just like -mtime, but based on file change time')
-            [CompletionResult]::new('--files0-from', '--files0-from', [CompletionResultType]::ParameterName, 'Read NUL-terminated paths from FILE (use `-` for stdin)')
+            [CompletionResult]::new('--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('--files-from', '--files-from', [CompletionResultType]::ParameterName, 'Read newline-terminated paths from FILE (use `-` for stdin)')
            [CompletionResult]::new('--collapse', '--collapse', [CompletionResultType]::ParameterName, 'Keep these directories collapsed')
            [CompletionResult]::new('-m', '-m', [CompletionResultType]::ParameterName, 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time')
            [CompletionResult]::new('--filetime', '--filetime', [CompletionResultType]::ParameterName, 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time')
@@ -79,20 +78,20 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
            [CompletionResult]::new('-f', '-f', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
            [CompletionResult]::new('--filecount', '--filecount', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files instead of disk size')
            [CompletionResult]::new('-i', '-i', [CompletionResultType]::ParameterName, 'Do not display hidden files')
-            [CompletionResult]::new('--ignore-hidden', '--ignore-hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
+            [CompletionResult]::new('--ignore_hidden', '--ignore_hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
            [CompletionResult]::new('-t', '-t', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('--file-types', '--file-types', [CompletionResultType]::ParameterName, 'show only these file types')
+            [CompletionResult]::new('--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('--only-file', '--only-file', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
            [CompletionResult]::new('-j', '-j', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
            [CompletionResult]::new('--output-json', '--output-json', [CompletionResultType]::ParameterName, 'Output the directory tree as json to the current directory')
-            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help')
-            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
+            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help')
            [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
            [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
            break
@@ -1,16 +1,12 @@
 _dust() {
    local i cur prev opts cmd
    COMPREPLY=()
-    if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+    cur="${COMP_WORDS[COMP_CWORD]}"
-        cur="$2"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
    else
        cur="${COMP_WORDS[COMP_CWORD]}"
    fi
    prev="$3"
    cmd=""
    opts=""
-    for i in "${COMP_WORDS[@]:0:COMP_CWORD}"
+    for i in ${COMP_WORDS[@]}
    do
        case "${cmd},${i}" in
            ",$1")
@@ -23,7 +19,7 @@ _dust() {
    case "${cmd}" in
        dust)
-            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore-hidden --invert-filter --filter --file-types --terminal-width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --files-from --collapse --filetime --help --version [PATH]..."
+            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --collapse --filetime --help --version [PATH]..."
            if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                return 0
@@ -130,7 +126,7 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --terminal-width)
+                --terminal_width)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
@@ -182,10 +178,6 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
                --files-from)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
                --collapse)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
@@ -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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
@@ -47,8 +47,7 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --atime 'just like -mtime, but based on file access time'
            cand -y 'just like -mtime, but based on file change time'
            cand --ctime 'just like -mtime, but based on file change time'
-            cand --files0-from 'Read NUL-terminated paths from FILE (use `-` for stdin)'
+            cand --files0-from 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input'
            cand --files-from 'Read newline-terminated paths from FILE (use `-` for stdin)'
            cand --collapse 'Keep these directories collapsed'
            cand -m 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time'
            cand --filetime 'Directory ''size'' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time'
@@ -76,20 +75,20 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand -f 'Directory ''size'' is number of child files instead of disk size'
            cand --filecount 'Directory ''size'' is number of child files instead of disk size'
            cand -i 'Do not display hidden files'
-            cand --ignore-hidden 'Do not display hidden files'
+            cand --ignore_hidden 'Do not display hidden files'
            cand -t 'show only these file types'
-            cand --file-types 'show only these file types'
+            cand --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 (see more with ''--help'')'
+            cand -h 'Print help'
-            cand --help 'Print help (see more with ''--help'')'
+            cand --help 'Print help'
            cand -V 'Print version'
            cand --version 'Print version'
        }
@@ -5,29 +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'SI prefix (powers of 1000)'
+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'byte (B)'
+b\t''
-k\t'kibibyte (KiB)'
+k\t''
-m\t'mebibyte (MiB)'
+m\t''
-g\t'gibibyte (GiB)'
+g\t''
-t\t'tebibyte (TiB)'
+t\t''
-kb\t'kilobyte (kB)'
+kb\t''
-mb\t'megabyte (MB)'
+mb\t''
-gb\t'gigabyte (GB)'
+gb\t''
-tb\t'terabyte (TB)'"
+tb\t''"
 complete -c dust -s S -l stack-size -d 'Specify memory to use as stack size - use if you see: \'fatal runtime error: stack overflow\' (default low memory=1048576, high memory=1073741824)' -r
 complete -c dust -s M -l mtime -d '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)' -r
 complete -c dust -s A -l atime -d 'just like -mtime, but based on file access time' -r
 complete -c dust -s y -l ctime -d 'just like -mtime, but based on file change time' -r
-complete -c dust -l files0-from -d 'Read NUL-terminated paths from FILE (use `-` for stdin)' -r -F
+complete -c dust -l 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 files-from -d 'Read newline-terminated paths from FILE (use `-` for stdin)' -r -F
 complete -c dust -l collapse -d 'Keep these directories collapsed' -r -F
-complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t'last accessed time'
+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'last changed time'
+c\t''
-m\t'last modified time'"
+m\t''"
 complete -c dust -s p -l full-paths -d 'Subdirectories will not have their path shortened'
 complete -c dust -s L -l dereference-links -d 'dereference sym links - Treat sym links as directories and go into them'
 complete -c dust -s x -l limit-filesystem -d 'Only count the files and directories on the same filesystem as the supplied directory'
@@ -40,12 +39,12 @@ complete -c dust -s B -l bars-on-right -d 'percent bars moved to right side of s
 complete -c dust -s R -l screen-reader -d 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
 complete -c dust -l skip-total -d 'No total row will be displayed'
 complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child files instead of disk size'
-complete -c dust -s i -l ignore-hidden -d 'Do not display hidden files'
+complete -c dust -s 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 (see more with \'--help\')'
+complete -c dust -s h -l help -d 'Print help'
 complete -c dust -s V -l version -d 'Print version'
@@ -25,6 +25,4 @@ skip-total=true
 ignore-hidden=true
 # print sizes in powers of 1000 (e.g., 1.1G)
-output-format="si"
+output-format="si"
 number-of-lines=5   
@@ -1,33 +1,33 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH Dust 1  "Dust 1.2.3" 
+.TH Dust 1  "Dust 1.1.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\-\-files\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
+\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
 .SH DESCRIPTION
 Like du but more intuitive
 .SH OPTIONS
 .TP
-\fB\-d\fR, \fB\-\-depth\fR \fI<DEPTH>\fR
+\fB\-d\fR, \fB\-\-depth\fR=\fIDEPTH\fR
 Depth to show
 .TP
-\fB\-T\fR, \fB\-\-threads\fR \fI<THREADS>\fR
+\fB\-T\fR, \fB\-\-threads\fR
 Number of threads to use
 .TP
-\fB\-\-config\fR \fI<FILE>\fR
+\fB\-\-config\fR=\fIFILE\fR
 Specify a config file to use
 .TP
-\fB\-n\fR, \fB\-\-number\-of\-lines\fR \fI<NUMBER>\fR
+\fB\-n\fR, \fB\-\-number\-of\-lines\fR=\fINUMBER\fR
 Number of lines of output to show. (Default is terminal_height \- 10)
 .TP
 \fB\-p\fR, \fB\-\-full\-paths\fR
 Subdirectories will not have their path shortened
 .TP
-\fB\-X\fR, \fB\-\-ignore\-directory\fR \fI<PATH>\fR
+\fB\-X\fR, \fB\-\-ignore\-directory\fR=\fIPATH\fR
 Exclude any file or directory with this path
 .TP
-\fB\-I\fR, \fB\-\-ignore\-all\-in\-file\fR \fI<FILE>\fR
+\fB\-I\fR, \fB\-\-ignore\-all\-in\-file\fR=\fIFILE\fR
 Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by \-\-invert_filter
 .TP
 \fB\-L\fR, \fB\-\-dereference\-links\fR
@@ -54,7 +54,7 @@ No percent bars or percentages will be displayed
 \fB\-B\fR, \fB\-\-bars\-on\-right\fR
 percent bars moved to right side of screen
 .TP
-\fB\-z\fR, \fB\-\-min\-size\fR \fI<MIN_SIZE>\fR
+\fB\-z\fR, \fB\-\-min\-size\fR=\fIMIN_SIZE\fR
 Minimum size file to include in output
 .TP
 \fB\-R\fR, \fB\-\-screen\-reader\fR
@@ -66,108 +66,75 @@ No total row will be displayed
 \fB\-f\fR, \fB\-\-filecount\fR
 Directory \*(Aqsize\*(Aq is number of child files instead of disk size
 .TP
-\fB\-i\fR, \fB\-\-ignore\-hidden\fR
+\fB\-i\fR, \fB\-\-ignore_hidden\fR
 Do not display hidden files
 .TP
-\fB\-v\fR, \fB\-\-invert\-filter\fR \fI<REGEX>\fR
+\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 \fI<REGEX>\fR
+\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 \fI<WIDTH>\fR
+\fB\-w\fR, \fB\-\-terminal_width\fR=\fIWIDTH\fR
 Specify width of output overriding the auto detection of terminal width
 .TP
 \fB\-P\fR, \fB\-\-no\-progress\fR
-Disable the progress indication
+Disable the progress indication.
 .TP
 \fB\-\-print\-errors\fR
-Print path with errors
+Print path with errors.
 .TP
 \fB\-D\fR, \fB\-\-only\-dir\fR
-Only directories will be displayed
+Only directories will be displayed.
 .TP
 \fB\-F\fR, \fB\-\-only\-file\fR
 Only files will be displayed. (Finds your largest files)
 .TP
-\fB\-o\fR, \fB\-\-output\-format\fR \fI<FORMAT>\fR
+\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:\fR
+[\fIpossible values: \fRsi, b, k, m, g, t, kb, mb, gb, tb]
 .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 \fI<STACK_SIZE>\fR
+\fB\-S\fR, \fB\-\-stack\-size\fR=\fISTACK_SIZE\fR
 Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error: stack overflow\*(Aq (default low memory=1048576, high memory=1073741824)
 .TP
 \fB\-j\fR, \fB\-\-output\-json\fR
 Output the directory tree as json to the current directory
 .TP
-\fB\-M\fR, \fB\-\-mtime\fR \fI<MTIME>\fR
+\fB\-M\fR, \fB\-\-mtime\fR
 +/\-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and \-n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
 .TP
-\fB\-A\fR, \fB\-\-atime\fR \fI<ATIME>\fR
+\fB\-A\fR, \fB\-\-atime\fR
 just like \-mtime, but based on file access time
 .TP
-\fB\-y\fR, \fB\-\-ctime\fR \fI<CTIME>\fR
+\fB\-y\fR, \fB\-\-ctime\fR
 just like \-mtime, but based on file change time
 .TP
-\fB\-\-files0\-from\fR \fI<FILES0_FROM>\fR
+\fB\-\-files0\-from\fR
-Read NUL\-terminated paths from FILE (use `\-` for stdin)
+run dust on NUL\-terminated file names specified in file; if argument is \-, then read names from standard input
 .TP
-\fB\-\-files\-from\fR \fI<FILES_FROM>\fR
+\fB\-\-collapse\fR
 Read newline\-terminated paths from FILE (use `\-` for stdin)
 .TP
 \fB\-\-collapse\fR \fI<COLLAPSE>\fR
 Keep these directories collapsed
 .TP
-\fB\-m\fR, \fB\-\-filetime\fR \fI<FILETIME>\fR
+\fB\-m\fR, \fB\-\-filetime\fR
 Directory \*(Aqsize\*(Aq is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time
 .br
 .br
-\fIPossible values:\fR
+[\fIpossible values: \fRa, c, m]
 .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 (see a summary with \*(Aq\-h\*(Aq)
+Print help
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .TP
 [\fIPATH\fR]
-Input files or directories
+
 .SH VERSION
-v1.2.3
+v1.1.1
@@ -1,261 +1,326 @@
-use std::fmt;
+use clap::{builder::PossibleValue, value_parser, Arg, Command};
 use clap::{Parser, ValueEnum, ValueHint};
 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
-/// Like du but more intuitive
+pub fn build_cli() -> Command {
-#[derive(Debug, Parser)]
+    Command::new("Dust")
-#[command(name("Dust"), version)]
+        .about("Like du but more intuitive")
-pub struct Cli {
+        .version(env!("CARGO_PKG_VERSION"))
-    /// Depth to show
+        .arg(
-    #[arg(short, long)]
+            Arg::new("depth")
-    pub depth: Option<usize>,
+                .short('d')
-
+                .long("depth")
-    /// Number of threads to use
+                .value_name("DEPTH")
-    #[arg(short('T'), long)]
+                .value_parser(value_parser!(usize))
-    pub threads: Option<usize>,
+                .help("Depth to show")
-
+                .num_args(1)
-    /// Specify a config file to use
+        )
-    #[arg(long, value_name("FILE"), value_hint(ValueHint::FilePath))]
+        .arg(
-    pub config: Option<String>,
+            Arg::new("threads")
-
+                .short('T')
-    /// Number of lines of output to show. (Default is terminal_height - 10)
+                .long("threads")
-    #[arg(short, long, value_name("NUMBER"))]
+                .value_parser(value_parser!(usize))
-    pub number_of_lines: Option<usize>,
+                .help("Number of threads to use")
-
+                .num_args(1)
-    /// Subdirectories will not have their path shortened
+        )
-    #[arg(short('p'), long)]
+        .arg(
-    pub full_paths: bool,
+            Arg::new("config")
-
+                .long("config")
-    /// Exclude any file or directory with this path
+                .help("Specify a config file to use")
-    #[arg(short('X'), long, value_name("PATH"), value_hint(ValueHint::AnyPath))]
+                .value_name("FILE")
-    pub ignore_directory: Option<Vec<String>>,
+                .value_hint(clap::ValueHint::FilePath)
-
+                .value_parser(value_parser!(String))
-    /// Exclude any file or directory with a regex matching that listed in this
+                .num_args(1)
-    /// file, the file entries will be added to the ignore regexs provided by
+        )
-    /// --invert_filter
+        .arg(
-    #[arg(short('I'), long, value_name("FILE"), value_hint(ValueHint::FilePath))]
+            Arg::new("number_of_lines")
-    pub ignore_all_in_file: Option<String>,
+                .short('n')
-
+                .long("number-of-lines")
-    /// dereference sym links - Treat sym links as directories and go into them
+                .value_name("NUMBER")
-    #[arg(short('L'), long)]
+                .value_parser(value_parser!(usize))
-    pub dereference_links: bool,
+                .help("Number of lines of output to show. (Default is terminal_height - 10)")
-
+                .num_args(1)
-    /// Only count the files and directories on the same filesystem as the
+        )
-    /// supplied directory
+        .arg(
-    #[arg(short('x'), long)]
+            Arg::new("display_full_paths")
-    pub limit_filesystem: bool,
+                .short('p')
-
+                .long("full-paths")
-    /// Use file length instead of blocks
+                .action(clap::ArgAction::SetTrue)
-    #[arg(short('s'), long)]
+                .help("Subdirectories will not have their path shortened"),
-    pub apparent_size: bool,
+        )
-
+        .arg(
-    /// Print tree upside down (biggest highest)
+            Arg::new("ignore_directory")
-    #[arg(short, long)]
+                .short('X')
-    pub reverse: bool,
+                .long("ignore-directory")
-
+                .value_name("PATH")
-    /// No colors will be printed (Useful for commands like: watch)
+                .value_hint(clap::ValueHint::AnyPath)
-    #[arg(short('c'), long)]
+                .action(clap::ArgAction::Append)
-    pub no_colors: bool,
+                .help("Exclude any file or directory with this path"),
-
+        )
-    /// Force colors print
+        .arg(
-    #[arg(short('C'), long)]
+            Arg::new("ignore_all_in_file")
-    pub force_colors: bool,
+                .short('I')
-
+                .long("ignore-all-in-file")
-    /// No percent bars or percentages will be displayed
+                .value_name("FILE")
-    #[arg(short('b'), long)]
+                .value_hint(clap::ValueHint::FilePath)
-    pub no_percent_bars: bool,
+                .value_parser(value_parser!(String))
-
+                .help("Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter"),
-    /// percent bars moved to right side of screen
+        )
-    #[arg(short('B'), long)]
+         .arg(
-    pub bars_on_right: bool,
+            Arg::new("dereference_links")
-
+                .short('L')
-    /// Minimum size file to include in output
+                .long("dereference-links")
-    #[arg(short('z'), long)]
+                .action(clap::ArgAction::SetTrue)
-    pub min_size: Option<String>,
+                .help("dereference sym links - Treat sym links as directories and go into them"),
-
+        )
-    /// For screen readers. Removes bars. Adds new column: depth level (May want
+        .arg(
-    /// to use -p too for full path)
+            Arg::new("limit_filesystem")
-    #[arg(short('R'), long)]
+                .short('x')
-    pub screen_reader: bool,
+                .long("limit-filesystem")
-
+                .action(clap::ArgAction::SetTrue)
-    /// No total row will be displayed
+                .help("Only count the files and directories on the same filesystem as the supplied directory"),
-    #[arg(long)]
+        )
-    pub skip_total: bool,
+        .arg(
-
+            Arg::new("display_apparent_size")
-    /// Directory 'size' is number of child files instead of disk size
+                .short('s')
-    #[arg(short, long)]
+                .long("apparent-size")
-    pub filecount: bool,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Use file length instead of blocks"),
-    /// Do not display hidden files
+        )
-    // Do not use 'h' this is used by 'help'
+        .arg(
-    #[arg(short, long)]
+            Arg::new("reverse")
-    pub ignore_hidden: bool,
+                .short('r')
-
+                .long("reverse")
-    /// Exclude filepaths matching this regex. To ignore png files type: -v
+                .action(clap::ArgAction::SetTrue)
-    /// "\.png$"
+                .help("Print tree upside down (biggest highest)"),
-    #[arg(
+        )
-        short('v'),
+        .arg(
-        long,
+            Arg::new("no_colors")
-        value_name("REGEX"),
+                .short('c')
-        conflicts_with("filter"),
+                .long("no-colors")
-        conflicts_with("file_types")
+                .action(clap::ArgAction::SetTrue)
-    )]
+                .help("No colors will be printed (Useful for commands like: watch)"),
-    pub invert_filter: Option<Vec<String>>,
+        )
-
+        .arg(
-    /// Only include filepaths matching this regex. For png files type: -e
+            Arg::new("force_colors")
-    /// "\.png$"
+                .short('C')
-    #[arg(short('e'), long, value_name("REGEX"), conflicts_with("file_types"))]
+                .long("force-colors")
-    pub filter: Option<Vec<String>>,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Force colors print"),
-    /// show only these file types
+        )
-    #[arg(short('t'), long, conflicts_with("depth"), conflicts_with("only_dir"))]
+        .arg(
-    pub file_types: bool,
+            Arg::new("no_bars")
-
+                .short('b')
-    /// Specify width of output overriding the auto detection of terminal width
+                .long("no-percent-bars")
-    #[arg(short('w'), long, value_name("WIDTH"))]
+                .action(clap::ArgAction::SetTrue)
-    pub terminal_width: Option<usize>,
+                .help("No percent bars or percentages will be displayed"),
-
+        )
-    /// Disable the progress indication.
+        .arg(
-    #[arg(short('P'), long)]
+            Arg::new("bars_on_right")
-    pub no_progress: bool,
+                .short('B')
-
+                .long("bars-on-right")
-    /// Print path with errors.
+                .action(clap::ArgAction::SetTrue)
-    #[arg(long)]
+                .help("percent bars moved to right side of screen"),
-    pub print_errors: bool,
+        )
-
+        .arg(
-    /// Only directories will be displayed.
+            Arg::new("min_size")
-    #[arg(
+                .short('z')
-        short('D'),
+                .long("min-size")
-        long,
+                .value_name("MIN_SIZE")
-        conflicts_with("only_file"),
+                .num_args(1)
-        conflicts_with("file_types")
+                .help("Minimum size file to include in output"),
-    )]
+        )
-    pub only_dir: bool,
+        .arg(
-
+            Arg::new("screen_reader")
-    /// Only files will be displayed. (Finds your largest files)
+                .short('R')
-    #[arg(short('F'), long, conflicts_with("only_dir"))]
+                .long("screen-reader")
-    pub only_file: bool,
+                .action(clap::ArgAction::SetTrue)
-
+                .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
+        )
-    /// m g t kb mb gb tb will print the whole tree in that size.
+        .arg(
-    #[arg(short, long, value_enum, value_name("FORMAT"), ignore_case(true))]
+            Arg::new("skip_total")
-    pub output_format: Option<OutputFormat>,
+                .long("skip-total")
-
+                .action(clap::ArgAction::SetTrue)
-    /// Specify memory to use as stack size - use if you see: 'fatal runtime
+                .help("No total row will be displayed"),
-    /// error: stack overflow' (default low memory=1048576, high
+        )
-    /// memory=1073741824)
+        .arg(
-    #[arg(short('S'), long)]
+            Arg::new("by_filecount")
-    pub stack_size: Option<usize>,
+                .short('f')
-
+                .long("filecount")
-    /// Input files or directories.
+                .action(clap::ArgAction::SetTrue)
-    #[arg(value_name("PATH"), value_hint(ValueHint::AnyPath))]
+                .help("Directory 'size' is number of child files instead of disk size"),
-    pub params: Option<Vec<String>>,
+        )
-
+        .arg(
-    /// Output the directory tree as json to the current directory
+            Arg::new("ignore_hidden")
-    #[arg(short('j'), long)]
+                .short('i') // Do not use 'h' this is used by 'help'
-    pub output_json: bool,
+                .long("ignore_hidden")
-
+                .action(clap::ArgAction::SetTrue)
-    /// +/-n matches files modified more/less than n days ago , and n matches
+                .help("Do not display hidden files"),
-    /// 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(short('M'), long, allow_hyphen_values(true))]
+            Arg::new("invert_filter")
-    pub mtime: Option<String>,
+                .short('v')
-
+                .long("invert-filter")
-    /// just like -mtime, but based on file access time
+                .value_name("REGEX")
-    #[arg(short('A'), long, allow_hyphen_values(true))]
+                .action(clap::ArgAction::Append)
-    pub atime: Option<String>,
+                .conflicts_with("filter")
-
+                .conflicts_with("types")
-    /// just like -mtime, but based on file change time
+                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
-    #[arg(short('y'), long, allow_hyphen_values(true))]
+        )
-    pub ctime: Option<String>,
+        .arg(
-
+            Arg::new("filter")
-    /// Read NUL-terminated paths from FILE (use `-` for stdin).
+                .short('e')
-    #[arg(long, value_hint(ValueHint::AnyPath), conflicts_with("files_from"))]
+                .long("filter")
-    pub files0_from: Option<String>,
+                .value_name("REGEX")
-
+                .action(clap::ArgAction::Append)
-    /// Read newline-terminated paths from FILE (use `-` for stdin).
+                .conflicts_with("types")
-    #[arg(long, value_hint(ValueHint::AnyPath), conflicts_with("files0_from"))]
+                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
-    pub files_from: Option<String>,
+        )
-
+        .arg(
-    /// Keep these directories collapsed
+            Arg::new("types")
-    #[arg(long, value_hint(ValueHint::AnyPath))]
+                .short('t')
-    pub collapse: Option<Vec<String>>,
+                .long("file_types")
-
+                .conflicts_with("depth")
-    /// Directory 'size' is max filetime of child files instead of disk size.
+                .conflicts_with("only_dir")
-    /// while a/c/m for last accessed/changed/modified time
+                .action(clap::ArgAction::SetTrue)
-    #[arg(short('m'), long, value_enum)]
+                .help("show only these file types"),
-    pub filetime: Option<FileTime>,
+        )
-}
+        .arg(
-
+            Arg::new("width")
-#[derive(Clone, Copy, Debug, ValueEnum)]
+                .short('w')
-#[value(rename_all = "lower")]
+                .long("terminal_width")
-pub enum OutputFormat {
+                .value_name("WIDTH")
-    /// SI prefix (powers of 1000)
+                .value_parser(value_parser!(usize))
-    SI,
+                .num_args(1)
-
+                .help("Specify width of output overriding the auto detection of terminal width"),
-    /// byte (B)
+        )
-    B,
+        .arg(
-
+            Arg::new("disable_progress")
-    /// kibibyte (KiB)
+                .short('P')
-    #[value(name = "k", alias("kib"))]
+                .long("no-progress")
-    KiB,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Disable the progress indication."),
-    /// mebibyte (MiB)
+        )
-    #[value(name = "m", alias("mib"))]
+        .arg(
-    MiB,
+            Arg::new("print_errors")
-
+                .long("print-errors")
-    /// gibibyte (GiB)
+                .action(clap::ArgAction::SetTrue)
-    #[value(name = "g", alias("gib"))]
+                .help("Print path with errors."),
-    GiB,
+        )
-
+        .arg(
-    /// tebibyte (TiB)
+            Arg::new("only_dir")
-    #[value(name = "t", alias("tib"))]
+                .short('D')
-    TiB,
+                .long("only-dir")
-
+                .conflicts_with("only_file")
-    /// kilobyte (kB)
+                .conflicts_with("types")
-    KB,
+                .action(clap::ArgAction::SetTrue)
-
+                .help("Only directories will be displayed."),
-    /// megabyte (MB)
+        )
-    MB,
+        .arg(
-
+            Arg::new("only_file")
-    /// gigabyte (GB)
+                .short('F')
-    GB,
+                .long("only-file")
-
+                .conflicts_with("only_dir")
-    /// terabyte (TB)
+                .action(clap::ArgAction::SetTrue)
-    TB,
+                .help("Only files will be displayed. (Finds your largest files)"),
-}
+        )
-
+        .arg(
-impl fmt::Display for OutputFormat {
+            Arg::new("output_format")
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                .short('o')
-        match self {
+                .long("output-format")
-            Self::SI => write!(f, "si"),
+                .value_name("FORMAT")
-            Self::B => write!(f, "b"),
+                .value_parser([
-            Self::KiB => write!(f, "k"),
+                    PossibleValue::new("si"),
-            Self::MiB => write!(f, "m"),
+                    PossibleValue::new("b"),
-            Self::GiB => write!(f, "g"),
+                    PossibleValue::new("k").alias("kib"),
-            Self::TiB => write!(f, "t"),
+                    PossibleValue::new("m").alias("mib"),
-            Self::KB => write!(f, "kb"),
+                    PossibleValue::new("g").alias("gib"),
-            Self::MB => write!(f, "mb"),
+                    PossibleValue::new("t").alias("tib"),
-            Self::GB => write!(f, "gb"),
+                    PossibleValue::new("kb"),
-            Self::TB => write!(f, "tb"),
+                    PossibleValue::new("mb"),
-        }
+                    PossibleValue::new("gb"),
-    }
+                    PossibleValue::new("tb"),
-}
+                ])
-
+                .ignore_case(true)
-#[derive(Clone, Copy, Debug, ValueEnum)]
+                .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.")
-pub enum FileTime {
+        )
-    /// last accessed time
+        .arg(
-    #[value(name = "a", alias("accessed"))]
+            Arg::new("stack_size")
-    Accessed,
+                .short('S')
-
+                .long("stack-size")
-    /// last changed time
+                .value_name("STACK_SIZE")
-    #[value(name = "c", alias("changed"))]
+                .value_parser(value_parser!(usize))
-    Changed,
+                .num_args(1)
-
+                .help("Specify memory to use as stack size - use if you see: 'fatal runtime error: stack overflow' (default low memory=1048576, high memory=1073741824)"),
-    /// last modified time
+        )
-    #[value(name = "m", alias("modified"))]
+        .arg(
-    Modified,
+            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"),
        )
 }
@@ -1,12 +1,13 @@
 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;
@@ -36,81 +37,82 @@ pub struct Config {
    pub output_json: Option<bool>,
    pub print_errors: Option<bool>,
    pub files0_from: Option<String>,
    pub number_of_lines: Option<usize>,
    pub files_from: Option<String>,
 }
 impl Config {
-    pub fn get_files0_from(&self, options: &Cli) -> Option<String> {
+    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
-        let from_file = &options.files0_from;
+        let from_file = options.get_one::<String>("files0_from");
        match from_file {
            None => self.files0_from.as_ref().map(|x| x.to_string()),
            Some(x) => Some(x.to_string()),
        }
    }
-
+    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
-    pub fn get_files_from(&self, options: &Cli) -> Option<String> {
+        Some(true) == self.no_colors || options.get_flag("no_colors")
        let from_file = &options.files_from;
        match from_file {
            None => self.files_from.as_ref().map(|x| x.to_string()),
            Some(x) => Some(x.to_string()),
        }
    }
-    pub fn get_no_colors(&self, options: &Cli) -> bool {
+    pub fn get_force_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_colors || options.no_colors
+        Some(true) == self.force_colors || options.get_flag("force_colors")
    }
-    pub fn get_force_colors(&self, options: &Cli) -> bool {
+    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.force_colors || options.force_colors
+        Some(true) == self.disable_progress
            || options.get_flag("disable_progress")
            || !std::io::stdout().is_terminal()
    }
-    pub fn get_disable_progress(&self, options: &Cli) -> bool {
+    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.disable_progress || options.no_progress
+        Some(true) == self.display_apparent_size || options.get_flag("display_apparent_size")
    }
-    pub fn get_apparent_size(&self, options: &Cli) -> bool {
+    pub fn get_ignore_hidden(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_apparent_size || options.apparent_size
+        Some(true) == self.ignore_hidden || options.get_flag("ignore_hidden")
    }
-    pub fn get_ignore_hidden(&self, options: &Cli) -> bool {
+    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.ignore_hidden || options.ignore_hidden
+        Some(true) == self.display_full_paths || options.get_flag("display_full_paths")
    }
-    pub fn get_full_paths(&self, options: &Cli) -> bool {
+    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_full_paths || options.full_paths
+        Some(true) == self.reverse || options.get_flag("reverse")
    }
-    pub fn get_reverse(&self, options: &Cli) -> bool {
+    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.reverse || options.reverse
+        Some(true) == self.no_bars || options.get_flag("no_bars")
    }
-    pub fn get_no_bars(&self, options: &Cli) -> bool {
+    pub fn get_output_format(&self, options: &ArgMatches) -> String {
-        Some(true) == self.no_bars || options.no_percent_bars
+        let out_fmt = options.get_one::<String>("output_format");
    }
    pub fn get_output_format(&self, options: &Cli) -> String {
        let out_fmt = options.output_format;
        (match out_fmt {
            None => match &self.output_format {
                None => "".to_string(),
                Some(x) => x.to_string(),
            },
-            Some(x) => x.to_string(),
+            Some(x) => x.into(),
        })
        .to_lowercase()
    }
-    pub fn get_filetime(&self, options: &Cli) -> Option<FileTime> {
+    pub fn get_filetime(&self, options: &ArgMatches) -> Option<FileTime> {
-        options.filetime.map(FileTime::from)
+        let out_fmt = options.get_one::<String>("filetime");
        match out_fmt {
            None => None,
            Some(x) => match x.as_str() {
                "m" | "modified" => Some(FileTime::Modified),
                "a" | "accessed" => Some(FileTime::Accessed),
                "c" | "changed" => Some(FileTime::Changed),
                _ => unreachable!(),
            },
        }
    }
-    pub fn get_skip_total(&self, options: &Cli) -> bool {
+    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.skip_total || options.skip_total
+        Some(true) == self.skip_total || options.get_flag("skip_total")
    }
-    pub fn get_screen_reader(&self, options: &Cli) -> bool {
+    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.screen_reader || options.screen_reader
+        Some(true) == self.screen_reader || options.get_flag("screen_reader")
    }
-    pub fn get_depth(&self, options: &Cli) -> usize {
+    pub fn get_depth(&self, options: &ArgMatches) -> usize {
-        if let Some(v) = options.depth {
+        if let Some(v) = options.get_one::<usize>("depth") {
-            return v;
+            return *v;
        }
        self.depth.unwrap_or(usize::MAX)
    }
-    pub fn get_min_size(&self, options: &Cli) -> Option<usize> {
+    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
-        let size_from_param = options.min_size.as_ref();
+        let size_from_param = options.get_one::<String>("min_size");
        self._get_min_size(size_from_param)
    }
    fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
@@ -124,58 +126,58 @@ impl Config {
            size_from_param
        }
    }
-    pub fn get_only_dir(&self, options: &Cli) -> bool {
+    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_dir || options.only_dir
+        Some(true) == self.only_dir || options.get_flag("only_dir")
    }
-    pub fn get_print_errors(&self, options: &Cli) -> bool {
+    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.print_errors || options.print_errors
+        Some(true) == self.print_errors || options.get_flag("print_errors")
    }
-    pub fn get_only_file(&self, options: &Cli) -> bool {
+    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.only_file || options.only_file
+        Some(true) == self.only_file || options.get_flag("only_file")
    }
-    pub fn get_bars_on_right(&self, options: &Cli) -> bool {
+    pub fn get_bars_on_right(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.bars_on_right || options.bars_on_right
+        Some(true) == self.bars_on_right || options.get_flag("bars_on_right")
    }
-    pub fn get_custom_stack_size(&self, options: &Cli) -> Option<usize> {
+    pub fn get_custom_stack_size(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.stack_size;
+        let from_cmd_line = options.get_one::<usize>("stack_size");
        if from_cmd_line.is_none() {
            self.stack_size
        } else {
-            from_cmd_line
+            from_cmd_line.copied()
        }
    }
-    pub fn get_threads(&self, options: &Cli) -> Option<usize> {
+    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
-        let from_cmd_line = options.threads;
+        let from_cmd_line = options.get_one::<usize>("threads");
        if from_cmd_line.is_none() {
            self.threads
        } else {
-            from_cmd_line
+            from_cmd_line.copied()
        }
    }
-    pub fn get_output_json(&self, options: &Cli) -> bool {
+    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.output_json || options.output_json
+        Some(true) == self.output_json || options.get_flag("output_json")
    }
-    pub fn get_number_of_lines(&self, options: &Cli) -> Option<usize> {
+    pub fn get_modified_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        let from_cmd_line = options.number_of_lines;
+        get_filter_time_operator(
-        if from_cmd_line.is_none() {
+            options.get_one::<String>("mtime"),
-            self.number_of_lines
+            get_current_date_epoch_seconds(),
-        } else {
+        )
            from_cmd_line
        }
    }
-    pub fn get_modified_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+    pub fn get_accessed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(options.mtime.as_ref(), get_current_date_epoch_seconds())
+        get_filter_time_operator(
            options.get_one::<String>("atime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_accessed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+    pub fn get_changed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
-        get_filter_time_operator(options.atime.as_ref(), get_current_date_epoch_seconds())
+        get_filter_time_operator(
-    }
+            options.get_one::<String>("ctime"),
-
+            get_current_date_epoch_seconds(),
-    pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
+        )
        get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
    }
 }
@@ -251,10 +253,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,
@@ -269,10 +271,10 @@ pub fn get_config(conf_path: Option<&String>) -> Config {
        None => {
            if let Some(home) = directories::BaseDirs::new() {
                for path in get_config_locations(home.home_dir()) {
-                    if path.exists()
+                    if path.exists() {
-                        && let Ok(config) = Config::from_config_file(&path)
+                        if let Ok(config) = Config::from_config_file(&path) {
-                    {
+                            return config;
-                        return config;
+                        }
                    }
                }
            }
@@ -288,7 +290,8 @@ mod tests {
    #[allow(unused_imports)]
    use super::*;
    use chrono::{Datelike, Timelike};
-    use clap::Parser;
+    use clap::builder::PossibleValue;
    use clap::{value_parser, Arg, ArgMatches, Command};
    #[test]
    fn test_get_current_date_epoch_seconds() {
@@ -357,8 +360,15 @@ mod tests {
        assert_eq!(c.get_depth(&args), 5);
    }
-    fn get_args(args: Vec<&str>) -> Cli {
+    fn get_args(args: Vec<&str>) -> ArgMatches {
-        Cli::parse_from(args)
+        Command::new("Dust")
            .arg(
                Arg::new("depth")
                    .long("depth")
                    .num_args(1)
                    .value_parser(value_parser!(usize)),
            )
            .get_matches_from(args)
    }
    #[test]
@@ -396,36 +406,20 @@ mod tests {
        assert_eq!(c.get_filetime(&args), Some(FileTime::Changed));
    }
-    fn get_filetime_args(args: Vec<&str>) -> Cli {
+    fn get_filetime_args(args: Vec<&str>) -> ArgMatches {
-        Cli::parse_from(args)
+        Command::new("Dust")
-    }
+        .arg(
-
+            Arg::new("filetime")
-    #[test]
+                .short('m')
-    fn test_get_number_of_lines() {
+                .long("filetime")
-        // No config and no flag.
+                .num_args(1)
-        let c = Config::default();
+                .value_parser([
-        let args = get_args(vec![]);
+                    PossibleValue::new("a").alias("accessed"),
-        assert_eq!(c.get_number_of_lines(&args), None);
+                    PossibleValue::new("c").alias("changed"),
-
+                    PossibleValue::new("m").alias("modified"),
-        // Config is not defined and flag is defined.
+                ])
-        let c = Config::default();
+                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for accessed/changed/modified time"),
-        let args = get_args(vec!["dust", "--number-of-lines", "5"]);
+        )
-        assert_eq!(c.get_number_of_lines(&args), Some(5));
+            .get_matches_from(args)
        // Config is defined and flag is not defined.
        let c = Config {
            number_of_lines: Some(3),
            ..Default::default()
        };
        let args = get_args(vec![]);
        assert_eq!(c.get_number_of_lines(&args), Some(3));
        // Both config and flag are defined.
        let c = Config {
            number_of_lines: Some(3),
            ..Default::default()
        };
        let args = get_args(vec!["dust", "--number-of-lines", "5"]);
        assert_eq!(c.get_number_of_lines(&args), Some(5));
    }
 }
@@ -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;
@@ -69,11 +69,12 @@ pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: &WalkData) -> Vec<Node> {
 // Remove files which have the same inode, we don't want to double count them.
 fn clean_inodes(x: Node, inodes: &mut HashSet<(u64, u64)>, walk_data: &WalkData) -> Option<Node> {
-    if !walk_data.use_apparent_size
+    if !walk_data.use_apparent_size {
-        && let Some(id) = x.inode_device
+        if let Some(id) = x.inode_device {
-        && !inodes.insert(id)
+            if !inodes.insert(id) {
-    {
+                return None;
-        return None;
+            }
        }
    }
    // Sort Nodes so iteration order is predictable
@@ -124,41 +125,17 @@ 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() {
        let size_inode_device = get_metadata(entry.path(), false, follow_links);
-        if let Some((_size, Some((_id, dev)), _gunk)) = size_inode_device
+        if let Some((_size, Some((_id, dev)), _gunk)) = size_inode_device {
-            && !walk_data.allowed_filesystems.contains(&dev)
+            if !walk_data.allowed_filesystems.contains(&dev) {
-        {
+                return true;
-            return true;
+            }
        }
    }
    if walk_data.filter_accessed_time.is_some()
@@ -166,19 +143,20 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
        || walk_data.filter_changed_time.is_some()
    {
        let size_inode_device = get_metadata(entry.path(), false, follow_links);
-        if let Some((_, _, (modified_time, accessed_time, changed_time))) = size_inode_device
+        if let Some((_, _, (modified_time, accessed_time, changed_time))) = size_inode_device {
-            && entry.path().is_file()
+            if entry.path().is_file()
-            && [
+                && [
-                (&walk_data.filter_modified_time, modified_time),
+                    (&walk_data.filter_modified_time, modified_time),
-                (&walk_data.filter_accessed_time, accessed_time),
+                    (&walk_data.filter_accessed_time, accessed_time),
-                (&walk_data.filter_changed_time, changed_time),
+                    (&walk_data.filter_changed_time, changed_time),
-            ]
+                ]
-            .iter()
+                .iter()
-            .any(|(filter_time, actual_time)| {
+                .any(|(filter_time, actual_time)| {
-                is_filtered_out_due_to_file_time(filter_time, *actual_time)
+                    is_filtered_out_due_to_file_time(filter_time, *actual_time)
-            })
+                })
-        {
+            {
-            return true;
+                return true;
            }
        }
    }
@@ -197,13 +175,17 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
        return true;
    }
-    is_dot_file && walk_data.ignore_hidden
+    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
 }
 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 {
@@ -220,30 +202,32 @@ fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
                                // return walk(entry.path(), walk_data, depth)
-                                if !ignore_file(entry, walk_data)
+                                if !ignore_file(entry, walk_data) {
-                                    && let Ok(data) = entry.file_type()
+                                    if let Ok(data) = entry.file_type() {
-                                {
+                                        if data.is_dir()
-                                    if data.is_dir()
+                                            || (walk_data.follow_links && data.is_symlink())
-                                        || (walk_data.follow_links && data.is_symlink())
+                                        {
-                                    {
+                                            return walk(entry.path(), walk_data, depth + 1);
-                                        return walk(entry.path(), walk_data, depth + 1);
+                                        }
                                        let node = build_node(
                                            entry.path(),
                                            vec![],
                                            data.is_symlink(),
                                            data.is_file(),
                                            depth,
                                            walk_data,
                                        );
                                        prog_data.num_files.fetch_add(1, ORDERING);
                                        if let Some(ref file) = node {
                                            prog_data
                                                .total_file_size
                                                .fetch_add(file.size, ORDERING);
                                        }
                                        return node;
                                    }
                                    let node = build_node(
                                        entry.path(),
                                        vec![],
                                        data.is_symlink(),
                                        data.is_file(),
                                        depth,
                                        walk_data,
                                    );
                                    prog_data.num_files.fetch_add(1, ORDERING);
                                    if let Some(ref file) = node {
                                        prog_data.total_file_size.fetch_add(file.size, ORDERING);
                                    }
                                    return node;
                                }
                            }
                            Err(ref failed) => {
@@ -300,10 +284,9 @@ fn handle_error_and_retry(failed: &Error, dir: &Path, walk_data: &WalkData) -> b
            editable_error.file_not_found.insert(failed.to_string());
        }
        std::io::ErrorKind::Interrupted => {
            let mut editable_error = walk_data.errors.lock().unwrap();
            editable_error.interrupted_error += 1;
-            // This does happen on some systems. It was set to 3 but sometimes dust runs would exceed this
+            if editable_error.interrupted_error > 3 {
            // However, if there is no limit this results in infinite retrys and dust never finishes
            if editable_error.interrupted_error > 999 {
                panic!("Multiple Interrupted Errors occurred while scanning filesystem. Aborting");
            } else {
                return true;
@@ -12,7 +12,7 @@ use chrono::{DateTime, Local, TimeZone, Utc};
 use std::cmp::max;
 use std::cmp::min;
 use std::fs;
-use std::iter::repeat_n;
+use std::iter::repeat;
 use std::path::Path;
 use thousands::Separable;
@@ -71,7 +71,11 @@ impl DisplayData {
    fn percent_size(&self, node: &DisplayNode) -> f32 {
        let result = node.size as f32 / self.base_size as f32;
-        if result.is_normal() { result } else { 0.0 }
+        if result.is_normal() {
            result
        } else {
            0.0
        }
    }
 }
@@ -125,9 +129,9 @@ impl DrawData<'_> {
 pub fn draw_it(
    idd: InitialDisplayData,
    root_node: &DisplayNode,
    no_percent_bars: bool,
    terminal_width: usize,
    root_node: &DisplayNode,
    skip_total: bool,
 ) {
    let num_chars_needed_on_left_most = if idd.by_filecount {
@@ -155,7 +159,7 @@ pub fn draw_it(
        allowed_width - longest_string_length - 7
    };
-    let first_size_bar = repeat_n(BLOCKS[0], max_bar_length).collect();
+    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
    let display_data = DisplayData {
        initial: idd,
@@ -298,9 +302,12 @@ fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &Display
    );
    // Add spaces after the filename so we can draw the % used bar chart.
-    name + " "
+    let name_and_padding = name
-        .repeat(display_data.longest_string_length - width)
+        + " "
-        .as_str()
+            .repeat(display_data.longest_string_length - width)
            .as_str();
    name_and_padding
 }
 fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
@@ -591,7 +598,7 @@ mod tests {
            size: 2_u64.pow(size),
            children: vec![],
        };
-        let first_size_bar = repeat_n(BLOCKS[0], 13).collect();
+        let first_size_bar = repeat(BLOCKS[0]).take(13).collect();
        let dd = DrawData {
            indent: "".into(),
            percent_bar: first_size_bar,
@@ -25,14 +25,16 @@ pub fn get_biggest(
    display_data: AggregateData,
    by_filetime: &Option<FileTime>,
    keep_collapsed: HashSet<PathBuf>,
-) -> DisplayNode {
+) -> Option<DisplayNode> {
    if top_level_nodes.is_empty() {
        // perhaps change this, bring back Error object?
        return None;
    }
    let mut heap = BinaryHeap::new();
    let number_top_level_nodes = top_level_nodes.len();
    let root;
-    if number_top_level_nodes == 0 {
+    if number_top_level_nodes > 1 {
        root = total_node_builder(0, vec![])
    } else if number_top_level_nodes > 1 {
        let size = if by_filetime.is_some() {
            top_level_nodes
                .iter()
@@ -44,24 +46,28 @@ pub fn get_biggest(
        };
        let nodes = handle_duplicate_top_level_names(top_level_nodes, display_data.short_paths);
-        root = total_node_builder(size, nodes);
+
        root = Node {
            name: PathBuf::from("(total)"),
            size,
            children: nodes,
            inode_device: None,
            depth: 0,
        };
        // Always include the base nodes if we add a 'parent' (total) node
        heap = always_add_children(&display_data, &root, heap);
    } else {
        root = top_level_nodes.into_iter().next().unwrap();
        heap = add_children(&display_data, &root, heap);
    }
-    fill_remaining_lines(heap, &root, display_data, keep_collapsed)
+    Some(fill_remaining_lines(
-}
+        heap,
-
+        &root,
-fn total_node_builder(size: u64, children: Vec<Node>) -> Node {
+        display_data,
-    Node {
+        keep_collapsed,
-        name: PathBuf::from("(total)"),
+    ))
        size,
        children,
        inode_device: None,
        depth: 0,
    }
 }
 pub fn fill_remaining_lines<'a>(
@@ -15,7 +15,7 @@ pub fn get_all_file_types(
    top_level_nodes: &[Node],
    n: usize,
    by_filetime: &Option<FileTime>,
-) -> DisplayNode {
+) -> Option<DisplayNode> {
    let ext_nodes = {
        let mut extension_cumulative_sizes = HashMap::new();
        build_by_all_file_types(top_level_nodes, &mut extension_cumulative_sizes);
@@ -67,11 +67,13 @@ pub fn get_all_file_types(
        displayed.iter().map(|node| node.size).sum()
    };
-    DisplayNode {
+    let result = DisplayNode {
        name: PathBuf::from("(total)"),
        size: actual_size,
        children: displayed,
-    }
+    };
    Some(result)
 }
 fn build_by_all_file_types<'a>(
@@ -10,11 +10,9 @@ mod platform;
 mod progress;
 mod utils;
-use crate::cli::Cli;
+use crate::cli::build_cli;
 use crate::config::Config;
 use crate::display_node::DisplayNode;
 use crate::progress::RuntimeErrors;
-use clap::Parser;
+use clap::parser::ValuesRef;
 use dir_walker::WalkData;
 use display::InitialDisplayData;
 use filter::AggregateData;
@@ -22,15 +20,15 @@ use progress::PIndicator;
 use regex::Error;
 use std::collections::HashSet;
 use std::env;
-use std::fs::{read, read_to_string};
+use std::fs::read_to_string;
 use std::io;
 use std::io::Read;
 use std::panic;
 use std::process;
 use std::sync::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;
@@ -41,7 +39,7 @@ use filter_type::get_all_file_types;
 use regex::Regex;
 use std::cmp::max;
 use std::path::PathBuf;
-use terminal_size::{Height, Width, terminal_size};
+use terminal_size::{terminal_size, Height, Width};
 use utils::get_filesystem_devices;
 use utils::simplify_dir_names;
@@ -101,10 +99,9 @@ fn get_width_of_terminal() -> usize {
        .unwrap_or(DEFAULT_TERMINAL_WIDTH)
 }
-fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
+fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
    maybe_value
-        .unwrap_or(&Vec::new())
+        .unwrap_or_default()
        .iter()
        .map(|reg| {
            Regex::new(reg).unwrap_or_else(|err| {
                eprintln!("Ignoring bad value for regex {err:?}");
@@ -115,37 +112,64 @@ fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
 }
 fn main() {
-    let options = Cli::parse();
+    let options = build_cli().get_matches();
-    let config = get_config(options.config.as_ref());
+    let config = get_config(options.get_one::<String>("config").cloned());
    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");
-        process::exit(1);
+        if cloned_is_in_listing.load(Ordering::Relaxed) {
            process::exit(1);
        }
    })
    .expect("Error setting Ctrl-C handler");
-    let target_dirs = if let Some(path) = config.get_files0_from(&options) {
+    is_in_listing.store(true, Ordering::Relaxed);
-        read_paths_from_source(&path, true)
+    let target_dirs = match config.get_files_from(&options) {
-    } else if let Some(path) = config.get_files_from(&options) {
+        Some(path) => {
-        read_paths_from_source(&path, false)
+            if path == "-" {
-    } else {
+                let mut targets_to_add = io::stdin()
-        match options.params {
+                    .lines()
-            Some(ref values) => values.clone(),
+                    .map_while(Result::ok)
-            None => vec![".".to_owned()],
+                    .collect::<Vec<String>>();
                if targets_to_add.is_empty() {
                    eprintln!("No input provided, defaulting to current directory");
                    targets_to_add.push(".".to_owned());
                }
                targets_to_add
            } else {
                // read file
                match read_to_string(path) {
                    Ok(file_content) => file_content.lines().map(|x| x.to_string()).collect(),
                    Err(e) => {
                        eprintln!("Error reading file: {e}");
                        vec![".".to_owned()]
                    }
                }
            }
        }
        None => match options.get_many::<String>("params") {
            Some(values) => values.cloned().collect(),
            None => vec![".".to_owned()],
        },
    };
    is_in_listing.store(false, Ordering::Relaxed);
-    let summarize_file_types = options.file_types;
+    let summarize_file_types = options.get_flag("types");
-    let filter_regexs = get_regex_value(options.filter.as_ref());
+    let filter_regexs = get_regex_value(options.get_many("filter"));
-    let invert_filter_regexs = get_regex_value(options.invert_filter.as_ref());
+    let invert_filter_regexs = get_regex_value(options.get_many("invert_filter"));
-    let terminal_width: usize = match options.terminal_width {
+    let terminal_width: usize = match options.get_one::<usize>("width") {
-        Some(val) => val,
+        Some(&val) => val,
        None => get_width_of_terminal(),
    };
@@ -154,8 +178,8 @@ fn main() {
    // If depth is set, then we set the default number_of_lines to be max
    // instead of screen height
-    let number_of_lines = match config.get_number_of_lines(&options) {
+    let number_of_lines = match options.get_one::<usize>("number_of_lines") {
-        Some(val) => val,
+        Some(&val) => val,
        None => {
            if depth != usize::MAX {
                usize::MAX
@@ -170,17 +194,16 @@ fn main() {
        config.get_force_colors(&options),
    );
-    let ignore_directories = match options.ignore_directory {
+    let ignore_directories = match options.get_many::<String>("ignore_directory") {
-        Some(ref values) => values
+        Some(values) => values
-            .iter()
+            .map(|v| v.as_str())
            .map(PathBuf::from)
            .map(canonicalize_absolute_path)
            .collect::<Vec<PathBuf>>(),
        None => vec![],
    };
-    let ignore_from_file_result = match options.ignore_all_in_file {
+    let ignore_from_file_result = match options.get_one::<String>("ignore_all_in_file") {
-        Some(ref val) => read_to_string(val)
+        Some(val) => read_to_string(val)
            .unwrap()
            .lines()
            .map(Regex::new)
@@ -197,17 +220,14 @@ fn main() {
        .chain(ignore_from_file)
        .collect::<Vec<Regex>>();
-    let by_filecount = options.filecount;
+    let by_filecount = options.get_flag("by_filecount");
    let by_filetime = config.get_filetime(&options);
-    let limit_filesystem = options.limit_filesystem;
+    let limit_filesystem = options.get_flag("limit_filesystem");
-    let follow_links = options.dereference_links;
+    let follow_links = options.get_flag("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
@@ -224,8 +244,8 @@ fn main() {
        indicator.spawn(output_format.clone())
    }
-    let keep_collapsed: HashSet<PathBuf> = match options.collapse {
+    let keep_collapsed: HashSet<PathBuf> = match options.get_many::<String>("collapse") {
-        Some(ref collapse) => {
+        Some(collapse) => {
            let mut combined_dirs = HashSet::new();
            for collapse_dir in collapse {
                for target_dir in target_dirs.iter() {
@@ -257,94 +277,36 @@ fn main() {
        progress_data: indicator.data.clone(),
        errors: errors_for_rayon,
    };
    let threads_to_use = config.get_threads(&options);
    let stack_size = config.get_custom_stack_size(&options);
    init_rayon(&stack_size, &threads_to_use);
-    init_rayon(&stack_size, &threads_to_use).install(|| {
+    let top_level_nodes = walk_it(simplified_dirs, &walk_data);
        let top_level_nodes = walk_it(simplified_dirs, &walk_data);
-        let tree = match summarize_file_types {
+    let tree = match summarize_file_types {
-            true => get_all_file_types(&top_level_nodes, number_of_lines, walk_data.by_filetime),
+        true => get_all_file_types(&top_level_nodes, number_of_lines, &by_filetime),
-            false => {
+        false => {
-                let agg_data = AggregateData {
+            let agg_data = AggregateData {
-                    min_size: config.get_min_size(&options),
+                min_size: config.get_min_size(&options),
-                    only_dir: config.get_only_dir(&options),
+                only_dir: config.get_only_dir(&options),
-                    only_file: config.get_only_file(&options),
+                only_file: config.get_only_file(&options),
-                    number_of_lines,
+                number_of_lines,
-                    depth,
+                depth,
-                    using_a_filter: !filter_regexs.is_empty() || !invert_filter_regexs.is_empty(),
+                using_a_filter: !filter_regexs.is_empty() || !invert_filter_regexs.is_empty(),
-                    short_paths: !config.get_full_paths(&options),
+                short_paths: !config.get_full_paths(&options),
-                };
+            };
-                get_biggest(
+            get_biggest(top_level_nodes, agg_data, &by_filetime, keep_collapsed)
                    top_level_nodes,
                    agg_data,
                    walk_data.by_filetime,
                    keep_collapsed,
                )
            }
        };
        // Must have stopped indicator before we print to stderr
        indicator.stop();
        let print_errors = config.get_print_errors(&options);
        let final_errors = walk_data.errors.lock().unwrap();
        print_any_errors(print_errors, &final_errors);
        if tree.children.is_empty() && !final_errors.file_not_found.is_empty() {
            std::process::exit(1)
        } else {
            print_output(
                config,
                options,
                tree,
                walk_data.by_filecount,
                is_colors,
                terminal_width,
            )
        }
-    });
+    };
 }
-fn print_output(
+    // Must have stopped indicator before we print to stderr
-    config: Config,
+    indicator.stop();
    options: Cli,
    tree: DisplayNode,
    by_filecount: bool,
    is_colors: bool,
    terminal_width: usize,
 ) {
    let output_format = config.get_output_format(&options);
-    if config.get_output_json(&options) {
+    if errors_final.lock().unwrap().abort {
-        OUTPUT_TYPE.with(|wrapped| {
+        return;
            wrapped.replace(output_format);
        });
        println!("{}", serde_json::to_string(&tree).unwrap());
    } else {
        let idd = InitialDisplayData {
            short_paths: !config.get_full_paths(&options),
            is_reversed: !config.get_reverse(&options),
            colors_on: is_colors,
            by_filecount,
            by_filetime: config.get_filetime(&options),
            is_screen_reader: config.get_screen_reader(&options),
            output_format,
            bars_on_right: config.get_bars_on_right(&options),
        };
        draw_it(
            idd,
            &tree,
            config.get_no_bars(&options),
            terminal_width,
            config.get_skip_total(&options),
        )
    }
 }
-fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
+    let final_errors = walk_data.errors.lock().unwrap();
    if !final_errors.file_not_found.is_empty() {
        let err = final_errors
            .file_not_found
@@ -352,17 +314,17 @@ fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
            .map(|a| a.as_ref())
            .collect::<Vec<&str>>()
            .join(", ");
-        eprintln!("No such file or directory: {err}");
+        eprintln!("No such file or directory: {}", err);
    }
    if !final_errors.no_permissions.is_empty() {
-        if print_errors {
+        if config.get_print_errors(&options) {
            let err = final_errors
                .no_permissions
                .iter()
                .map(|a| a.as_ref())
                .collect::<Vec<&str>>()
                .join(", ");
-            eprintln!("Did not have permissions for directories: {err}");
+            eprintln!("Did not have permissions for directories: {}", err);
        } else {
            eprintln!(
                "Did not have permissions for all directories (add --print-errors to see errors)"
@@ -376,105 +338,76 @@ fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
            .map(|a| a.as_ref())
            .collect::<Vec<&str>>()
            .join(", ");
-        eprintln!("Unknown Error: {err}");
+        eprintln!("Unknown Error: {}", err);
    }
 }
-fn read_paths_from_source(path: &str, null_terminated: bool) -> Vec<String> {
+    if let Some(root_node) = tree {
-    let from_stdin = path == "-";
+        if config.get_output_json(&options) {
-
+            OUTPUT_TYPE.with(|wrapped| {
-    let result: Result<Vec<String>, Option<String>> = (|| {
+                wrapped.replace(output_format);
-        // 1) read bytes
+            });
-        let bytes = if from_stdin {
+            println!("{}", serde_json::to_string(&root_node).unwrap());
            let mut b = Vec::new();
            io::stdin().lock().read_to_end(&mut b).map_err(|_| None)?;
            b
        } else {
-            read(path).map_err(|e| Some(e.to_string()))?
+            let idd = InitialDisplayData {
-        };
+                short_paths: !config.get_full_paths(&options),
                is_reversed: !config.get_reverse(&options),
                colors_on: is_colors,
                by_filecount,
                by_filetime,
                is_screen_reader: config.get_screen_reader(&options),
                output_format,
                bars_on_right: config.get_bars_on_right(&options),
            };
-        let text = std::str::from_utf8(&bytes).map_err(|e| {
+            draw_it(
-            if from_stdin {
+                idd,
-                None
+                config.get_no_bars(&options),
-            } else {
+                terminal_width,
-                Some(e.to_string())
+                &root_node,
-            }
+                config.get_skip_total(&options),
-        })?;
+            )
        let items: Vec<String> = if null_terminated {
            text.split('\0')
                .filter(|s| !s.is_empty())
                .map(str::to_owned)
                .collect()
        } else {
            text.lines().map(str::to_owned).collect()
        };
        if from_stdin && items.is_empty() {
            return Err(None);
        }
        Ok(items)
    })();
    match result {
        Ok(v) => v,
        Err(None) => {
            eprintln!("No files provided, defaulting to current directory");
            vec![".".to_owned()]
        }
        Err(Some(msg)) => {
            eprintln!("Failed to read file: {msg}");
            vec![".".to_owned()]
        }
    }
 }
-fn init_rayon(stack: &Option<usize>, threads: &Option<usize>) -> rayon::ThreadPool {
+fn init_rayon(stack_size: &Option<usize>, threads: &Option<usize>) {
-    let stack_size = match stack {
+    // Rayon seems to raise this error on 32-bit builds
-        Some(s) => Some(*s),
+    // The global thread pool has not been initialized.: ThreadPoolBuildError { kind: GlobalPoolAlreadyInitialized }
-        None => {
+    if cfg!(target_pointer_width = "64") {
-            // Do not increase the stack size on a 32 bit system, it will fail
+        let result = panic::catch_unwind(|| build_thread_pool(*stack_size, *threads));
-            if cfg!(target_pointer_width = "32") {
+        if result.is_err() {
-                None
+            eprintln!("Problem initializing rayon, try: export RAYON_NUM_THREADS=1")
            } else {
                let large_stack = usize::pow(1024, 3);
                let mut s = System::new();
                s.refresh_memory();
                // Larger stack size if possible to handle cases with lots of nested directories
                let available = s.available_memory();
                if available > (large_stack * threads.unwrap_or(1)).try_into().unwrap() {
                    Some(large_stack)
                } else {
                    None
                }
            }
        }
    };
    match build_thread_pool(stack_size, threads) {
        Ok(pool) => pool,
        Err(err) => {
            eprintln!("Problem initializing rayon, try: export RAYON_NUM_THREADS=1");
            if stack.is_none() && stack_size.is_some() {
                // stack parameter was none, try with default stack size
                if let Ok(pool) = build_thread_pool(None, threads) {
                    eprintln!("WARNING: not using large stack size, got error: {err}");
                    return pool;
                }
            }
            panic!("{err}");
        }
    }
 }
 fn build_thread_pool(
-    stack_size: Option<usize>,
+    stack: Option<usize>,
-    threads: &Option<usize>,
+    threads: Option<usize>,
-) -> Result<rayon::ThreadPool, rayon::ThreadPoolBuildError> {
+) -> Result<(), rayon::ThreadPoolBuildError> {
-    let mut pool_builder = rayon::ThreadPoolBuilder::new();
+    let mut pool = rayon::ThreadPoolBuilder::new();
-    if let Some(stack_size_param) = stack_size {
+
        pool_builder = pool_builder.stack_size(stack_size_param);
    }
    if let Some(thread_count) = threads {
-        pool_builder = pool_builder.num_threads(*thread_count);
+        pool = pool.num_threads(thread_count);
    }
-    pool_builder.build()
+
    let stack_size = match stack {
        Some(s) => Some(s),
        None => {
            let large_stack = usize::pow(1024, 3);
            let mut s = System::new();
            s.refresh_memory();
            // Larger stack size if possible to handle cases with lots of nested directories
            let available = s.available_memory();
            if available > large_stack.try_into().unwrap() {
                Some(large_stack)
            } else {
                None
            }
        }
    };
    if let Some(stack_size_param) = stack_size {
        pool = pool.stack_size(stack_size_param);
    }
    pool.build_global()
 }
@@ -23,16 +23,6 @@ pub enum FileTime {
    Changed,
 }
 impl From<crate::cli::FileTime> for FileTime {
    fn from(time: crate::cli::FileTime) -> Self {
        match time {
            crate::cli::FileTime::Modified => Self::Modified,
            crate::cli::FileTime::Accessed => Self::Accessed,
            crate::cli::FileTime::Changed => Self::Changed,
        }
    }
 }
 #[allow(clippy::too_many_arguments)]
 pub fn build_node(
    dir: PathBuf,
@@ -58,9 +48,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)| {
@@ -71,9 +61,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 {
@@ -27,32 +27,15 @@ pub fn get_metadata<P: AsRef<Path>>(
    };
    match metadata {
        Ok(md) => {
            let file_size = md.len();
            if use_apparent_size {
                Some((
-                    file_size,
+                    md.len(),
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
            } else {
                // On NTFS mounts, the reported block count can be unexpectedly large.
                // To avoid overestimating disk usage, cap the allocated size to what the
                // file should occupy based on the file system I/O block size (blksize).
                // Related: https://github.com/bootandy/dust/issues/295
                let blksize = md.blksize();
                let target_size = file_size.div_ceil(blksize) * blksize;
                let reported_size = md.blocks() * get_block_size();
                // File systems can pre-allocate more space for a file than what would be necessary
                let pre_allocation_buffer = blksize * 65536;
                let max_size = target_size + pre_allocation_buffer;
                let allocated_size = if reported_size > max_size {
                    target_size
                } else {
                    reported_size
                };
                Some((
-                    allocated_size,
+                    md.blocks() * get_block_size(),
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
@@ -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,6 +79,7 @@ pub struct RuntimeErrors {
    pub file_not_found: HashSet<String>,
    pub unknown_error: HashSet<String>,
    pub interrupted_error: i32,
    pub abort: bool,
 }
 /* -------------------------------------------------------------------------- */
@@ -118,7 +119,7 @@ impl PIndicator {
        let time_info_thread = std::thread::spawn(move || {
            let mut progress_char_i: usize = 0;
-            let mut stderr = std::io::stderr();
+            let mut stdout = std::io::stdout();
            let mut msg = "".to_string();
            // While the timeout triggers we go round the loop
@@ -127,8 +128,7 @@ impl PIndicator {
                receiver.recv_timeout(Duration::from_millis(SPINNER_SLEEP_TIME))
            {
                // Clear the text written by 'write!'& Return at the start of line
-                let clear = format!("\r{:width$}", " ", width = msg.len());
+                print!("\r{:width$}", " ", width = msg.len());
                write!(stderr, "{clear}").unwrap();
                let prog_char = PROGRESS_CHARS[progress_char_i];
                msg = match data.state.load(ORDERING) {
@@ -137,17 +137,15 @@ impl PIndicator {
                    _ => panic!("Unknown State"),
                };
-                write!(stderr, "\r{msg}").unwrap();
+                write!(stdout, "\r{msg}").unwrap();
-                stderr.flush().unwrap();
+                stdout.flush().unwrap();
                progress_char_i += 1;
                progress_char_i %= PROGRESS_CHARS_LEN;
            }
-
+            print!("\r{:width$}", " ", width = msg.len());
-            let clear = format!("\r{:width$}", " ", width = msg.len());
+            print!("\r");
-            write!(stderr, "{clear}").unwrap();
+            stdout.flush().unwrap();
            write!(stderr, "\r").unwrap();
            stderr.flush().unwrap();
        });
        self.thread = Some((stop_handler, time_info_thread))
    }
@@ -67,17 +67,6 @@ 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
@@ -1,2 +0,0 @@
 tests/test_dir_files_from/a_file
 tests/test_dir_files_from/hello_file
@@ -1 +0,0 @@
 hello
@@ -10,9 +10,6 @@ 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);
    }
@@ -62,14 +59,6 @@ pub fn test_d_flag_works() {
    assert!(!output.contains("hello_file"));
 }
 #[test]
 pub fn test_d0_works_on_multiple() {
    // We should see the top level directory but not the sub dirs / files:
    let output = build_command(vec!["-d", "0", "tests/test_dir/", "tests/test_dir2"]);
    assert!(output.contains("test_dir "));
    assert!(output.contains("test_dir2"));
 }
 #[test]
 pub fn test_threads_flag_works() {
    let output = build_command(vec!["-T", "1", "tests/test_dir/"]);
@@ -104,60 +93,10 @@ pub fn test_ignore_all_in_file() {
    assert!(!output.contains(".secret"));
 }
 #[test]
 pub fn test_files_from_flag_file() {
    let output = build_command(vec![
        "--files-from",
        "tests/test_dir_files_from/files_from.txt",
    ]);
    assert!(output.contains("a_file"));
    assert!(output.contains("hello_file"));
 }
 #[test]
 pub fn test_files0_from_flag_file() {
    let output = build_command(vec![
        "--files0-from",
        "tests/test_dir_files_from/files0_from.txt",
    ]);
    assert!(output.contains("a_file"));
    assert!(output.contains("hello_file"));
 }
 #[test]
 pub fn test_files_from_flag_stdin() {
    let mut cmd = Command::cargo_bin("dust").unwrap();
    cmd.arg("-P").arg("--files-from").arg("-");
    let input = b"tests/test_dir_files_from/a_file\ntests/test_dir_files_from/hello_file\n";
    cmd.write_stdin(input.as_ref());
    let finished = &cmd.unwrap();
    let stderr = std::str::from_utf8(&finished.stderr).unwrap();
    assert_eq!(stderr, "");
    let output = std::str::from_utf8(&finished.stdout).unwrap();
    assert!(output.contains("a_file"));
    assert!(output.contains("hello_file"));
 }
 #[test]
 pub fn test_files0_from_flag_stdin() {
    let mut cmd = Command::cargo_bin("dust").unwrap();
    cmd.arg("-P").arg("--files0-from").arg("-");
    let input = b"tests/test_dir_files_from/a_file\0tests/test_dir_files_from/hello_file\0";
    cmd.write_stdin(input.as_ref());
    let finished = &cmd.unwrap();
    let stderr = std::str::from_utf8(&finished.stderr).unwrap();
    assert_eq!(stderr, "");
    let output = std::str::from_utf8(&finished.stdout).unwrap();
    assert!(output.contains("a_file"));
    assert!(output.contains("hello_file"));
 }
 #[test]
 pub fn test_with_bad_param() {
    let mut cmd = Command::cargo_bin("dust").unwrap();
-    cmd.arg("-P").arg("bad_place");
+    let result = cmd.arg("bad_place").unwrap();
    let output_error = cmd.unwrap_err();
    let result = output_error.as_output().unwrap();
    let stderr = str::from_utf8(&result.stderr).unwrap();
    assert!(stderr.contains("No such file or directory"));
 }
		`@@ -1,2 +0,0 @@`
			`tests/test_dir_files_from/a_file`
			`tests/test_dir_files_from/hello_file`