version: increment version

feat: Return 1 if no dirs are found
A better error code
2025-12-11 23:30:39 -08:00 · 2025-07-31 22:33:44 +01:00 · 2025-07-31 22:33:44 +01:00 · 2025-07-28 22:35:40 +01:00 · 2025-07-28 22:15:34 +01:00 · 2025-07-06 09:46:33 +01:00
22 changed files with 1053 additions and 855 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,9 +37,9 @@ dependencies = [
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -52,44 +52,44 @@ dependencies = [
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
 "utf8parse",
 ]
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
 "anstyle",
- "once_cell",
+ "once_cell_polyfill",
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "assert_cmd"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
+checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
 dependencies = [
 "anstyle",
 "bstr",
@@ -103,9 +103,9 @@ dependencies = [
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 [[package]]
 name = "bitflags"
@@ -115,15 +115,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 [[package]]
 name = "bstr"
-version = "1.11.3"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
 "memchr",
 "regex-automata",
@@ -132,24 +132,24 @@ dependencies = [
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "cc"
-version = "1.2.12"
+version = "1.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
+checksum = "4ad45f4f74e4e20eaa392913b7b33a7091c87e59628f4dd27888205ad888843c"
 dependencies = [
 "shlex",
 ]
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 [[package]]
 name = "cfg_aliases"
@@ -159,32 +159,33 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 [[package]]
 name = "clap"
-version = "4.5.28"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
 dependencies = [
 "clap_builder",
 "clap_derive",
 ]
 [[package]]
 name = "clap_builder"
-version = "4.5.27"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
 "anstream",
 "anstyle",
@@ -194,24 +195,36 @@ dependencies = [
 [[package]]
 name = "clap_complete"
-version = "4.5.44"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6"
+checksum = "aad5b1b4de04fead402672b48897030eec1f3bfe1550776322f59f6d6e6a5677"
 dependencies = [
 "clap",
 ]
 [[package]]
-name = "clap_lex"
+name = "clap_derive"
-version = "0.7.4"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "clap_lex"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 [[package]]
 name = "clap_mangen"
-version = "0.2.26"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
+checksum = "fc33c849748320656a90832f54a5eeecaa598e92557fb5dedebc3355746d31e4"
 dependencies = [
 "clap",
 "roff",
@@ -219,9 +232,9 @@ dependencies = [
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 [[package]]
 name = "config-file"
@@ -267,9 +280,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 [[package]]
 name = "ctrlc"
-version = "3.4.5"
+version = "3.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
 dependencies = [
 "nix",
 "windows-sys 0.59.0",
@@ -309,7 +322,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 [[package]]
 name = "du-dust"
-version = "1.1.1"
+version = "1.2.3"
 dependencies = [
 "ansi_term",
 "assert_cmd",
@@ -338,18 +351,18 @@ dependencies = [
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 [[package]]
@@ -369,27 +382,33 @@ dependencies = [
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi 0.13.3+wasi-0.2.2",
+ "r-efi",
- "windows-targets 0.52.6",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 [[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"
@@ -398,14 +417,15 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
 "iana-time-zone-haiku",
 "js-sys",
 "log",
 "wasm-bindgen",
 "windows-core",
 ]
@@ -438,9 +458,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 [[package]]
 name = "js-sys"
@@ -454,17 +474,17 @@ dependencies = [
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
 "libc",
 ]
@@ -476,15 +496,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.15"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 [[package]]
 name = "lscolors"
@@ -498,17 +518,17 @@ dependencies = [
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -544,9 +564,15 @@ dependencies = [
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 [[package]]
 name = "once_cell_polyfill"
 version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 [[package]]
 name = "overload"
@@ -556,9 +582,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "portable-atomic"
-version = "1.10.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 [[package]]
 name = "predicates"
@@ -589,22 +615,28 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 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.10.0"
@@ -631,7 +663,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 "libredox",
 "thiserror",
 ]
@@ -687,43 +719,43 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "0.38.44"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
 "errno",
 "libc",
- "linux-raw-sys 0.4.15",
+ "linux-raw-sys 0.9.4",
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "rustversion"
-version = "1.0.19"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 [[package]]
 name = "ryu"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -732,9 +764,9 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
 "itoa",
 "memchr",
@@ -762,9 +794,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 [[package]]
 name = "syn"
-version = "2.0.98"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -788,15 +820,14 @@ dependencies = [
 [[package]]
 name = "tempfile"
-version = "3.16.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
 "cfg-if",
 "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
 "once_cell",
- "rustix 0.38.44",
+ "rustix 1.0.7",
 "windows-sys 0.59.0",
 ]
@@ -853,9 +884,9 @@ dependencies = [
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 [[package]]
 name = "unicode-width"
@@ -880,15 +911,15 @@ dependencies = [
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
 "wit-bindgen-rt",
 ]
@@ -984,11 +1015,61 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-implement",
 "windows-interface",
 "windows-link",
 "windows-result",
 "windows-strings",
 ]
 [[package]]
 name = "windows-implement"
 version = "0.60.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "windows-interface"
 version = "0.59.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "windows-link"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 [[package]]
 name = "windows-result"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
 "windows-link",
 ]
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
 "windows-link",
 ]
 [[package]]
@@ -1009,6 +1090,15 @@ dependencies = [
 "windows-targets 0.52.6",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
 "windows-targets 0.53.2",
 ]
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -1033,13 +1123,29 @@ dependencies = [
 "windows_aarch64_gnullvm 0.52.6",
 "windows_aarch64_msvc 0.52.6",
 "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
 "windows_i686_msvc 0.52.6",
 "windows_x86_64_gnu 0.52.6",
 "windows_x86_64_gnullvm 0.52.6",
 "windows_x86_64_msvc 0.52.6",
 ]
 [[package]]
 name = "windows-targets"
 version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
 dependencies = [
 "windows_aarch64_gnullvm 0.53.0",
 "windows_aarch64_msvc 0.53.0",
 "windows_i686_gnu 0.53.0",
 "windows_i686_gnullvm 0.53.0",
 "windows_i686_msvc 0.53.0",
 "windows_x86_64_gnu 0.53.0",
 "windows_x86_64_gnullvm 0.53.0",
 "windows_x86_64_msvc 0.53.0",
 ]
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -1052,6 +1158,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -1064,6 +1176,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -1076,12 +1194,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -1094,6 +1224,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -1106,6 +1242,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -1118,6 +1260,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -1131,10 +1279,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
-name = "wit-bindgen-rt"
+name = "windows_x86_64_msvc"
-version = "0.33.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "1.1.1"
+version = "1.2.3"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
-edition = "2021"
+edition = "2024"
 readme = "README.md"
 documentation = "https://github.com/bootandy/dust"
@@ -28,7 +28,7 @@ strip = true
 [dependencies]
 ansi_term = "0.12"
-clap = "4.4"
+clap = { version = "4.4", features = ["derive"] }
 lscolors = "0.13"
 terminal_size = "0.2"
 unicode-width = "0.1"
@@ -56,7 +56,7 @@ assert_cmd = "2"
 tempfile = "=3"
 [build-dependencies]
-clap = "4.4"
+clap = { version = "4.4", features = ["derive"] }
 clap_complete = "4.4"
 clap_mangen = "0.2"
--- a/README.md
+++ b/README.md
@@ -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)
+Usage: dust -f (Count files instead of diskspace [Counts by inode, to include duplicate inodes use dust -f -s])
 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))
--- a/build.rs
+++ b/build.rs
@@ -1,3 +1,4 @@
 use clap::CommandFactory;
 use clap_complete::{generate_to, shells::*};
 use clap_mangen::Man;
 use std::fs::File;
@@ -9,7 +10,7 @@ include!("src/cli.rs");
 fn main() -> Result<(), Error> {
    let outdir = "completions";
    let app_name = "dust";
-    let mut cmd = build_cli();
+    let mut cmd = Cli::command();
    generate_to(Bash, &mut cmd, app_name, outdir)?;
    generate_to(Zsh, &mut cmd, app_name, outdir)?;
--- a/completions/_dust
+++ b/completions/_dust
@@ -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]: :_default' \
+'-T+[Number of threads to use]:THREADS:_default' \
-'--threads=[Number of threads to use]: :_default' \
+'--threads=[Number of threads to use]:THREADS:_default' \
 '--config=[Specify a config file to use]:FILE:_files' \
 '-n+[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
 '--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]:NUMBER:_default' \
@@ -28,26 +28,48 @@ _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 b k m g t kb mb gb tb)' \
+'-o+[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size]:FORMAT:((si\:"SI prefix (powers of 1000)"
-'--output-format=[Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.]:FORMAT:(si b k m g t kb mb gb tb)' \
+b\:"byte (B)"
 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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
+'-M+[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]:MTIME:_default' \
-'--mtime=[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]: :_default' \
+'--mtime=[+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => \[curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)]:MTIME:_default' \
-'-A+[just like -mtime, but based on file access time]: :_default' \
+'-A+[just like -mtime, but based on file access time]:ATIME:_default' \
-'--atime=[just like -mtime, but based on file access time]: :_default' \
+'--atime=[just like -mtime, but based on file access time]:ATIME:_default' \
-'-y+[just like -mtime, but based on file change time]: :_default' \
+'-y+[just like -mtime, but based on file change time]:CTIME:_default' \
-'--ctime=[just like -mtime, but based on file change time]: :_default' \
+'--ctime=[just like -mtime, but based on file change time]:CTIME:_default' \
-'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]: :_files' \
+'--files0-from=[run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input]:FILES0_FROM:_files' \
-'*--collapse=[Keep these directories collapsed]: :_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]' \
@@ -72,23 +94,23 @@ _dust() {
 '-f[Directory '\''size'\'' is number of child files instead of disk size]' \
 '--filecount[Directory '\''size'\'' is number of child files instead of disk size]' \
 '-i[Do not display hidden files]' \
-'--ignore_hidden[Do not display hidden files]' \
+'--ignore-hidden[Do not display hidden files]' \
 '(-d --depth -D --only-dir)-t[show only these file types]' \
-'(-d --depth -D --only-dir)--file_types[show only these file types]' \
+'(-d --depth -D --only-dir)--file-types[show only these file types]' \
-'-P[Disable the progress indication.]' \
+'-P[Disable the progress indication]' \
-'--no-progress[Disable the progress indication.]' \
+'--no-progress[Disable the progress indication]' \
-'--print-errors[Print path with errors.]' \
+'--print-errors[Print path with errors]' \
-'(-F --only-file -t --file_types)-D[Only directories will be displayed.]' \
+'(-F --only-file -t --file-types)-D[Only directories will be displayed]' \
-'(-F --only-file -t --file_types)--only-dir[Only directories will be displayed.]' \
+'(-F --only-file -t --file-types)--only-dir[Only directories will be displayed]' \
 '(-D --only-dir)-F[Only files will be displayed. (Finds your largest files)]' \
 '(-D --only-dir)--only-file[Only files will be displayed. (Finds your largest files)]' \
 '-j[Output the directory tree as json to the current directory]' \
 '--output-json[Output the directory tree as json to the current directory]' \
-'-h[Print help]' \
+'-h[Print help (see more with '\''--help'\'')]' \
-'--help[Print help]' \
+'--help[Print help (see more with '\''--help'\'')]' \
 '-V[Print version]' \
 '--version[Print version]' \
-'*::params:_files' \
+'*::params -- Input files or directories:_files' \
 && ret=0
 }
--- a/completions/_dust.ps1
+++ b/completions/_dust.ps1
@@ -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 => (𝑐𝑢𝑟𝑟−𝑛, +∞)')
@@ -78,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')
+            [CompletionResult]::new('-h', '-h', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
-            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help')
+            [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, 'Print help (see more with ''--help'')')
            [CompletionResult]::new('-V', '-V ', [CompletionResultType]::ParameterName, 'Print version')
            [CompletionResult]::new('--version', '--version', [CompletionResultType]::ParameterName, 'Print version')
            break
--- a/completions/dust.bash
+++ b/completions/dust.bash
@@ -1,12 +1,16 @@
 _dust() {
    local i cur prev opts cmd
    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
+    if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
+        cur="$2"
    else
        cur="${COMP_WORDS[COMP_CWORD]}"
    fi
    prev="$3"
    cmd=""
    opts=""
-    for i in ${COMP_WORDS[@]}
+    for i in "${COMP_WORDS[@]:0:COMP_CWORD}"
    do
        case "${cmd},${i}" in
            ",$1")
@@ -19,7 +23,7 @@ _dust() {
    case "${cmd}" in
        dust)
-            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --collapse --filetime --help --version [PATH]..."
+            opts="-d -T -n -p -X -I -L -x -s -r -c -C -b -B -z -R -f -i -v -e -t -w -P -D -F -o -S -j -M -A -y -m -h -V --depth --threads --config --number-of-lines --full-paths --ignore-directory --ignore-all-in-file --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --force-colors --no-percent-bars --bars-on-right --min-size --screen-reader --skip-total --filecount --ignore-hidden --invert-filter --filter --file-types --terminal-width --no-progress --print-errors --only-dir --only-file --output-format --stack-size --output-json --mtime --atime --ctime --files0-from --collapse --filetime --help --version [PATH]..."
            if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                return 0
@@ -126,7 +130,7 @@ _dust() {
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
-                --terminal_width)
+                --terminal-width)
                    COMPREPLY=($(compgen -f "${cur}"))
                    return 0
                    ;;
--- a/completions/dust.elv
+++ b/completions/dust.elv
@@ -31,14 +31,14 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand --ignore-all-in-file 'Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter'
            cand -z 'Minimum size file to include in output'
            cand --min-size 'Minimum size file to include in output'
-            cand -v 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" '
+            cand -v 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"'
-            cand --invert-filter 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" '
+            cand --invert-filter 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$"'
-            cand -e 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
+            cand -e 'Only include filepaths matching this regex. For png files type: -e "\.png$"'
-            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
+            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$"'
            cand -w 'Specify width of output overriding the auto detection of terminal width'
-            cand --terminal_width 'Specify width of output overriding the auto detection of terminal width'
+            cand --terminal-width 'Specify width of output overriding the auto detection of terminal width'
-            cand -o 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.'
+            cand -o 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size'
-            cand --output-format 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.'
+            cand --output-format 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size'
            cand -S 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
            cand --stack-size 'Specify memory to use as stack size - use if you see: ''fatal runtime error: stack overflow'' (default low memory=1048576, high memory=1073741824)'
            cand -M '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)'
@@ -75,20 +75,20 @@ set edit:completion:arg-completer[dust] = {|@words|
            cand -f 'Directory ''size'' is number of child files instead of disk size'
            cand --filecount 'Directory ''size'' is number of child files instead of disk size'
            cand -i 'Do not display hidden files'
-            cand --ignore_hidden 'Do not display hidden files'
+            cand --ignore-hidden 'Do not display hidden files'
            cand -t 'show only these file types'
-            cand --file_types 'show only these file types'
+            cand --file-types 'show only these file types'
-            cand -P 'Disable the progress indication.'
+            cand -P 'Disable the progress indication'
-            cand --no-progress 'Disable the progress indication.'
+            cand --no-progress 'Disable the progress indication'
-            cand --print-errors 'Print path with errors.'
+            cand --print-errors 'Print path with errors'
-            cand -D 'Only directories will be displayed.'
+            cand -D 'Only directories will be displayed'
-            cand --only-dir 'Only directories will be displayed.'
+            cand --only-dir 'Only directories will be displayed'
            cand -F 'Only files will be displayed. (Finds your largest files)'
            cand --only-file 'Only files will be displayed. (Finds your largest files)'
            cand -j 'Output the directory tree as json to the current directory'
            cand --output-json 'Output the directory tree as json to the current directory'
-            cand -h 'Print help'
+            cand -h 'Print help (see more with ''--help'')'
-            cand --help 'Print help'
+            cand --help 'Print help (see more with ''--help'')'
            cand -V 'Print version'
            cand --version 'Print version'
        }
--- a/completions/dust.fish
+++ b/completions/dust.fish
@@ -5,28 +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''
+complete -c dust -s o -l output-format -d 'Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size' -r -f -a "si\t'SI prefix (powers of 1000)'
-b\t''
+b\t'byte (B)'
-k\t''
+k\t'kibibyte (KiB)'
-m\t''
+m\t'mebibyte (MiB)'
-g\t''
+g\t'gibibyte (GiB)'
-t\t''
+t\t'tebibyte (TiB)'
-kb\t''
+kb\t'kilobyte (kB)'
-mb\t''
+mb\t'megabyte (MB)'
-gb\t''
+gb\t'gigabyte (GB)'
-tb\t''"
+tb\t'terabyte (TB)'"
 complete -c dust -s S -l stack-size -d 'Specify memory to use as stack size - use if you see: \'fatal runtime error: stack overflow\' (default low memory=1048576, high memory=1073741824)' -r
 complete -c dust -s M -l mtime -d '+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)' -r
 complete -c dust -s A -l atime -d 'just like -mtime, but based on file access time' -r
 complete -c dust -s y -l ctime -d 'just like -mtime, but based on file change time' -r
 complete -c dust -l files0-from -d 'run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input' -r -F
 complete -c dust -l collapse -d 'Keep these directories collapsed' -r -F
-complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t''
+complete -c dust -s m -l filetime -d 'Directory \'size\' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time' -r -f -a "a\t'last accessed time'
-c\t''
+c\t'last changed time'
-m\t''"
+m\t'last modified time'"
 complete -c dust -s p -l full-paths -d 'Subdirectories will not have their path shortened'
 complete -c dust -s L -l dereference-links -d 'dereference sym links - Treat sym links as directories and go into them'
 complete -c dust -s x -l limit-filesystem -d 'Only count the files and directories on the same filesystem as the supplied directory'
@@ -39,12 +39,12 @@ complete -c dust -s B -l bars-on-right -d 'percent bars moved to right side of s
 complete -c dust -s R -l screen-reader -d 'For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)'
 complete -c dust -l skip-total -d 'No total row will be displayed'
 complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child files instead of disk size'
-complete -c dust -s i -l ignore_hidden -d 'Do not display hidden files'
+complete -c dust -s i -l ignore-hidden -d 'Do not display hidden files'
-complete -c dust -s t -l file_types -d 'show only these file types'
+complete -c dust -s t -l file-types -d 'show only these file types'
-complete -c dust -s P -l no-progress -d 'Disable the progress indication.'
+complete -c dust -s P -l no-progress -d 'Disable the progress indication'
-complete -c dust -l print-errors -d 'Print path with errors.'
+complete -c dust -l print-errors -d 'Print path with errors'
-complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'
+complete -c dust -s D -l only-dir -d 'Only directories will be displayed'
 complete -c dust -s F -l only-file -d 'Only files will be displayed. (Finds your largest files)'
 complete -c dust -s j -l output-json -d 'Output the directory tree as json to the current directory'
-complete -c dust -s h -l help -d 'Print help'
+complete -c dust -s h -l help -d 'Print help (see more with \'--help\')'
 complete -c dust -s V -l version -d 'Print version'
--- a/man-page/dust.1
+++ b/man-page/dust.1
@@ -1,10 +1,10 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH Dust 1  "Dust 1.1.1" 
+.TH Dust 1  "Dust 1.2.3" 
 .SH NAME
 Dust \- Like du but more intuitive
 .SH SYNOPSIS
-\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
+\fBdust\fR [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-T\fR|\fB\-\-threads\fR] [\fB\-\-config\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-I\fR|\fB\-\-ignore\-all\-in\-file\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-C\fR|\fB\-\-force\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-B\fR|\fB\-\-bars\-on\-right\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-R\fR|\fB\-\-screen\-reader\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore\-hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file\-types\fR] [\fB\-w\fR|\fB\-\-terminal\-width\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-\-print\-errors\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fB\-o\fR|\fB\-\-output\-format\fR] [\fB\-S\fR|\fB\-\-stack\-size\fR] [\fB\-j\fR|\fB\-\-output\-json\fR] [\fB\-M\fR|\fB\-\-mtime\fR] [\fB\-A\fR|\fB\-\-atime\fR] [\fB\-y\fR|\fB\-\-ctime\fR] [\fB\-\-files0\-from\fR] [\fB\-\-collapse\fR] [\fB\-m\fR|\fB\-\-filetime\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIPATH\fR] 
 .SH DESCRIPTION
 Like du but more intuitive
 .SH OPTIONS
@@ -12,7 +12,7 @@ Like du but more intuitive
 \fB\-d\fR, \fB\-\-depth\fR=\fIDEPTH\fR
 Depth to show
 .TP
-\fB\-T\fR, \fB\-\-threads\fR
+\fB\-T\fR, \fB\-\-threads\fR=\fITHREADS\fR
 Number of threads to use
 .TP
 \fB\-\-config\fR=\fIFILE\fR
@@ -66,7 +66,7 @@ No total row will be displayed
 \fB\-f\fR, \fB\-\-filecount\fR
 Directory \*(Aqsize\*(Aq is number of child files instead of disk size
 .TP
-\fB\-i\fR, \fB\-\-ignore_hidden\fR
+\fB\-i\fR, \fB\-\-ignore\-hidden\fR
 Do not display hidden files
 .TP
 \fB\-v\fR, \fB\-\-invert\-filter\fR=\fIREGEX\fR
@@ -75,30 +75,52 @@ Exclude filepaths matching this regex. To ignore png files type: \-v "\\.png$"
 \fB\-e\fR, \fB\-\-filter\fR=\fIREGEX\fR
 Only include filepaths matching this regex. For png files type: \-e "\\.png$"
 .TP
-\fB\-t\fR, \fB\-\-file_types\fR
+\fB\-t\fR, \fB\-\-file\-types\fR
 show only these file types
 .TP
-\fB\-w\fR, \fB\-\-terminal_width\fR=\fIWIDTH\fR
+\fB\-w\fR, \fB\-\-terminal\-width\fR=\fIWIDTH\fR
 Specify width of output overriding the auto detection of terminal width
 .TP
 \fB\-P\fR, \fB\-\-no\-progress\fR
-Disable the progress indication.
+Disable the progress indication
 .TP
 \fB\-\-print\-errors\fR
-Print path with errors.
+Print path with errors
 .TP
 \fB\-D\fR, \fB\-\-only\-dir\fR
-Only directories will be displayed.
+Only directories will be displayed
 .TP
 \fB\-F\fR, \fB\-\-only\-file\fR
 Only files will be displayed. (Finds your largest files)
 .TP
 \fB\-o\fR, \fB\-\-output\-format\fR=\fIFORMAT\fR
-Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.
+Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size
 .br
 .br
-[\fIpossible values: \fRsi, b, k, m, g, t, kb, mb, gb, tb]
+\fIPossible values:\fR
 .RS 14
 .IP \(bu 2
 si: SI prefix (powers of 1000)
 .IP \(bu 2
 b: byte (B)
 .IP \(bu 2
 k: kibibyte (KiB)
 .IP \(bu 2
 m: mebibyte (MiB)
 .IP \(bu 2
 g: gibibyte (GiB)
 .IP \(bu 2
 t: tebibyte (TiB)
 .IP \(bu 2
 kb: kilobyte (kB)
 .IP \(bu 2
 mb: megabyte (MB)
 .IP \(bu 2
 gb: gigabyte (GB)
 .IP \(bu 2
 tb: terabyte (TB)
 .RE
 .TP
 \fB\-S\fR, \fB\-\-stack\-size\fR=\fISTACK_SIZE\fR
 Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error: stack overflow\*(Aq (default low memory=1048576, high memory=1073741824)
@@ -106,35 +128,43 @@ Specify memory to use as stack size \- use if you see: \*(Aqfatal runtime error:
 \fB\-j\fR, \fB\-\-output\-json\fR
 Output the directory tree as json to the current directory
 .TP
-\fB\-M\fR, \fB\-\-mtime\fR
+\fB\-M\fR, \fB\-\-mtime\fR=\fIMTIME\fR
 +/\-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and \-n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
 .TP
-\fB\-A\fR, \fB\-\-atime\fR
+\fB\-A\fR, \fB\-\-atime\fR=\fIATIME\fR
 just like \-mtime, but based on file access time
 .TP
-\fB\-y\fR, \fB\-\-ctime\fR
+\fB\-y\fR, \fB\-\-ctime\fR=\fICTIME\fR
 just like \-mtime, but based on file change time
 .TP
-\fB\-\-files0\-from\fR
+\fB\-\-files0\-from\fR=\fIFILES0_FROM\fR
 run dust on NUL\-terminated file names specified in file; if argument is \-, then read names from standard input
 .TP
-\fB\-\-collapse\fR
+\fB\-\-collapse\fR=\fICOLLAPSE\fR
 Keep these directories collapsed
 .TP
-\fB\-m\fR, \fB\-\-filetime\fR
+\fB\-m\fR, \fB\-\-filetime\fR=\fIFILETIME\fR
 Directory \*(Aqsize\*(Aq is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time
 .br
 .br
-[\fIpossible values: \fRa, c, m]
+\fIPossible values:\fR
 .RS 14
 .IP \(bu 2
 a: last accessed time
 .IP \(bu 2
 c: last changed time
 .IP \(bu 2
 m: last modified time
 .RE
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Print help
+Print help (see a summary with \*(Aq\-h\*(Aq)
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .TP
 [\fIPATH\fR]
-
+Input files or directories
 .SH VERSION
-v1.1.1
+v1.2.3
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,326 +1,258 @@
-use clap::{builder::PossibleValue, value_parser, Arg, Command};
+use std::fmt;
 use clap::{Parser, ValueEnum, ValueHint};
 // For single thread mode set this variable on your command line:
 // export RAYON_NUM_THREADS=1
-pub fn build_cli() -> Command {
+/// Like du but more intuitive
-    Command::new("Dust")
+#[derive(Debug, Parser)]
-        .about("Like du but more intuitive")
+#[command(name("Dust"), version)]
-        .version(env!("CARGO_PKG_VERSION"))
+pub struct Cli {
-        .arg(
+    /// Depth to show
-            Arg::new("depth")
+    #[arg(short, long)]
-                .short('d')
+    pub depth: Option<usize>,
-                .long("depth")
+
-                .value_name("DEPTH")
+    /// Number of threads to use
-                .value_parser(value_parser!(usize))
+    #[arg(short('T'), long)]
-                .help("Depth to show")
+    pub threads: Option<usize>,
-                .num_args(1)
+
-        )
+    /// Specify a config file to use
-        .arg(
+    #[arg(long, value_name("FILE"), value_hint(ValueHint::FilePath))]
-            Arg::new("threads")
+    pub config: Option<String>,
-                .short('T')
+
-                .long("threads")
+    /// Number of lines of output to show. (Default is terminal_height - 10)
-                .value_parser(value_parser!(usize))
+    #[arg(short, long, value_name("NUMBER"))]
-                .help("Number of threads to use")
+    pub number_of_lines: Option<usize>,
-                .num_args(1)
+
-        )
+    /// Subdirectories will not have their path shortened
-        .arg(
+    #[arg(short('p'), long)]
-            Arg::new("config")
+    pub full_paths: bool,
-                .long("config")
+
-                .help("Specify a config file to use")
+    /// Exclude any file or directory with this path
-                .value_name("FILE")
+    #[arg(short('X'), long, value_name("PATH"), value_hint(ValueHint::AnyPath))]
-                .value_hint(clap::ValueHint::FilePath)
+    pub ignore_directory: Option<Vec<String>>,
-                .value_parser(value_parser!(String))
+
-                .num_args(1)
+    /// Exclude any file or directory with a regex matching that listed in this
-        )
+    /// file, the file entries will be added to the ignore regexs provided by
-        .arg(
+    /// --invert_filter
-            Arg::new("number_of_lines")
+    #[arg(short('I'), long, value_name("FILE"), value_hint(ValueHint::FilePath))]
-                .short('n')
+    pub ignore_all_in_file: Option<String>,
-                .long("number-of-lines")
+
-                .value_name("NUMBER")
+    /// dereference sym links - Treat sym links as directories and go into them
-                .value_parser(value_parser!(usize))
+    #[arg(short('L'), long)]
-                .help("Number of lines of output to show. (Default is terminal_height - 10)")
+    pub dereference_links: bool,
-                .num_args(1)
+
-        )
+    /// Only count the files and directories on the same filesystem as the
-        .arg(
+    /// supplied directory
-            Arg::new("display_full_paths")
+    #[arg(short('x'), long)]
-                .short('p')
+    pub limit_filesystem: bool,
-                .long("full-paths")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Use file length instead of blocks
-                .help("Subdirectories will not have their path shortened"),
+    #[arg(short('s'), long)]
-        )
+    pub apparent_size: bool,
-        .arg(
+
-            Arg::new("ignore_directory")
+    /// Print tree upside down (biggest highest)
-                .short('X')
+    #[arg(short, long)]
-                .long("ignore-directory")
+    pub reverse: bool,
-                .value_name("PATH")
+
-                .value_hint(clap::ValueHint::AnyPath)
+    /// No colors will be printed (Useful for commands like: watch)
-                .action(clap::ArgAction::Append)
+    #[arg(short('c'), long)]
-                .help("Exclude any file or directory with this path"),
+    pub no_colors: bool,
-        )
+
-        .arg(
+    /// Force colors print
-            Arg::new("ignore_all_in_file")
+    #[arg(short('C'), long)]
-                .short('I')
+    pub force_colors: bool,
-                .long("ignore-all-in-file")
+
-                .value_name("FILE")
+    /// No percent bars or percentages will be displayed
-                .value_hint(clap::ValueHint::FilePath)
+    #[arg(short('b'), long)]
-                .value_parser(value_parser!(String))
+    pub no_percent_bars: bool,
-                .help("Exclude any file or directory with a regex matching that listed in this file, the file entries will be added to the ignore regexs provided by --invert_filter"),
+
-        )
+    /// percent bars moved to right side of screen
-         .arg(
+    #[arg(short('B'), long)]
-            Arg::new("dereference_links")
+    pub bars_on_right: bool,
-                .short('L')
+
-                .long("dereference-links")
+    /// Minimum size file to include in output
-                .action(clap::ArgAction::SetTrue)
+    #[arg(short('z'), long)]
-                .help("dereference sym links - Treat sym links as directories and go into them"),
+    pub min_size: Option<String>,
-        )
+
-        .arg(
+    /// For screen readers. Removes bars. Adds new column: depth level (May want
-            Arg::new("limit_filesystem")
+    /// to use -p too for full path)
-                .short('x')
+    #[arg(short('R'), long)]
-                .long("limit-filesystem")
+    pub screen_reader: bool,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Only count the files and directories on the same filesystem as the supplied directory"),
+    /// No total row will be displayed
-        )
+    #[arg(long)]
-        .arg(
+    pub skip_total: bool,
-            Arg::new("display_apparent_size")
+
-                .short('s')
+    /// Directory 'size' is number of child files instead of disk size
-                .long("apparent-size")
+    #[arg(short, long)]
-                .action(clap::ArgAction::SetTrue)
+    pub filecount: bool,
-                .help("Use file length instead of blocks"),
+
-        )
+    /// Do not display hidden files
-        .arg(
+    // Do not use 'h' this is used by 'help'
-            Arg::new("reverse")
+    #[arg(short, long)]
-                .short('r')
+    pub ignore_hidden: bool,
-                .long("reverse")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Exclude filepaths matching this regex. To ignore png files type: -v
-                .help("Print tree upside down (biggest highest)"),
+    /// "\.png$"
-        )
+    #[arg(
-        .arg(
+        short('v'),
-            Arg::new("no_colors")
+        long,
-                .short('c')
+        value_name("REGEX"),
-                .long("no-colors")
+        conflicts_with("filter"),
-                .action(clap::ArgAction::SetTrue)
+        conflicts_with("file_types")
-                .help("No colors will be printed (Useful for commands like: watch)"),
+    )]
-        )
+    pub invert_filter: Option<Vec<String>>,
-        .arg(
+
-            Arg::new("force_colors")
+    /// Only include filepaths matching this regex. For png files type: -e
-                .short('C')
+    /// "\.png$"
-                .long("force-colors")
+    #[arg(short('e'), long, value_name("REGEX"), conflicts_with("file_types"))]
-                .action(clap::ArgAction::SetTrue)
+    pub filter: Option<Vec<String>>,
-                .help("Force colors print"),
+
-        )
+    /// show only these file types
-        .arg(
+    #[arg(short('t'), long, conflicts_with("depth"), conflicts_with("only_dir"))]
-            Arg::new("no_bars")
+    pub file_types: bool,
-                .short('b')
+
-                .long("no-percent-bars")
+    /// Specify width of output overriding the auto detection of terminal width
-                .action(clap::ArgAction::SetTrue)
+    #[arg(short('w'), long, value_name("WIDTH"))]
-                .help("No percent bars or percentages will be displayed"),
+    pub terminal_width: Option<usize>,
-        )
+
-        .arg(
+    /// Disable the progress indication.
-            Arg::new("bars_on_right")
+    #[arg(short('P'), long)]
-                .short('B')
+    pub no_progress: bool,
-                .long("bars-on-right")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Print path with errors.
-                .help("percent bars moved to right side of screen"),
+    #[arg(long)]
-        )
+    pub print_errors: bool,
-        .arg(
+
-            Arg::new("min_size")
+    /// Only directories will be displayed.
-                .short('z')
+    #[arg(
-                .long("min-size")
+        short('D'),
-                .value_name("MIN_SIZE")
+        long,
-                .num_args(1)
+        conflicts_with("only_file"),
-                .help("Minimum size file to include in output"),
+        conflicts_with("file_types")
-        )
+    )]
-        .arg(
+    pub only_dir: bool,
-            Arg::new("screen_reader")
+
-                .short('R')
+    /// Only files will be displayed. (Finds your largest files)
-                .long("screen-reader")
+    #[arg(short('F'), long, conflicts_with("only_dir"))]
-                .action(clap::ArgAction::SetTrue)
+    pub only_file: bool,
-                .help("For screen readers. Removes bars. Adds new column: depth level (May want to use -p too for full path)"),
+
-        )
+    /// Changes output display size. si will print sizes in powers of 1000. b k
-        .arg(
+    /// m g t kb mb gb tb will print the whole tree in that size.
-            Arg::new("skip_total")
+    #[arg(short, long, value_enum, value_name("FORMAT"), ignore_case(true))]
-                .long("skip-total")
+    pub output_format: Option<OutputFormat>,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("No total row will be displayed"),
+    /// Specify memory to use as stack size - use if you see: 'fatal runtime
-        )
+    /// error: stack overflow' (default low memory=1048576, high
-        .arg(
+    /// memory=1073741824)
-            Arg::new("by_filecount")
+    #[arg(short('S'), long)]
-                .short('f')
+    pub stack_size: Option<usize>,
-                .long("filecount")
+
-                .action(clap::ArgAction::SetTrue)
+    /// Input files or directories.
-                .help("Directory 'size' is number of child files instead of disk size"),
+    #[arg(value_name("PATH"), value_hint(ValueHint::AnyPath))]
-        )
+    pub params: Option<Vec<String>>,
-        .arg(
+
-            Arg::new("ignore_hidden")
+    /// Output the directory tree as json to the current directory
-                .short('i') // Do not use 'h' this is used by 'help'
+    #[arg(short('j'), long)]
-                .long("ignore_hidden")
+    pub output_json: bool,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Do not display hidden files"),
+    /// +/-n matches files modified more/less than n days ago , and n matches
-        )
+    /// files modified exactly n days ago, days are rounded down.That is +n =>
-        .arg(
+    /// (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)
-            Arg::new("invert_filter")
+    #[arg(short('M'), long, allow_hyphen_values(true))]
-                .short('v')
+    pub mtime: Option<String>,
-                .long("invert-filter")
+
-                .value_name("REGEX")
+    /// just like -mtime, but based on file access time
-                .action(clap::ArgAction::Append)
+    #[arg(short('A'), long, allow_hyphen_values(true))]
-                .conflicts_with("filter")
+    pub atime: Option<String>,
-                .conflicts_with("types")
+
-                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
+    /// just like -mtime, but based on file change time
-        )
+    #[arg(short('y'), long, allow_hyphen_values(true))]
-        .arg(
+    pub ctime: Option<String>,
-            Arg::new("filter")
+
-                .short('e')
+    /// run dust on NUL-terminated file names specified in file; if argument is
-                .long("filter")
+    /// -, then read names from standard input
-                .value_name("REGEX")
+    #[arg(long, value_hint(ValueHint::AnyPath))]
-                .action(clap::ArgAction::Append)
+    pub files0_from: Option<String>,
-                .conflicts_with("types")
+
-                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
+    /// Keep these directories collapsed
-        )
+    #[arg(long, value_hint(ValueHint::AnyPath))]
-        .arg(
+    pub collapse: Option<Vec<String>>,
-            Arg::new("types")
+
-                .short('t')
+    /// Directory 'size' is max filetime of child files instead of disk size.
-                .long("file_types")
+    /// while a/c/m for last accessed/changed/modified time
-                .conflicts_with("depth")
+    #[arg(short('m'), long, value_enum)]
-                .conflicts_with("only_dir")
+    pub filetime: Option<FileTime>,
-                .action(clap::ArgAction::SetTrue)
+}
-                .help("show only these file types"),
+
-        )
+#[derive(Clone, Copy, Debug, ValueEnum)]
-        .arg(
+#[value(rename_all = "lower")]
-            Arg::new("width")
+pub enum OutputFormat {
-                .short('w')
+    /// SI prefix (powers of 1000)
-                .long("terminal_width")
+    SI,
-                .value_name("WIDTH")
+
-                .value_parser(value_parser!(usize))
+    /// byte (B)
-                .num_args(1)
+    B,
-                .help("Specify width of output overriding the auto detection of terminal width"),
+
-        )
+    /// kibibyte (KiB)
-        .arg(
+    #[value(name = "k", alias("kib"))]
-            Arg::new("disable_progress")
+    KiB,
-                .short('P')
+
-                .long("no-progress")
+    /// mebibyte (MiB)
-                .action(clap::ArgAction::SetTrue)
+    #[value(name = "m", alias("mib"))]
-                .help("Disable the progress indication."),
+    MiB,
-        )
+
-        .arg(
+    /// gibibyte (GiB)
-            Arg::new("print_errors")
+    #[value(name = "g", alias("gib"))]
-                .long("print-errors")
+    GiB,
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Print path with errors."),
+    /// tebibyte (TiB)
-        )
+    #[value(name = "t", alias("tib"))]
-        .arg(
+    TiB,
-            Arg::new("only_dir")
+
-                .short('D')
+    /// kilobyte (kB)
-                .long("only-dir")
+    KB,
-                .conflicts_with("only_file")
+
-                .conflicts_with("types")
+    /// megabyte (MB)
-                .action(clap::ArgAction::SetTrue)
+    MB,
-                .help("Only directories will be displayed."),
+
-        )
+    /// gigabyte (GB)
-        .arg(
+    GB,
-            Arg::new("only_file")
+
-                .short('F')
+    /// terabyte (TB)
-                .long("only-file")
+    TB,
-                .conflicts_with("only_dir")
+}
-                .action(clap::ArgAction::SetTrue)
+
-                .help("Only files will be displayed. (Finds your largest files)"),
+impl fmt::Display for OutputFormat {
-        )
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        .arg(
+        match self {
-            Arg::new("output_format")
+            Self::SI => write!(f, "si"),
-                .short('o')
+            Self::B => write!(f, "b"),
-                .long("output-format")
+            Self::KiB => write!(f, "k"),
-                .value_name("FORMAT")
+            Self::MiB => write!(f, "m"),
-                .value_parser([
+            Self::GiB => write!(f, "g"),
-                    PossibleValue::new("si"),
+            Self::TiB => write!(f, "t"),
-                    PossibleValue::new("b"),
+            Self::KB => write!(f, "kb"),
-                    PossibleValue::new("k").alias("kib"),
+            Self::MB => write!(f, "mb"),
-                    PossibleValue::new("m").alias("mib"),
+            Self::GB => write!(f, "gb"),
-                    PossibleValue::new("g").alias("gib"),
+            Self::TB => write!(f, "tb"),
-                    PossibleValue::new("t").alias("tib"),
+        }
-                    PossibleValue::new("kb"),
+    }
-                    PossibleValue::new("mb"),
+}
-                    PossibleValue::new("gb"),
+
-                    PossibleValue::new("tb"),
+#[derive(Clone, Copy, Debug, ValueEnum)]
-                ])
+pub enum FileTime {
-                .ignore_case(true)
+    /// last accessed time
-                .help("Changes output display size. si will print sizes in powers of 1000. b k m g t kb mb gb tb will print the whole tree in that size.")
+    #[value(name = "a", alias("accessed"))]
-        )
+    Accessed,
-        .arg(
+
-            Arg::new("stack_size")
+    /// last changed time
-                .short('S')
+    #[value(name = "c", alias("changed"))]
-                .long("stack-size")
+    Changed,
-                .value_name("STACK_SIZE")
+
-                .value_parser(value_parser!(usize))
+    /// last modified time
-                .num_args(1)
+    #[value(name = "m", alias("modified"))]
-                .help("Specify memory to use as stack size - use if you see: 'fatal runtime error: stack overflow' (default low memory=1048576, high memory=1073741824)"),
+    Modified,
        )
        .arg(
            Arg::new("params")
                .value_name("PATH")
                .value_hint(clap::ValueHint::AnyPath)
                .value_parser(value_parser!(String))
                .num_args(1..)
        )
        .arg(
            Arg::new("output_json")
                .short('j')
                .long("output-json")
                .action(clap::ArgAction::SetTrue)
                .help("Output the directory tree as json to the current directory"),
        )
        .arg(
            Arg::new("mtime")
            .short('M')
            .long("mtime")
            .num_args(1)
            .allow_hyphen_values(true)
            .value_parser(value_parser!(String))
            .help("+/-n matches files modified more/less than n days ago , and n matches files modified exactly n days ago, days are rounded down.That is +n => (−∞, curr−(n+1)), n => [curr−(n+1), curr−n), and -n => (𝑐𝑢𝑟𝑟−𝑛, +∞)")
        )
        .arg(
            Arg::new("atime")
            .short('A')
            .long("atime")
            .num_args(1)
            .allow_hyphen_values(true)
            .value_parser(value_parser!(String))
            .help("just like -mtime, but based on file access time")
        )
        .arg(
            Arg::new("ctime")
            .short('y')
            .long("ctime")
            .num_args(1)
            .allow_hyphen_values(true)
            .value_parser(value_parser!(String))
            .help("just like -mtime, but based on file change time")
        )
        .arg(
            Arg::new("files0_from")
                .long("files0-from")
                .value_hint(clap::ValueHint::AnyPath)
                .value_parser(value_parser!(String))
                .num_args(1)
                .help("run dust on NUL-terminated file names specified in file; if argument is -, then read names from standard input"),
        )
        .arg(
            Arg::new("collapse")
                .long("collapse")
                .value_hint(clap::ValueHint::AnyPath)
                .value_parser(value_parser!(String))
                .action(clap::ArgAction::Append)
                .help("Keep these directories collapsed"),
        )
        .arg(
            Arg::new("filetime")
                .short('m')
                .long("filetime")
                .num_args(1)
                .value_parser([
                    PossibleValue::new("a").alias("accessed"),
                    PossibleValue::new("c").alias("changed"),
                    PossibleValue::new("m").alias("modified"),
                ])
                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for last accessed/changed/modified time"),
        )
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,13 +1,12 @@
 use crate::node::FileTime;
 use chrono::{Local, TimeZone};
 use clap::ArgMatches;
 use config_file::FromConfigFile;
 use regex::Regex;
 use serde::Deserialize;
 use std::io::IsTerminal;
 use std::path::Path;
 use std::path::PathBuf;
 use crate::cli::Cli;
 use crate::dir_walker::Operator;
 use crate::display::get_number_format;
@@ -40,79 +39,68 @@ pub struct Config {
 }
 impl Config {
-    pub fn get_files_from(&self, options: &ArgMatches) -> Option<String> {
+    pub fn get_files_from(&self, options: &Cli) -> Option<String> {
-        let from_file = options.get_one::<String>("files0_from");
+        let from_file = &options.files0_from;
        match from_file {
            None => self.files0_from.as_ref().map(|x| x.to_string()),
            Some(x) => Some(x.to_string()),
        }
    }
-    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
+    pub fn get_no_colors(&self, options: &Cli) -> bool {
-        Some(true) == self.no_colors || options.get_flag("no_colors")
+        Some(true) == self.no_colors || options.no_colors
    }
-    pub fn get_force_colors(&self, options: &ArgMatches) -> bool {
+    pub fn get_force_colors(&self, options: &Cli) -> bool {
-        Some(true) == self.force_colors || options.get_flag("force_colors")
+        Some(true) == self.force_colors || options.force_colors
    }
-    pub fn get_disable_progress(&self, options: &ArgMatches) -> bool {
+    pub fn get_disable_progress(&self, options: &Cli) -> bool {
-        Some(true) == self.disable_progress
+        Some(true) == self.disable_progress || options.no_progress
            || options.get_flag("disable_progress")
            || !std::io::stdout().is_terminal()
    }
-    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
+    pub fn get_apparent_size(&self, options: &Cli) -> bool {
-        Some(true) == self.display_apparent_size || options.get_flag("display_apparent_size")
+        Some(true) == self.display_apparent_size || options.apparent_size
    }
-    pub fn get_ignore_hidden(&self, options: &ArgMatches) -> bool {
+    pub fn get_ignore_hidden(&self, options: &Cli) -> bool {
-        Some(true) == self.ignore_hidden || options.get_flag("ignore_hidden")
+        Some(true) == self.ignore_hidden || options.ignore_hidden
    }
-    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
+    pub fn get_full_paths(&self, options: &Cli) -> bool {
-        Some(true) == self.display_full_paths || options.get_flag("display_full_paths")
+        Some(true) == self.display_full_paths || options.full_paths
    }
-    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
+    pub fn get_reverse(&self, options: &Cli) -> bool {
-        Some(true) == self.reverse || options.get_flag("reverse")
+        Some(true) == self.reverse || options.reverse
    }
-    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
+    pub fn get_no_bars(&self, options: &Cli) -> bool {
-        Some(true) == self.no_bars || options.get_flag("no_bars")
+        Some(true) == self.no_bars || options.no_percent_bars
    }
-    pub fn get_output_format(&self, options: &ArgMatches) -> String {
+    pub fn get_output_format(&self, options: &Cli) -> String {
-        let out_fmt = options.get_one::<String>("output_format");
+        let out_fmt = options.output_format;
        (match out_fmt {
            None => match &self.output_format {
                None => "".to_string(),
                Some(x) => x.to_string(),
            },
-            Some(x) => x.into(),
+            Some(x) => x.to_string(),
        })
        .to_lowercase()
    }
-    pub fn get_filetime(&self, options: &ArgMatches) -> Option<FileTime> {
+    pub fn get_filetime(&self, options: &Cli) -> Option<FileTime> {
-        let out_fmt = options.get_one::<String>("filetime");
+        options.filetime.map(FileTime::from)
        match out_fmt {
            None => None,
            Some(x) => match x.as_str() {
                "m" | "modified" => Some(FileTime::Modified),
                "a" | "accessed" => Some(FileTime::Accessed),
                "c" | "changed" => Some(FileTime::Changed),
                _ => unreachable!(),
            },
        }
    }
-    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
+    pub fn get_skip_total(&self, options: &Cli) -> bool {
-        Some(true) == self.skip_total || options.get_flag("skip_total")
+        Some(true) == self.skip_total || options.skip_total
    }
-    pub fn get_screen_reader(&self, options: &ArgMatches) -> bool {
+    pub fn get_screen_reader(&self, options: &Cli) -> bool {
-        Some(true) == self.screen_reader || options.get_flag("screen_reader")
+        Some(true) == self.screen_reader || options.screen_reader
    }
-    pub fn get_depth(&self, options: &ArgMatches) -> usize {
+    pub fn get_depth(&self, options: &Cli) -> usize {
-        if let Some(v) = options.get_one::<usize>("depth") {
+        if let Some(v) = options.depth {
-            return *v;
+            return v;
        }
        self.depth.unwrap_or(usize::MAX)
    }
-    pub fn get_min_size(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_min_size(&self, options: &Cli) -> Option<usize> {
-        let size_from_param = options.get_one::<String>("min_size");
+        let size_from_param = options.min_size.as_ref();
        self._get_min_size(size_from_param)
    }
    fn _get_min_size(&self, min_size: Option<&String>) -> Option<usize> {
@@ -126,58 +114,49 @@ impl Config {
            size_from_param
        }
    }
-    pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
+    pub fn get_only_dir(&self, options: &Cli) -> bool {
-        Some(true) == self.only_dir || options.get_flag("only_dir")
+        Some(true) == self.only_dir || options.only_dir
    }
-    pub fn get_print_errors(&self, options: &ArgMatches) -> bool {
+    pub fn get_print_errors(&self, options: &Cli) -> bool {
-        Some(true) == self.print_errors || options.get_flag("print_errors")
+        Some(true) == self.print_errors || options.print_errors
    }
-    pub fn get_only_file(&self, options: &ArgMatches) -> bool {
+    pub fn get_only_file(&self, options: &Cli) -> bool {
-        Some(true) == self.only_file || options.get_flag("only_file")
+        Some(true) == self.only_file || options.only_file
    }
-    pub fn get_bars_on_right(&self, options: &ArgMatches) -> bool {
+    pub fn get_bars_on_right(&self, options: &Cli) -> bool {
-        Some(true) == self.bars_on_right || options.get_flag("bars_on_right")
+        Some(true) == self.bars_on_right || options.bars_on_right
    }
-    pub fn get_custom_stack_size(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_custom_stack_size(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("stack_size");
+        let from_cmd_line = options.stack_size;
        if from_cmd_line.is_none() {
            self.stack_size
        } else {
-            from_cmd_line.copied()
+            from_cmd_line
        }
    }
-    pub fn get_threads(&self, options: &ArgMatches) -> Option<usize> {
+    pub fn get_threads(&self, options: &Cli) -> Option<usize> {
-        let from_cmd_line = options.get_one::<usize>("threads");
+        let from_cmd_line = options.threads;
        if from_cmd_line.is_none() {
            self.threads
        } else {
-            from_cmd_line.copied()
+            from_cmd_line
        }
    }
-    pub fn get_output_json(&self, options: &ArgMatches) -> bool {
+    pub fn get_output_json(&self, options: &Cli) -> bool {
-        Some(true) == self.output_json || options.get_flag("output_json")
+        Some(true) == self.output_json || options.output_json
    }
-    pub fn get_modified_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
+    pub fn get_modified_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
+        get_filter_time_operator(options.mtime.as_ref(), get_current_date_epoch_seconds())
            options.get_one::<String>("mtime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_accessed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
+    pub fn get_accessed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
+        get_filter_time_operator(options.atime.as_ref(), get_current_date_epoch_seconds())
            options.get_one::<String>("atime"),
            get_current_date_epoch_seconds(),
        )
    }
-    pub fn get_changed_time_operator(&self, options: &ArgMatches) -> Option<(Operator, i64)> {
+    pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
-        get_filter_time_operator(
+        get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
            options.get_one::<String>("ctime"),
            get_current_date_epoch_seconds(),
        )
    }
 }
@@ -253,10 +232,10 @@ fn get_config_locations(base: &Path) -> Vec<PathBuf> {
    ]
 }
-pub fn get_config(conf_path: Option<String>) -> Config {
+pub fn get_config(conf_path: Option<&String>) -> Config {
    match conf_path {
        Some(path_str) => {
-            let path = Path::new(&path_str);
+            let path = Path::new(path_str);
            if path.exists() {
                match Config::from_config_file(path) {
                    Ok(config) => return config,
@@ -290,8 +269,7 @@ mod tests {
    #[allow(unused_imports)]
    use super::*;
    use chrono::{Datelike, Timelike};
-    use clap::builder::PossibleValue;
+    use clap::Parser;
    use clap::{value_parser, Arg, ArgMatches, Command};
    #[test]
    fn test_get_current_date_epoch_seconds() {
@@ -360,15 +338,8 @@ mod tests {
        assert_eq!(c.get_depth(&args), 5);
    }
-    fn get_args(args: Vec<&str>) -> ArgMatches {
+    fn get_args(args: Vec<&str>) -> Cli {
-        Command::new("Dust")
+        Cli::parse_from(args)
            .arg(
                Arg::new("depth")
                    .long("depth")
                    .num_args(1)
                    .value_parser(value_parser!(usize)),
            )
            .get_matches_from(args)
    }
    #[test]
@@ -406,20 +377,7 @@ mod tests {
        assert_eq!(c.get_filetime(&args), Some(FileTime::Changed));
    }
-    fn get_filetime_args(args: Vec<&str>) -> ArgMatches {
+    fn get_filetime_args(args: Vec<&str>) -> Cli {
-        Command::new("Dust")
+        Cli::parse_from(args)
        .arg(
            Arg::new("filetime")
                .short('m')
                .long("filetime")
                .num_args(1)
                .value_parser([
                    PossibleValue::new("a").alias("accessed"),
                    PossibleValue::new("c").alias("changed"),
                    PossibleValue::new("m").alias("modified"),
                ])
                .help("Directory 'size' is max filetime of child files instead of disk size. while a/c/m for accessed/changed/modified time"),
        )
            .get_matches_from(args)
    }
 }
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -5,10 +5,10 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use crate::node::Node;
 use crate::progress::ORDERING;
 use crate::progress::Operation;
 use crate::progress::PAtomicInfo;
 use crate::progress::RuntimeErrors;
 use crate::progress::ORDERING;
 use crate::utils::is_filtered_out_due_to_file_time;
 use crate::utils::is_filtered_out_due_to_invert_regex;
 use crate::utils::is_filtered_out_due_to_regex;
@@ -125,9 +125,33 @@ fn sort_by_inode(a: &Node, b: &Node) -> std::cmp::Ordering {
    }
 }
 // Check if `path` is inside ignored directory
 fn is_ignored_path(path: &Path, walk_data: &WalkData) -> bool {
    if walk_data.ignore_directories.contains(path) {
        return true;
    }
    // Entry is inside an ignored absolute path
    // Absolute paths should be canonicalized before being added to `WalkData.ignore_directories`
    for ignored_path in walk_data.ignore_directories.iter() {
        if !ignored_path.is_absolute() {
            continue;
        }
        let absolute_entry_path = std::fs::canonicalize(path).unwrap_or_default();
        if absolute_entry_path.starts_with(ignored_path) {
            return true;
        }
    }
    false
 }
 fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
    if is_ignored_path(&entry.path(), walk_data) {
        return true;
    }
    let is_dot_file = entry.file_name().to_str().unwrap_or("").starts_with('.');
    let is_ignored_path = walk_data.ignore_directories.contains(&entry.path());
    let follow_links = walk_data.follow_links && entry.file_type().is_ok_and(|ft| ft.is_symlink());
    if !walk_data.allowed_filesystems.is_empty() {
@@ -175,17 +199,13 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
        return true;
    }
-    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
+    is_dot_file && walk_data.ignore_hidden
 }
 fn walk(dir: PathBuf, walk_data: &WalkData, depth: usize) -> Option<Node> {
    let prog_data = &walk_data.progress_data;
    let errors = &walk_data.errors;
    if errors.lock().unwrap().abort {
        return None;
    }
    let children = if dir.is_dir() {
        let read_dir = fs::read_dir(&dir);
        match read_dir {
@@ -284,9 +304,10 @@ fn handle_error_and_retry(failed: &Error, dir: &Path, walk_data: &WalkData) -> b
            editable_error.file_not_found.insert(failed.to_string());
        }
        std::io::ErrorKind::Interrupted => {
            let mut editable_error = walk_data.errors.lock().unwrap();
            editable_error.interrupted_error += 1;
-            if editable_error.interrupted_error > 3 {
+            // This does happen on some systems. It was set to 3 but sometimes dust runs would exceed this
            // However, if there is no limit this results in infinite retrys and dust never finishes
            if editable_error.interrupted_error > 999 {
                panic!("Multiple Interrupted Errors occurred while scanning filesystem. Aborting");
            } else {
                return true;
--- a/src/display.rs
+++ b/src/display.rs
@@ -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;
+use std::iter::repeat_n;
 use std::path::Path;
 use thousands::Separable;
@@ -71,11 +71,7 @@ impl DisplayData {
    fn percent_size(&self, node: &DisplayNode) -> f32 {
        let result = node.size as f32 / self.base_size as f32;
-        if result.is_normal() {
+        if result.is_normal() { result } else { 0.0 }
            result
        } else {
            0.0
        }
    }
 }
@@ -129,9 +125,9 @@ impl DrawData<'_> {
 pub fn draw_it(
    idd: InitialDisplayData,
    root_node: &DisplayNode,
    no_percent_bars: bool,
    terminal_width: usize,
    root_node: &DisplayNode,
    skip_total: bool,
 ) {
    let num_chars_needed_on_left_most = if idd.by_filecount {
@@ -159,7 +155,7 @@ pub fn draw_it(
        allowed_width - longest_string_length - 7
    };
-    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
+    let first_size_bar = repeat_n(BLOCKS[0], max_bar_length).collect();
    let display_data = DisplayData {
        initial: idd,
@@ -302,12 +298,9 @@ fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &Display
    );
    // Add spaces after the filename so we can draw the % used bar chart.
-    let name_and_padding = name
+    name + " "
-        + " "
+        .repeat(display_data.longest_string_length - width)
-            .repeat(display_data.longest_string_length - width)
+        .as_str()
            .as_str();
    name_and_padding
 }
 fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
@@ -598,7 +591,7 @@ mod tests {
            size: 2_u64.pow(size),
            children: vec![],
        };
-        let first_size_bar = repeat(BLOCKS[0]).take(13).collect();
+        let first_size_bar = repeat_n(BLOCKS[0], 13).collect();
        let dd = DrawData {
            indent: "".into(),
            percent_bar: first_size_bar,
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -25,16 +25,14 @@ pub fn get_biggest(
    display_data: AggregateData,
    by_filetime: &Option<FileTime>,
    keep_collapsed: HashSet<PathBuf>,
-) -> Option<DisplayNode> {
+) -> DisplayNode {
    if top_level_nodes.is_empty() {
        // perhaps change this, bring back Error object?
        return None;
    }
    let mut heap = BinaryHeap::new();
    let number_top_level_nodes = top_level_nodes.len();
    let root;
-    if number_top_level_nodes > 1 {
+    if number_top_level_nodes == 0 {
        root = total_node_builder(0, vec![])
    } else if number_top_level_nodes > 1 {
        let size = if by_filetime.is_some() {
            top_level_nodes
                .iter()
@@ -46,28 +44,24 @@ 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);
    }
-    Some(fill_remaining_lines(
+    fill_remaining_lines(heap, &root, display_data, keep_collapsed)
-        heap,
+}
-        &root,
+
-        display_data,
+fn total_node_builder(size: u64, children: Vec<Node>) -> Node {
-        keep_collapsed,
+    Node {
-    ))
+        name: PathBuf::from("(total)"),
        size,
        children,
        inode_device: None,
        depth: 0,
    }
 }
 pub fn fill_remaining_lines<'a>(
--- a/src/filter_type.rs
+++ b/src/filter_type.rs
@@ -15,7 +15,7 @@ pub fn get_all_file_types(
    top_level_nodes: &[Node],
    n: usize,
    by_filetime: &Option<FileTime>,
-) -> Option<DisplayNode> {
+) -> DisplayNode {
    let ext_nodes = {
        let mut extension_cumulative_sizes = HashMap::new();
        build_by_all_file_types(top_level_nodes, &mut extension_cumulative_sizes);
@@ -67,13 +67,11 @@ pub fn get_all_file_types(
        displayed.iter().map(|node| node.size).sum()
    };
-    let result = DisplayNode {
+    DisplayNode {
        name: PathBuf::from("(total)"),
        size: actual_size,
        children: displayed,
-    };
+    }
    Some(result)
 }
 fn build_by_all_file_types<'a>(
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,9 +10,11 @@ mod platform;
 mod progress;
 mod utils;
-use crate::cli::build_cli;
+use crate::cli::Cli;
 use crate::config::Config;
 use crate::display_node::DisplayNode;
 use crate::progress::RuntimeErrors;
-use clap::parser::ValuesRef;
+use clap::Parser;
 use dir_walker::WalkData;
 use display::InitialDisplayData;
 use filter::AggregateData;
@@ -24,11 +26,10 @@ use std::fs::read_to_string;
 use std::io;
 use std::panic;
 use std::process;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::Mutex;
 use sysinfo::{System, SystemExt};
 use utils::canonicalize_absolute_path;
 use self::display::draw_it;
 use config::get_config;
@@ -39,7 +40,7 @@ use filter_type::get_all_file_types;
 use regex::Regex;
 use std::cmp::max;
 use std::path::PathBuf;
-use terminal_size::{terminal_size, Height, Width};
+use terminal_size::{Height, Width, terminal_size};
 use utils::get_filesystem_devices;
 use utils::simplify_dir_names;
@@ -99,9 +100,10 @@ fn get_width_of_terminal() -> usize {
        .unwrap_or(DEFAULT_TERMINAL_WIDTH)
 }
-fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
+fn get_regex_value(maybe_value: Option<&Vec<String>>) -> Vec<Regex> {
    maybe_value
-        .unwrap_or_default()
+        .unwrap_or(&Vec::new())
        .iter()
        .map(|reg| {
            Regex::new(reg).unwrap_or_else(|err| {
                eprintln!("Ignoring bad value for regex {err:?}");
@@ -112,26 +114,19 @@ fn get_regex_value(maybe_value: Option<ValuesRef<String>>) -> Vec<Regex> {
 }
 fn main() {
-    let options = build_cli().get_matches();
+    let options = Cli::parse();
-    let config = get_config(options.get_one::<String>("config").cloned());
+    let config = get_config(options.config.as_ref());
    let errors = RuntimeErrors::default();
    let error_listen_for_ctrlc = Arc::new(Mutex::new(errors));
    let errors_for_rayon = error_listen_for_ctrlc.clone();
    let errors_final = error_listen_for_ctrlc.clone();
    let is_in_listing = Arc::new(AtomicBool::new(false));
    let cloned_is_in_listing = Arc::clone(&is_in_listing);
    ctrlc::set_handler(move || {
        error_listen_for_ctrlc.lock().unwrap().abort = true;
        println!("\nAborting");
-        if cloned_is_in_listing.load(Ordering::Relaxed) {
+        process::exit(1);
            process::exit(1);
        }
    })
    .expect("Error setting Ctrl-C handler");
    is_in_listing.store(true, Ordering::Relaxed);
    let target_dirs = match config.get_files_from(&options) {
        Some(path) => {
            if path == "-" {
@@ -156,20 +151,19 @@ fn main() {
                }
            }
        }
-        None => match options.get_many::<String>("params") {
+        None => match options.params {
-            Some(values) => values.cloned().collect(),
+            Some(ref values) => values.clone(),
            None => vec![".".to_owned()],
        },
    };
    is_in_listing.store(false, Ordering::Relaxed);
-    let summarize_file_types = options.get_flag("types");
+    let summarize_file_types = options.file_types;
-    let filter_regexs = get_regex_value(options.get_many("filter"));
+    let filter_regexs = get_regex_value(options.filter.as_ref());
-    let invert_filter_regexs = get_regex_value(options.get_many("invert_filter"));
+    let invert_filter_regexs = get_regex_value(options.invert_filter.as_ref());
-    let terminal_width: usize = match options.get_one::<usize>("width") {
+    let terminal_width: usize = match options.terminal_width {
-        Some(&val) => val,
+        Some(val) => val,
        None => get_width_of_terminal(),
    };
@@ -178,8 +172,8 @@ fn main() {
    // If depth is set, then we set the default number_of_lines to be max
    // instead of screen height
-    let number_of_lines = match options.get_one::<usize>("number_of_lines") {
+    let number_of_lines = match options.number_of_lines {
-        Some(&val) => val,
+        Some(val) => val,
        None => {
            if depth != usize::MAX {
                usize::MAX
@@ -194,16 +188,17 @@ fn main() {
        config.get_force_colors(&options),
    );
-    let ignore_directories = match options.get_many::<String>("ignore_directory") {
+    let ignore_directories = match options.ignore_directory {
-        Some(values) => values
+        Some(ref values) => values
-            .map(|v| v.as_str())
+            .iter()
            .map(PathBuf::from)
            .map(canonicalize_absolute_path)
            .collect::<Vec<PathBuf>>(),
        None => vec![],
    };
-    let ignore_from_file_result = match options.get_one::<String>("ignore_all_in_file") {
+    let ignore_from_file_result = match options.ignore_all_in_file {
-        Some(val) => read_to_string(val)
+        Some(ref val) => read_to_string(val)
            .unwrap()
            .lines()
            .map(Regex::new)
@@ -220,14 +215,17 @@ fn main() {
        .chain(ignore_from_file)
        .collect::<Vec<Regex>>();
-    let by_filecount = options.get_flag("by_filecount");
+    let by_filecount = options.filecount;
    let by_filetime = config.get_filetime(&options);
-    let limit_filesystem = options.get_flag("limit_filesystem");
+    let limit_filesystem = options.limit_filesystem;
-    let follow_links = options.get_flag("dereference_links");
+    let follow_links = options.dereference_links;
    let allowed_filesystems = if limit_filesystem {
        get_filesystem_devices(&target_dirs, follow_links)
    } else {
        Default::default()
    };
    let allowed_filesystems = limit_filesystem
        .then(|| get_filesystem_devices(&target_dirs, follow_links))
        .unwrap_or_default();
    let simplified_dirs = simplify_dir_names(&target_dirs);
    let ignored_full_path: HashSet<PathBuf> = ignore_directories
@@ -244,8 +242,8 @@ fn main() {
        indicator.spawn(output_format.clone())
    }
-    let keep_collapsed: HashSet<PathBuf> = match options.get_many::<String>("collapse") {
+    let keep_collapsed: HashSet<PathBuf> = match options.collapse {
-        Some(collapse) => {
+        Some(ref collapse) => {
            let mut combined_dirs = HashSet::new();
            for collapse_dir in collapse {
                for target_dir in target_dirs.iter() {
@@ -277,36 +275,94 @@ 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);
-    let top_level_nodes = walk_it(simplified_dirs, &walk_data);
+    init_rayon(&stack_size, &threads_to_use).install(|| {
        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, &by_filetime),
+            true => get_all_file_types(&top_level_nodes, number_of_lines, walk_data.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(top_level_nodes, agg_data, &by_filetime, keep_collapsed)
+                get_biggest(
                    top_level_nodes,
                    agg_data,
                    walk_data.by_filetime,
                    keep_collapsed,
                )
            }
        };
        // Must have stopped indicator before we print to stderr
        indicator.stop();
        let print_errors = config.get_print_errors(&options);
        let final_errors = walk_data.errors.lock().unwrap();
        print_any_errors(print_errors, &final_errors);
        if tree.children.is_empty() && !final_errors.file_not_found.is_empty() {
            std::process::exit(1)
        } else {
            print_output(
                config,
                options,
                tree,
                walk_data.by_filecount,
                is_colors,
                terminal_width,
            )
        }
-    };
+    });
 }
-    // Must have stopped indicator before we print to stderr
+fn print_output(
-    indicator.stop();
+    config: Config,
    options: Cli,
    tree: DisplayNode,
    by_filecount: bool,
    is_colors: bool,
    terminal_width: usize,
 ) {
    let output_format = config.get_output_format(&options);
-    if errors_final.lock().unwrap().abort {
+    if config.get_output_json(&options) {
-        return;
+        OUTPUT_TYPE.with(|wrapped| {
            wrapped.replace(output_format);
        });
        println!("{}", serde_json::to_string(&tree).unwrap());
    } else {
        let idd = InitialDisplayData {
            short_paths: !config.get_full_paths(&options),
            is_reversed: !config.get_reverse(&options),
            colors_on: is_colors,
            by_filecount,
            by_filetime: 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),
        )
    }
 }
-    let final_errors = walk_data.errors.lock().unwrap();
+fn print_any_errors(print_errors: bool, final_errors: &RuntimeErrors) {
    if !final_errors.file_not_found.is_empty() {
        let err = final_errors
            .file_not_found
@@ -314,17 +370,17 @@ fn main() {
            .map(|a| a.as_ref())
            .collect::<Vec<&str>>()
            .join(", ");
-        eprintln!("No such file or directory: {}", err);
+        eprintln!("No such file or directory: {err}");
    }
    if !final_errors.no_permissions.is_empty() {
-        if config.get_print_errors(&options) {
+        if print_errors {
            let err = final_errors
                .no_permissions
                .iter()
                .map(|a| a.as_ref())
                .collect::<Vec<&str>>()
                .join(", ");
-            eprintln!("Did not have permissions for directories: {}", err);
+            eprintln!("Did not have permissions for directories: {err}");
        } else {
            eprintln!(
                "Did not have permissions for all directories (add --print-errors to see errors)"
@@ -338,76 +394,58 @@ fn main() {
            .map(|a| a.as_ref())
            .collect::<Vec<&str>>()
            .join(", ");
-        eprintln!("Unknown Error: {}", err);
+        eprintln!("Unknown Error: {err}");
    }
    if let Some(root_node) = tree {
        if config.get_output_json(&options) {
            OUTPUT_TYPE.with(|wrapped| {
                wrapped.replace(output_format);
            });
            println!("{}", serde_json::to_string(&root_node).unwrap());
        } else {
            let idd = InitialDisplayData {
                short_paths: !config.get_full_paths(&options),
                is_reversed: !config.get_reverse(&options),
                colors_on: is_colors,
                by_filecount,
                by_filetime,
                is_screen_reader: config.get_screen_reader(&options),
                output_format,
                bars_on_right: config.get_bars_on_right(&options),
            };
            draw_it(
                idd,
                config.get_no_bars(&options),
                terminal_width,
                &root_node,
                config.get_skip_total(&options),
            )
        }
    }
 }
-fn init_rayon(stack_size: &Option<usize>, threads: &Option<usize>) {
+fn init_rayon(stack: &Option<usize>, threads: &Option<usize>) -> rayon::ThreadPool {
-    // Rayon seems to raise this error on 32-bit builds
+    let stack_size = match stack {
-    // The global thread pool has not been initialized.: ThreadPoolBuildError { kind: GlobalPoolAlreadyInitialized }
+        Some(s) => Some(*s),
-    if cfg!(target_pointer_width = "64") {
+        None => {
-        let result = panic::catch_unwind(|| build_thread_pool(*stack_size, *threads));
+            // Do not increase the stack size on a 32 bit system, it will fail
-        if result.is_err() {
+            if cfg!(target_pointer_width = "32") {
-            eprintln!("Problem initializing rayon, try: export RAYON_NUM_THREADS=1")
+                None
            } 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: Option<usize>,
+    stack_size: Option<usize>,
-    threads: Option<usize>,
+    threads: &Option<usize>,
-) -> Result<(), rayon::ThreadPoolBuildError> {
+) -> Result<rayon::ThreadPool, rayon::ThreadPoolBuildError> {
-    let mut pool = rayon::ThreadPoolBuilder::new();
+    let mut pool_builder = rayon::ThreadPoolBuilder::new();
    if let Some(thread_count) = threads {
        pool = pool.num_threads(thread_count);
    }
    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_builder = pool_builder.stack_size(stack_size_param);
    }
-    pool.build_global()
+    if let Some(thread_count) = threads {
        pool_builder = pool_builder.num_threads(*thread_count);
    }
    pool_builder.build()
 }
--- a/src/node.rs
+++ b/src/node.rs
@@ -23,6 +23,16 @@ pub enum FileTime {
    Changed,
 }
 impl From<crate::cli::FileTime> for FileTime {
    fn from(time: crate::cli::FileTime) -> Self {
        match time {
            crate::cli::FileTime::Modified => Self::Modified,
            crate::cli::FileTime::Accessed => Self::Accessed,
            crate::cli::FileTime::Changed => Self::Changed,
        }
    }
 }
 #[allow(clippy::too_many_arguments)]
 pub fn build_node(
    dir: PathBuf,
@@ -48,9 +58,9 @@ pub fn build_node(
            || is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &dir)
            || by_filecount && !is_file
            || [
-                (&walk_data.filter_modified_time, data.2 .0),
+                (&walk_data.filter_modified_time, data.2.0),
-                (&walk_data.filter_accessed_time, data.2 .1),
+                (&walk_data.filter_accessed_time, data.2.1),
-                (&walk_data.filter_changed_time, data.2 .2),
+                (&walk_data.filter_changed_time, data.2.2),
            ]
            .iter()
            .any(|(filter_time, actual_time)| {
@@ -61,9 +71,9 @@ pub fn build_node(
            1
        } else if by_filetime.is_some() {
            match by_filetime {
-                Some(FileTime::Modified) => data.2 .0.unsigned_abs(),
+                Some(FileTime::Modified) => data.2.0.unsigned_abs(),
-                Some(FileTime::Accessed) => data.2 .1.unsigned_abs(),
+                Some(FileTime::Accessed) => data.2.1.unsigned_abs(),
-                Some(FileTime::Changed) => data.2 .2.unsigned_abs(),
+                Some(FileTime::Changed) => data.2.2.unsigned_abs(),
                None => unreachable!(),
            }
        } else {
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -27,15 +27,32 @@ pub fn get_metadata<P: AsRef<Path>>(
    };
    match metadata {
        Ok(md) => {
            let file_size = md.len();
            if use_apparent_size {
                Some((
-                    md.len(),
+                    file_size,
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
            } else {
                // On NTFS mounts, the reported block count can be unexpectedly large.
                // To avoid overestimating disk usage, cap the allocated size to what the
                // file should occupy based on the file system I/O block size (blksize).
                // Related: https://github.com/bootandy/dust/issues/295
                let blksize = md.blksize();
                let target_size = file_size.div_ceil(blksize) * blksize;
                let reported_size = md.blocks() * get_block_size();
                // File systems can pre-allocate more space for a file than what would be necessary
                let pre_allocation_buffer = blksize * 65536;
                let max_size = target_size + pre_allocation_buffer;
                let allocated_size = if reported_size > max_size {
                    target_size
                } else {
                    reported_size
                };
                Some((
-                    md.blocks() * get_block_size(),
+                    allocated_size,
                    Some((md.ino(), md.dev())),
                    (md.mtime(), md.atime(), md.ctime()),
                ))
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -3,9 +3,9 @@ use std::{
    io::Write,
    path::Path,
    sync::{
        Arc, RwLock,
        atomic::{AtomicU8, AtomicUsize, Ordering},
        mpsc::{self, RecvTimeoutError, Sender},
        Arc, RwLock,
    },
    thread::JoinHandle,
    time::Duration,
@@ -79,7 +79,6 @@ pub struct RuntimeErrors {
    pub file_not_found: HashSet<String>,
    pub unknown_error: HashSet<String>,
    pub interrupted_error: i32,
    pub abort: bool,
 }
 /* -------------------------------------------------------------------------- */
@@ -119,7 +118,7 @@ impl PIndicator {
        let time_info_thread = std::thread::spawn(move || {
            let mut progress_char_i: usize = 0;
-            let mut stdout = std::io::stdout();
+            let mut stderr = std::io::stderr();
            let mut msg = "".to_string();
            // While the timeout triggers we go round the loop
@@ -128,7 +127,8 @@ impl PIndicator {
                receiver.recv_timeout(Duration::from_millis(SPINNER_SLEEP_TIME))
            {
                // Clear the text written by 'write!'& Return at the start of line
-                print!("\r{:width$}", " ", width = msg.len());
+                let clear = format!("\r{:width$}", " ", width = msg.len());
                write!(stderr, "{clear}").unwrap();
                let prog_char = PROGRESS_CHARS[progress_char_i];
                msg = match data.state.load(ORDERING) {
@@ -137,15 +137,17 @@ impl PIndicator {
                    _ => panic!("Unknown State"),
                };
-                write!(stdout, "\r{msg}").unwrap();
+                write!(stderr, "\r{msg}").unwrap();
-                stdout.flush().unwrap();
+                stderr.flush().unwrap();
                progress_char_i += 1;
                progress_char_i %= PROGRESS_CHARS_LEN;
            }
-            print!("\r{:width$}", " ", width = msg.len());
+
-            print!("\r");
+            let clear = format!("\r{:width$}", " ", width = msg.len());
-            stdout.flush().unwrap();
+            write!(stderr, "{clear}").unwrap();
            write!(stderr, "\r").unwrap();
            stderr.flush().unwrap();
        });
        self.thread = Some((stop_handler, time_info_thread))
    }
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -67,6 +67,17 @@ pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
    path.as_ref().components().collect()
 }
 // Canonicalize the path only if it is an absolute path
 pub fn canonicalize_absolute_path(path: PathBuf) -> PathBuf {
    if !path.is_absolute() {
        return path;
    }
    match std::fs::canonicalize(&path) {
        Ok(canonicalized_path) => canonicalized_path,
        Err(_) => path,
    }
 }
 pub fn is_filtered_out_due_to_regex(filter_regex: &[Regex], dir: &Path) -> bool {
    if filter_regex.is_empty() {
        false
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -10,6 +10,9 @@ use std::str;
 fn build_command<T: AsRef<OsStr>>(command_args: Vec<T>) -> String {
    let mut cmd = &mut Command::cargo_bin("dust").unwrap();
    // Hide progress bar
    cmd = cmd.arg("-P");
    for p in command_args {
        cmd = cmd.arg(p);
    }
@@ -59,6 +62,14 @@ 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/"]);
@@ -96,7 +107,9 @@ pub fn test_ignore_all_in_file() {
 #[test]
 pub fn test_with_bad_param() {
    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let result = cmd.arg("bad_place").unwrap();
+    cmd.arg("-P").arg("bad_place");
    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"));
 }
Author	SHA1	Message	Date
andy.boot	4e83421da6	version: increment version	2025-07-31 22:33:44 +01:00
andy.boot	901bc3895a	feat: Return 1 if no dirs are found A better error code	2025-07-31 22:33:44 +01:00
andy.boot	3cce61f854	tests: add test for d0 Test to stop bug in previous commit occuring Also cargo clippy	2025-07-28 22:35:40 +01:00
Yip Coekjan	222cd83ff3	Fix multi-paths output when `depth` is `0`	2025-07-28 22:15:34 +01:00
andy.boot	76b9f32859	release: increment version	2025-07-06 09:46:33 +01:00
andy.boot	17662e8ff1	refactor: ThreadPool use build not build_global (#512 ) Dangerous: Change how threadpool initialized	2025-07-06 09:42:02 +01:00
andy.boot	9cc557cada	docs: update readme Improve description of -f, by default this counts by inode, Use -f -s to count files and include duplicate inodes.	2025-07-05 15:34:08 +01:00
andy.boot	81722b695d	fix: dir_walker interrupted error (#507 ) * fix: dir_walker interrupted error Ignore and continue if we get many interrupted errors instead of panicing on 3. This is from user feedback who reported occasional panics from too many interrupted errors https://github.com/bootandy/dust/issues/495#issuecomment-3026673312 * Revert "fix: dir_walker interrupted error" This reverts commit `84fa0ea9a4`. * fix: interrupted error, set limit to 999 instead.	2025-07-05 10:01:10 +01:00
andy.boot	51dc167345	deps: cargo update (#510 ) * hack * Revert "hack" This reverts commit d51c5b890439ec5ea46a10454801f9ca3593afca. * deps: upgrade	2025-07-05 09:42:26 +01:00
andy.boot	9b5f6d6c5a	style: fix clippy	2025-07-02 18:53:24 +01:00
andy.boot	74ffd78901	refactor: pull out more methods, remove unused Option	2025-06-06 20:44:00 +01:00
andy.boot	9b2dc4655d	refactor: extract function	2025-06-04 20:57:57 +01:00
andy.boot	29441eda19	version: increment version	2025-06-04 20:07:23 +01:00
andy.boot	e6f90362a7	fix: bug: Remove bad error handling This may be causing dust to lock up as we were accidentally creating a second editable_error causing threads to lock. https://github.com/bootandy/dust/issues/495	2025-06-04 19:55:50 +01:00
Shun Sakai	702f0f0fe9	chore(cli): Migrate to Derive API Change the definition of CLI from the Builder API to the Derive API.	2025-05-16 22:09:27 +01:00
andy.boot	6a14d7e8b3	style: Fix clippy New clippy has new standards. Clean up get_metadata by removing unused return	2025-04-20 19:55:36 +01:00
Teemu Pätsi	4e2d93f362	refactor: Fix clippy warnings (#488 ) * refactor: Use `repeat_n` instead of `repeat` and `take` Fixes `clippy::manual_repeat_n` * refactor: Remove unnecessary let binding	2025-04-20 18:48:11 +01:00
Teemu Pätsi	b616378ba0	Fix: miscalculation of NTFS mount file sizes inside WSL (#487 ) * fix: Limit file size based on the file system I/O block size * fix: Take possible file pre-allocation into account * refactor: Reduce indenting with early return * refactor: Fix clippy::manual_div_ceil * fix: Use target_size instead of max_size * fix: Take possible pre-allocation for a file into account https://github.com/bootandy/dust/pull/487#issuecomment-2816885444	2025-04-20 08:50:09 +01:00
andy.boot	646cdd976d	release: increment version (#485 )	2025-04-01 23:19:59 +01:00
andy.boot	9a49221ac1	fix: status mesages go to stderr not stdout (#483 ) Progress spinner and status line are written to stderr instead of stdout. No longer any need to detect if stdout is being redirected.	2025-04-01 23:19:36 +01:00
andy.boot	1b4116e39d	fix: all arguments now use '-' instead of '_' (#484 ) * cli: unify long arguments (dashes instead of underscores) * completions: autoregen completions --------- Co-authored-by: Pavel Kulyov <kulyov.pavel@gmail.com>	2025-04-01 23:18:49 +01:00
Aidan Beggs	733abb2a3f	feat: Abort immedietly when ^C is received. (#478 ) Previously, we attempted to perform a clean shutdown, which could take a significant period of time on slow filesystems. This commit changes the shutdown logic to abort immedietly when ^C is received by the program.	2025-03-30 17:35:28 +01:00
andy.boot	dd799706fb	deps: cargo update (#474 ) * deps: cargo update * deps: Update edition 2024 and run cargo update	2025-03-11 00:38:38 +00:00
Teemu Pätsi	b219981c52	rewrite: Reduce indentation with guard clause	2025-03-10 21:25:13 +00:00
Teemu Pätsi	c31468b199	perf: Canonicalize ignored absolute path only once	2025-03-10 21:25:13 +00:00
Teemu Pätsi	28d409ea27	refactor: Extract is_ignored_path function	2025-03-10 21:25:13 +00:00
Teemu Pätsi	aa319e3599	perf: Do not canonicalize non-absolute ignored path	2025-03-10 21:25:13 +00:00
Teemu Pätsi	c2a4c4573a	fix: Ignoring absolute path with `-X` option	2025-03-10 21:25:13 +00:00
andy.boot	d876cc28a7	release: Increment version	2025-02-27 22:08:38 +00:00
andy.boot	137e366eca	feat: Handle duplicate dir names better If we run `dust /usr/*/Trash` We see several 'Trash' directories in the output but do not know which user they belong to. This fix means if we see duplicate names in a directory we will display the parent directory name as well	2025-02-20 22:08:06 +00:00