Increment version number

Refactor tests
Make use of the 'is' more to test the entire output. Add test for no_color mode. Replace several calls to format_string with calls that build a string directly. I feel format_string is becoming unweildly and this simplfies the tests
2026-06-08 11:29:05 +03:00 · 2019-12-08 23:36:48 +00:00 · 2019-12-08 23:34:28 +00:00 · 2019-12-08 14:46:45 +00:00 · 2019-12-07 09:16:51 +00:00 · 2019-12-05 21:51:04 +00:00
17 changed files with 1145 additions and 627 deletions
@@ -5,3 +5,5 @@
 # These are backup files generated by rustfmt
 **/*.rs.bk
 *.swp
 .vscode/*
 *.idea/*
@@ -1,6 +1,12 @@
 # Based on the "trust" template v0.1.2
 # https://github.com/japaric/trust/tree/v0.1.2
 # ----------- To do a release ---------
 # tag a commit and push:
 #   git tag v0.4.0.1
 #   git push origin v0.4.0.1
 # Remember to do a cargo publish to put it in crates.io
 dist: trusty
 language: rust
 services: docker
@@ -46,8 +52,9 @@ deploy:
  # - Create a `public_repo` GitHub token. Go to: https://github.com/settings/tokens/new
  # - Encrypt it: `travis encrypt 0123456789012345678901234567890123456789
  # - Paste the output down here
-  api_key:
+#  api_key:
-    secure: UlU73Td7Bkb2N88ws4YGLWR+4U0IMgiou9QQtMnmpouJFjeUNxtLSPMPODVXP7zq4sKt5HR5B3fX9MW4mKm351fvnQEoihETn06pKiXGnY//SlTPTt67MX9ZOYmd9ohJReMDOZDgqhnGLxfymycGtsLAmdjDZnAl+IMqgg0FMyVFj9Cl9aKxnn12lxQyX4zabHKk8TUKD3By8ZoEUnJMHt3gEtOmbDgS4brcTPeHCzqnYFw73LEnkqvz+JP0XwauJY7Cf8lminKm/klmjCkQji8T9SHI52v1g0Fxpx0ucp2o3vulQrLHXaHvZ6Fr7J0cSXXzaFF3rrGLt4t4jU/+9TZm1+n5k5XuPW4x4NTCC9NmIj/z0/z41t82E9qZhzhtm2Jdsg6H2tNk+C774TYqcmR6GCvfRadfjRp3cA5dh0UwDVjH2MJFxlHDVkl6la0mVVRsCGF3oBKZVk0BDl1womfnmI46o/uU+gLknHN6Ed6PHHPPYDViWd3VKdmHKT7XrkMMUF6HjZUtla689DWIOWZSiV++1dVPcl/1TV+6tTmN4bBtPcLuX7SHRuLp2PI2kATvRMECsa7gZRypW4jKpVn7b2yetX9TVI3i1zR5zkQJ3dPg8sATvYPL53aKH/WsqUg4rzoAlbk9so+++R4bQY69LhV3B511B7EAynoZFdM
+#    secure: UlU73Td7Bkb2N88ws4YGLWR+4U0IMgiou9QQtMnmpouJFjeUNxtLSPMPODVXP7zq4sKt5HR5B3fX9MW4mKm351fvnQEoihETn06pKiXGnY//SlTPTt67MX9ZOYmd9ohJReMDOZDgqhnGLxfymycGtsLAmdjDZnAl+IMqgg0FMyVFj9Cl9aKxnn12lxQyX4zabHKk8TUKD3By8ZoEUnJMHt3gEtOmbDgS4brcTPeHCzqnYFw73LEnkqvz+JP0XwauJY7Cf8lminKm/klmjCkQji8T9SHI52v1g0Fxpx0ucp2o3vulQrLHXaHvZ6Fr7J0cSXXzaFF3rrGLt4t4jU/+9TZm1+n5k5XuPW4x4NTCC9NmIj/z0/z41t82E9qZhzhtm2Jdsg6H2tNk+C774TYqcmR6GCvfRadfjRp3cA5dh0UwDVjH2MJFxlHDVkl6la0mVVRsCGF3oBKZVk0BDl1womfnmI46o/uU+gLknHN6Ed6PHHPPYDViWd3VKdmHKT7XrkMMUF6HjZUtla689DWIOWZSiV++1dVPcl/1TV+6tTmN4bBtPcLuX7SHRuLp2PI2kATvRMECsa7gZRypW4jKpVn7b2yetX9TVI3i1zR5zkQJ3dPg8sATvYPL53aKH/WsqUg4rzoAlbk9so+++R4bQY69LhV3B511B7EAynoZFdM
  api_key: $API_KEY
  file_glob: true
  file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
  on:
@@ -1,9 +1,11 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -11,102 +13,171 @@ name = "assert_cli"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "skeptic 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "skeptic 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "atty"
-version = "0.2.8"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "autocfg"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "backtrace"
-version = "0.3.5"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "backtrace-sys"
-version = "0.1.16"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "bitflags"
-version = "0.9.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "bitflags"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "bytecount"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
-name = "cargo_metadata"
+name = "c2-chacha"
-version = "0.3.3"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
- "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+
- "serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+[[package]]
- "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+name = "cargo_metadata"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cc"
-version = "1.0.9"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "cfg-if"
-version = "0.1.2"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "clap"
-version = "2.31.1"
+version = "2.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "colored"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-channel"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-epoch"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-queue"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-utils"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -114,21 +185,22 @@ name = "difference"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "dtoa"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "du-dust"
-version = "0.2.4"
+version = "0.4.2"
 dependencies = [
 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.31.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jwalk 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "environment"
 version = "0.1.1"
@@ -139,133 +211,259 @@ name = "error-chain"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
-name = "fuchsia-zircon"
+name = "error-chain"
-version = "0.3.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
-name = "fuchsia-zircon-sys"
+name = "fuchsia-cprng"
-version = "0.3.3"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "getrandom"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "glob"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "hermit-abi"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "itoa"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
-name = "kernel32-sys"
+name = "jwalk"
-version = "0.2.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "lazy_static"
-version = "0.2.11"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.39"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
-name = "num-traits"
+name = "memoffset"
-version = "0.2.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "num_cpus"
 version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "ppv-lite86"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro2"
-version = "0.3.2"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "pulldown-cmark"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "quote"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rand"
-version = "0.4.2"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rand"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rand_chacha"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rand_core"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rand_core"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rayon"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rayon-core"
 version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "redox_syscall"
-version = "0.1.37"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "redox_termios"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "remove_dir_all"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "rustc-demangle"
-version = "0.1.7"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "ryu"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "same-file"
-version = "0.1.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "scopeguard"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "semver"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -275,68 +473,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "serde"
-version = "1.0.37"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "serde_derive"
-version = "1.0.37"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_derive_internals"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_json"
-version = "1.0.13"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "skeptic"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytecount 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytecount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cargo_metadata 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "strsim"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "0.13.1"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -344,89 +531,88 @@ name = "tempdir"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "tempfile"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 [[package]]
 name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "textwrap"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "unicode-width"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "unicode-xid"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "vec_map"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "walkdir"
-version = "1.0.7"
+version = "2.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
-name = "winapi"
+name = "wasi"
-version = "0.2.8"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "winapi"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "winapi-util"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -435,57 +621,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [metadata]
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72342c21057a3cb5f7c2d849bf7999a83795434dd36d74fa8c24680581bd1930"
-"checksum atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661"
+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bytecount 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "af27422163679dea46a1a7239dffff64d3dcdc3ba5fe9c49c789fbfe0eb949de"
+"checksum bytecount 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b92204551573580e078dc80017f36a213eb77a0450e4ddd8cfa0f3f2d1f0178f"
-"checksum cargo_metadata 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f56ec3e469bca7c276f2eea015aa05c5e381356febdbb0683c2580189604537"
+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-"checksum cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2b4911e4bdcb4100c7680e7e854ff38e23f1b34d4d9e079efae3da2801341ffc"
+"checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe"
-"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
-"checksum clap 2.31.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5dc18f6f4005132120d9711636b32c46a233fad94df6217fa1d81c5e97a9f200"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5"
 "checksum crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
 "checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
 "checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
 "checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
 "checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
-"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-"checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682"
+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+"checksum jwalk 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2b3dbf0a8f61baee43a2918ff50ac6a2d3b2c105bc08ed53bc298779f1263409"
-"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dee092fcdf725aee04dd7da1d21debff559237d49ef1cb3e69bcb8ece44c7364"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-"checksum proc-macro2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "681c2c8e039ff358cb926dbc5151d561cbd0249089986ace39dfe8e405bb7511"
+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdf85cda6cadfae5428a54661d431330b312bc767ddbc57adbedc24da66e32"
+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-"checksum quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0ff51282f28dc1b53fd154298feaa2e77c5ea0dba68e1fd8b03b72fbe13d2a"
+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
+"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
-"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
+"checksum pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eef52fac62d0ea7b9b4dc7da092aa64ea7ec3d90af6679422d3d7e0e14b6ee15"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum remove_dir_all 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfc5b3ce5d5ea144bb04ebd093a9e14e9765bcfec866aecda9b6dec43b3d1e24"
+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-"checksum rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11fb43a206a04116ffd7cfcf9bcb941f8eb6cc7ff667272246b0a1c74259a3cb"
+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-"checksum semver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bee2bc909ab2d8d60dab26e8cad85b25d795b14603a0dcb627b78b9d30b6454b"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 "checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd"
 "checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "d3bcee660dcde8f52c3765dd9ca5ee36b4bf35470a738eb0bd5a8752b0389645"
+"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
-"checksum serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "f1711ab8b208541fa8de00425f6a577d90f27bb60724d2bb5fd911314af9668f"
+"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
-"checksum serde_derive_internals 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89b340a48245bc03ddba31d0ff1709c118df90edc6adabaca4aac77aea181cce"
+"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
-"checksum serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5c508584d9913df116b91505eec55610a2f5b16e9ed793c46e4d0152872b3e74"
+"checksum skeptic 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fb8ed853fdc19ce09752d63f3a2e5b5158aeb261520cd75eb618bd60305165"
-"checksum skeptic 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c8431f8fca168e2db4be547bd8329eac70d095dff1444fee4b0fa0fabc7df75a"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
 "checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-"checksum tempfile 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "439d9a7c00f98b1b5ee730039bf5b1f9203d508690e3c76b509e7ad59f8f7c99"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-"checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
+"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
@@ -1,8 +1,9 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "0.2.4"
+version = "0.4.2"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
 edition = "2018"
 documentation = "https://github.com/bootandy/dust"
 homepage = "https://github.com/bootandy/dust"
@@ -20,8 +21,10 @@ name = "dust"
 path = "src/main.rs"
 [dependencies]
-ansi_term = "0.11"
+ansi_term = "=0.11"
-clap = "2.31"
+clap = "=2.33"
-assert_cli = "0.5"
+jwalk = "0.4"
 tempfile = "3"
 [dev-dependencies]
 assert_cli = "=0.5"
 tempfile = "=3"
@@ -1,58 +1,73 @@
 [![Build Status](https://travis-ci.org/bootandy/dust.svg?branch=master)](https://travis-ci.org/bootandy/dust)
 # Dust
 du + rust = dust. Like du but more intuitive
 ## Install
- * Download linux / mac binary from [Releases](https://github.com/bootandy/dust/releases)
+#### Cargo Install
- * unzip file: tar -xvf _downloaded_file.tar.gz_
+
- * move file to executable path: sudo mv dust /usr/local/bin/
+* cargo install du-dust
 #### Download Install
 * Download linux / mac binary from [Releases](https://github.com/bootandy/dust/releases)
 * unzip file: tar -xvf _downloaded_file.tar.gz_
 * move file to executable path: sudo mv dust /usr/local/bin/
 ## Overview
 Dust is meant to give you an instant overview of which directories are using disk space without requiring sort or head. Dust will print a maximum of 1 'Did not have permissions message'.
-Dust will list the 15 biggest sub directories or files and will smartly recurse down the tree to find the larger ones. There is no need for a '-d' flag or a '-h' flag. The largest sub directory will have its size shown in *red*
+Dust will list the 20 biggest sub directories or files and will smartly recurse down the tree to find the larger ones. There is no need for a '-d' flag or a '-h' flag. The largest sub directory will have its size shown in *red*
 ## Why?
-du has a number of ways of showing you what it finds, in terms of disk consumption, but really, there are only one or two ways you invoke it: with -h for “human readable” units, like 100G or 89k, or with -b for “bytes”. The former is generally used for a quick survey of a directory with a small number of things in it, and the latter for when you have a bunch and need to sort the output numerically, and you’re obligated to either further pass it into something like awk to turn bytes into the appropriate human-friendly unit like mega or gigabytes, or you just do some rough math in your head and use the ordering to sanity check. Then once you have the top offenders, you recurse down into the largest one and repeat the process until you’ve found your cruft or gems and can move on.
+
 du has a number of ways of showing you what it finds, in terms of disk consumption, but really, there are only one or two ways you invoke it: with -h for “human readable” units, like 100G or 89k, or with -b for “bytes”. The former is generally used for a quick survey of a directory with a small number of things in it, and the latter for when you have a bunch and need to sort the output numerically, and you’re obligated to either further pass it into something like awk to turn bytes into the appropriate human-friendly unit like mega or gigabytes, or pipe thru sort and head while remembering the '-h' flag. Then once you have the top offenders, you recurse down into the largest one and repeat the process until you’ve found your cruft or gems and can move on.
 Dust assumes that’s what you wanted to do in the first place, and takes care of tracking the largest offenders in terms of actual size, and showing them to you with human-friendly units and in-context within the filetree.
 ## Usage
 ```
 Usage: dust <dir>
 Usage: dust <dir>  <another_dir> <and_more>
 Usage: dust -p <dir>  (full-path - does not shorten the path of the subdirectories)
 Usage: dust -s <dir>  (apparent-size - shows the length of the file as opposed to the amount of disk space it uses)
-Usage: dust -n 30  <dir>  (Shows 30 directories not 15)
+Usage: dust -n 30  <dir>  (Shows 30 directories not 20)
 Usage: dust -d 3  <dir>  (Shows 3 levels of subdirectories)
 Usage: dust -r  <dir>  (Reverse order of output, with root at the lowest)
 ```
 ```
 djin:git/dust> dust
-  65M  .
+ 1.2G  target
-  65M └─┬ ./target
+ 622M ├─┬ debug
-  49M   ├─┬ ./target/debug
+ 445M │ ├── deps
-  26M   │ ├─┬ ./target/debug/deps
+  70M │ ├── incremental
-  21M   │ │ └── ./target/debug/deps/libclap-9e6625ac8ff074ad.rlib
+  56M │ └── build
-  13M   │ ├── ./target/debug/dust
+ 262M ├─┬ rls
- 8.9M   │ └─┬ ./target/debug/incremental
+ 262M │ └─┬ debug
- 6.7M   │   ├─┬ ./target/debug/incremental/dust-2748eiei2tcnp
+ 203M │   ├── deps
- 6.7M   │   │ └─┬ ./target/debug/incremental/dust-2748eiei2tcnp/s-ezd6jnik5u-163pyem-1aab9ncf5glum
+  56M │   └── build
- 3.0M   │   │   └── ./target/debug/incremental/dust-2748eiei2tcnp/s-ezd6jnik5u-163pyem-1aab9ncf5glum/dep-graph.bin
+ 165M ├─┬ package
- 2.2M   │   └─┬ ./target/debug/incremental/dust-1dlon65p8m3vl
+ 165M │ └─┬ du-dust-0.2.4
- 2.2M   │     └── ./target/debug/incremental/dust-1dlon65p8m3vl/s-ezd6jncecv-1xsnfd0-4dw9l1r2th2t
+ 165M │   └─┬ target
-  15M   └─┬ ./target/release
+ 165M │     └─┬ debug
- 9.2M     ├─┬ ./target/release/deps
+ 131M │       └── deps
- 6.7M     │ └── ./target/release/deps/libclap-87bc2534ea57f044.rlib
+ 165M └─┬ release
- 5.9M     └── ./target/release/dust
+ 124M   └── deps
 ```
 ## Performance
-dust is currently about 4 times slower than du.
+
 Dust uses a parallel fetching implementation that greatly improves performance for directory trees with reasonable amount of files (read more than 20) compared to du. This can be as much as 7x faster than du on a clean cache.
 ## Alternatives
- * [NCDU](https://dev.yorhel.nl/ncdu)
+
- * du -d 1 -h | sort -h
+* [NCDU](https://dev.yorhel.nl/ncdu)
 * du -d 1 -h | sort -h
 Note: Apparent-size is calculated slightly differently in dust to gdu. In dust each hard link is counted as using file_length space. In gdu only the first entry is counted.
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 # This script takes care of building your crate and packaging it for release
 set -ex
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 set -ex
 main() {
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 # This script takes care of testing your crate
 set -ex
@@ -1,100 +1,178 @@
 extern crate ansi_term;
 use self::ansi_term::Colour::Fixed;
-
+use self::ansi_term::Style;
-use lib::Node;
+use crate::utils::Node;
 static UNITS: [char; 4] = ['T', 'G', 'M', 'K'];
-pub fn draw_it(permissions: bool, heads: &Vec<Node>, to_display: &Vec<&Node>) -> () {
+pub struct DisplayData {
-    if !permissions {
+    pub short_paths: bool,
-        eprintln!("Did not have permissions for all directories");
+    pub is_reversed: bool,
-    }
+    pub colors_on: bool,
    for d in to_display {
        if heads.contains(d) {
            display_node(d, &to_display, true, "")
        }
    }
 }
-fn display_node<S: Into<String>>(
+impl DisplayData {
-    node_to_print: &Node,
+    fn get_first_chars(&self) -> &str {
-    to_display: &Vec<&Node>,
+        if self.is_reversed {
-    is_first: bool,
+            "─┴"
    indentation_str: S,
 ) {
    let mut is = indentation_str.into();
    print_this_node(node_to_print, is_first, is.as_ref());
    is = is.replace("└─┬", "  ");
    is = is.replace("└──", "  ");
    is = is.replace("├──", "│ ");
    is = is.replace("├─┬", "│ ");
    let printable_node_slashes = node_to_print.name().matches('/').count();
    let mut num_siblings = to_display.iter().fold(0, |a, b| {
        if node_to_print.children().contains(b)
            && b.name().matches('/').count() == printable_node_slashes + 1
        {
            a + 1
        } else {
-            a
+            "─┬"
        }
    }
    });
-    let mut is_biggest = true;
+    #[allow(clippy::collapsible_if)]
-    for node in to_display {
+    fn get_tree_chars(
-        if node_to_print.children().contains(node) {
+        &self,
-            let has_display_children = node.children()
+        num_siblings: u64,
-                .iter()
+        max_siblings: u64,
-                .fold(false, |has_kids, n| has_kids || to_display.contains(&n));
+        has_children: bool,
-
+    ) -> &'static str {
-            let has_children = node.children().len() > 0 && has_display_children;
+        if self.is_reversed {
-            if node.name().matches('/').count() == printable_node_slashes + 1 {
+            if num_siblings == max_siblings - 1 {
-                num_siblings -= 1;
+                if has_children {
-
+                    "┌─┴"
-                let tree_chars = {
+                } else {
                    "┌──"
                }
            } else if has_children {
                "├─┴"
            } else {
                "├──"
            }
        } else {
            if num_siblings == 0 {
                if has_children {
                    "└─┬"
                } else {
                    "└──"
                }
-                    } else {
+            } else if has_children {
                        if has_children {
                "├─┬"
            } else {
                "├──"
            }
        }
                };
                display_node(&node, to_display, is_biggest, is.to_string() + tree_chars);
                is_biggest = false;
    }
    fn is_biggest(&self, num_siblings: u64, max_siblings: u64) -> bool {
        if self.is_reversed {
            num_siblings == 0
        } else {
            num_siblings == max_siblings - 1
        }
    }
    fn get_children_from_node(&self, node: Node) -> impl Iterator<Item = Node> {
        if self.is_reversed {
            let n: Vec<Node> = node.children.into_iter().rev().map(|a| a).collect();
            n.into_iter()
        } else {
            node.children.into_iter()
        }
    }
 }
-fn print_this_node(node: &Node, is_biggest: bool, indentation: &str) {
+pub fn draw_it(
-    let pretty_size = format!("{:>5}", human_readable_number(node.size()),);
+    permissions: bool,
    use_full_path: bool,
    is_reversed: bool,
    no_colors: bool,
    root_node: Node,
 ) {
    if !permissions {
        eprintln!("Did not have permissions for all directories");
    }
    let display_data = DisplayData {
        short_paths: !use_full_path,
        is_reversed,
        colors_on: !no_colors,
    };
    for c in display_data.get_children_from_node(root_node) {
        let first_tree_chars = display_data.get_first_chars();
        display_node(c, true, first_tree_chars, &display_data)
    }
 }
 fn display_node(node: Node, is_biggest: bool, indent: &str, display_data: &DisplayData) {
    let mut num_siblings = node.children.len() as u64;
    let max_sibling = num_siblings;
    let new_indent = clean_indentation_string(indent);
    let name = node.name.clone();
    let size = node.size;
    if !display_data.is_reversed {
        print_this_node(&*name, size, is_biggest, display_data, indent);
    }
    for c in display_data.get_children_from_node(node) {
        num_siblings -= 1;
        let chars = display_data.get_tree_chars(num_siblings, max_sibling, !c.children.is_empty());
        let is_biggest = display_data.is_biggest(num_siblings, max_sibling);
        let full_indent = new_indent.clone() + chars;
        display_node(c, is_biggest, &*full_indent, display_data)
    }
    if display_data.is_reversed {
        print_this_node(&*name, size, is_biggest, display_data, indent);
    }
 }
 fn clean_indentation_string(s: &str) -> String {
    let mut is: String = s.into();
    // For reversed:
    is = is.replace("┌─┴", "  ");
    is = is.replace("┌──", "  ");
    is = is.replace("├─┴", "│ ");
    is = is.replace("─┴", " ");
    // For normal
    is = is.replace("└─┬", "  ");
    is = is.replace("└──", "  ");
    is = is.replace("├─┬", "│ ");
    is = is.replace("─┬", " ");
    // For both
    is = is.replace("├──", "│ ");
    is
 }
 fn print_this_node(
    name: &str,
    size: u64,
    is_biggest: bool,
    display_data: &DisplayData,
    indentation: &str,
 ) {
    let pretty_size = format!("{:>5}", human_readable_number(size),);
    println!(
        "{}",
-        format_string(node.name(), is_biggest, pretty_size.as_ref(), indentation)
+        format_string(name, is_biggest, display_data, &*pretty_size, indentation)
    )
 }
-pub fn format_string(dir_name: &str, is_biggest: bool, size: &str, indentation: &str) -> String {
+pub fn format_string(
    dir_name: &str,
    is_biggest: bool,
    display_data: &DisplayData,
    size: &str,
    indentation: &str,
 ) -> String {
    let printable_name = {
        if display_data.short_paths {
            dir_name.split('/').last().unwrap_or(dir_name)
        } else {
            dir_name
        }
    };
    format!(
        "{} {} {}",
-        if is_biggest {
+        if is_biggest && display_data.colors_on {
            Fixed(196).paint(size)
        } else {
-            Fixed(7).paint(size)
+            Style::new().paint(size)
        },
        indentation,
-        dir_name,
+        printable_name,
    )
 }
@@ -1,68 +0,0 @@
 use std::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd};
 #[derive(Clone, Debug)]
 pub struct Node {
    name: String,
    size: u64,
    children: Vec<Node>,
 }
 impl Node {
    pub fn new<S: Into<String>>(name: S, size: u64, children: Vec<Node>) -> Self {
        Node {
            children: children,
            name: name.into(),
            size: size,
        }
    }
    pub fn children(&self) -> &Vec<Node> {
        &self.children
    }
    pub fn name(&self) -> &String {
        &self.name
    }
    pub fn size(&self) -> u64 {
        self.size
    }
 }
 impl Ord for Node {
    fn cmp(&self, other: &Self) -> Ordering {
        if self.size > other.size {
            Ordering::Less
        } else if self.size < other.size {
            Ordering::Greater
        } else {
            let my_slashes = self.name.matches('/').count();
            let other_slashes = other.name.matches('/').count();
            if my_slashes > other_slashes {
                Ordering::Greater
            } else if my_slashes < other_slashes {
                Ordering::Less
            } else {
                if self.name < other.name {
                    Ordering::Less
                } else if self.name > other.name {
                    Ordering::Greater
                } else {
                    Ordering::Equal
                }
            }
        }
    }
 }
 impl PartialOrd for Node {
    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
        Some(self.cmp(other))
    }
 }
 impl PartialEq for Node {
    fn eq(&self, other: &Self) -> bool {
        (&self.name, self.size) == (&other.name, other.size)
    }
 }
 impl Eq for Node {}
@@ -1,48 +1,158 @@
 #[macro_use]
 extern crate clap;
 extern crate assert_cli;
 use self::display::draw_it;
 use crate::utils::is_a_parent_of;
 use clap::{App, AppSettings, Arg};
-use utils::{find_big_ones, get_dir_tree};
+use utils::{find_big_ones, get_dir_tree, simplify_dir_names, sort, trim_deep_ones, Node};
 mod display;
 mod utils;
 mod lib;
-static DEFAULT_NUMBER_OF_LINES: &'static str = "15";
+static DEFAULT_NUMBER_OF_LINES: usize = 20;
 fn main() {
    let def_num_str = DEFAULT_NUMBER_OF_LINES.to_string();
    let options = App::new("Dust")
        .about("Like du but more intuitive")
        .version(crate_version!())
        .setting(AppSettings::TrailingVarArg)
        .arg(
            Arg::with_name("depth")
                .short("d")
                .long("depth")
                .help("Depth to show")
                .takes_value(true),
        )
        .arg(
            Arg::with_name("threads")
                .short("t")
                .long("threads")
                .help("Number of threads to spawn simultaneously")
                .takes_value(true),
        )
        .arg(
            Arg::with_name("number_of_lines")
                .short("n")
                .long("number-of-lines")
                .help("Number of lines of output to show")
                .takes_value(true)
-                .default_value(DEFAULT_NUMBER_OF_LINES),
+                .default_value(def_num_str.as_ref()),
        )
        .arg(
-            Arg::with_name("use_apparent_size")
+            Arg::with_name("display_full_paths")
                .short("p")
                .long("full-paths")
                .help("If set sub directories will not have their path shortened"),
        )
        .arg(
            Arg::with_name("display_apparent_size")
                .short("s")
                .long("apparent-size")
                .help("If set will use file length. Otherwise we use blocks"),
        )
        .arg(
            Arg::with_name("reverse")
                .short("r")
                .long("reverse")
                .help("If applied tree will be printed upside down (biggest lowest)"),
        )
        .arg(
            Arg::with_name("no_colors")
                .short("c")
                .long("no_colors")
                .help("If applied no colors will be printed (normally largest directories are marked in red"),
        )
        .arg(Arg::with_name("inputs").multiple(true))
        .get_matches();
-    let filenames = {
+    let target_dirs = {
        match options.values_of("inputs") {
            None => vec!["."],
            Some(r) => r.collect(),
        }
    };
    let number_of_lines = value_t!(options.value_of("number_of_lines"), usize).unwrap();
    let use_apparent_size = options.is_present("use_apparent_size");
-    let (permissions, node_per_top_level_dir) = get_dir_tree(&filenames, use_apparent_size);
+    let number_of_lines = match value_t!(options.value_of("number_of_lines"), usize) {
-    let slice_it = find_big_ones(&node_per_top_level_dir, number_of_lines);
+        Ok(v) => v,
-    draw_it(permissions, &node_per_top_level_dir, &slice_it);
+        Err(_) => {
            eprintln!("Ignoring bad value for number_of_lines");
            DEFAULT_NUMBER_OF_LINES
        }
    };
    let threads = options.value_of("threads").and_then(|threads| {
        threads
            .parse::<usize>()
            .map_err(|_| eprintln!("Ignoring bad value for threads: {:?}", threads))
            .ok()
    });
    let depth = options.value_of("depth").and_then(|depth| {
        depth
            .parse::<u64>()
            .map(|v| v + 1)
            .map_err(|_| eprintln!("Ignoring bad value for depth"))
            .ok()
    });
    if options.is_present("depth") && number_of_lines != DEFAULT_NUMBER_OF_LINES {
        eprintln!("Use either -n or -d. Not both");
        return;
    }
    let use_apparent_size = options.is_present("display_apparent_size");
    let simplified_dirs = simplify_dir_names(target_dirs);
    let (permissions, nodes) = get_dir_tree(&simplified_dirs, use_apparent_size, threads);
    let sorted_data = sort(nodes);
    let biggest_ones = {
        match depth {
            None => find_big_ones(sorted_data, number_of_lines + simplified_dirs.len()),
            Some(d) => trim_deep_ones(sorted_data, d, &simplified_dirs),
        }
    };
    let tree = build_tree(biggest_ones, depth);
    draw_it(
        permissions,
        options.is_present("display_full_paths"),
        options.is_present("reverse"),
        options.is_present("no_colors"),
        tree,
    );
 }
 fn build_tree(biggest_ones: Vec<(String, u64)>, depth: Option<u64>) -> Node {
    let mut top_parent = Node::default();
    // assume sorted order
    for b in biggest_ones {
        let n = Node {
            name: b.0,
            size: b.1,
            children: Vec::default(),
        };
        recursively_build_tree(&mut top_parent, n, depth);
        top_parent.children.sort_unstable()
    }
    top_parent
 }
 fn recursively_build_tree(parent_node: &mut Node, new_node: Node, depth: Option<u64>) {
    let new_depth = match depth {
        None => None,
        Some(0) => return,
        Some(d) => Some(d - 1),
    };
    if let Some(c) = parent_node
        .children
        .iter_mut()
        .find(|c| is_a_parent_of(&c.name, &new_node.name))
    {
        recursively_build_tree(c, new_node, new_depth);
    } else {
        parent_node.children.push(new_node);
    }
 }
 #[cfg(test)]
@@ -0,0 +1 @@
 hello
@@ -0,0 +1 @@
 hello
@@ -0,0 +1 @@
 hello
@@ -1,66 +1,120 @@
 extern crate ansi_term;
 extern crate tempfile;
 use self::tempfile::Builder;
 use self::tempfile::TempDir;
 use super::*;
 use crate::display::DisplayData;
 use display::format_string;
 use std::fs::File;
 use std::io::Write;
 use std::panic;
 use std::path::PathBuf;
 use std::process::Command;
 use tempfile::Builder;
 use tempfile::TempDir;
 #[test]
 pub fn test_main() {
    assert_cli::Assert::main_binary()
        .with_args(&["src/test_dir"])
        .stdout()
-        .is(main_output())
+        .is(main_output(true))
        .unwrap();
 }
 #[test]
 pub fn test_main_long_paths() {
    assert_cli::Assert::main_binary()
        .with_args(&["-p", "src/test_dir"])
        .stdout()
        .is(main_output(false))
        .unwrap();
 }
 #[test]
 pub fn test_main_multi_arg() {
    assert_cli::Assert::main_binary()
        .with_args(&["src/test_dir/many/", "src/test_dir/", "src/test_dir"])
        .stdout()
        .is(main_output(true))
        .unwrap();
 }
 #[cfg(target_os = "macos")]
-fn main_output() -> String {
+fn main_output(short_paths: bool) -> String {
    let d = DisplayData {
        short_paths,
        is_reversed: false,
        colors_on: true,
    };
    format!(
        "{}
 {}
 {}
 {}",
-        format_string("src/test_dir", true, " 4.0K", ""),
+        format_string("src/test_dir", true, &d, " 4.0K", "─┬"),
-        format_string("src/test_dir/many", true, " 4.0K", "└─┬",),
+        format_string("src/test_dir/many", true, &d, " 4.0K", " └─┬",),
-        format_string("src/test_dir/many/hello_file", true, " 4.0K", "  ├──",),
+        format_string("src/test_dir/many/hello_file", true, &d, " 4.0K", "   ├──",),
-        format_string("src/test_dir/many/a_file", false, "   0B", "  └──",),
+        format_string("src/test_dir/many/a_file", false, &d, "   0B", "   └──",),
    )
 }
 #[cfg(target_os = "linux")]
-fn main_output() -> String {
+fn main_output(short_paths: bool) -> String {
    let d = DisplayData {
        short_paths,
        is_reversed: false,
        colors_on: true,
    };
    format!(
        "{}
 {}
 {}
 {}",
-        format_string("src/test_dir", true, " 8.0K", ""),
+        format_string("src/test_dir", true, &d, "  12K", "─┬"),
-        format_string("src/test_dir/many", true, " 4.0K", "└─┬",),
+        format_string("src/test_dir/many", true, &d, " 8.0K", " └─┬",),
-        format_string("src/test_dir/many/hello_file", true, " 4.0K", "  ├──",),
+        format_string("src/test_dir/many/hello_file", true, &d, " 4.0K", "   ├──",),
-        format_string("src/test_dir/many/a_file", false, "   0B", "  └──",),
+        format_string("src/test_dir/many/a_file", false, &d, "   0B", "   └──",),
    )
 }
 #[test]
-pub fn test_main_extra_slash() {
+pub fn test_no_color_flag() {
    assert_cli::Assert::main_binary()
-        .with_args(&["src/test_dir/"])
+        .with_args(&["-c", "src/test_dir/"])
        .stdout()
-        .is(main_output())
+        .is(no_color_flag_output())
        .unwrap();
 }
 #[cfg(target_os = "macos")]
 fn no_color_flag_output() -> String {
    "
 4.0K ─┬ test_dir
 4.0K  └─┬ many
 4.0K    ├── hello_file
   0B    └── a_file
    "
    .to_string()
 }
 #[cfg(target_os = "linux")]
 fn no_color_flag_output() -> String {
    "
  12K ─┬ test_dir
 8.0K  └─┬ many
 4.0K    ├── hello_file
   0B    └── a_file
    "
    .to_string()
 }
 #[test]
 pub fn test_apparent_size() {
    let d = DisplayData {
        short_paths: true,
        is_reversed: false,
        colors_on: true,
    };
    let r = format!(
        "{}",
-        format_string("src/test_dir/many/hello_file", true, "   6B", "  ├──",),
+        format_string("src/test_dir/many/hello_file", true, &d, "   6B", "   ├──",),
    );
    assert_cli::Assert::main_binary()
@@ -70,7 +124,38 @@ pub fn test_apparent_size() {
        .unwrap();
 }
-fn build_temp_file(dir: &TempDir) -> (PathBuf) {
+#[test]
 pub fn test_reverse_flag() {
    // variable names the same length make the output easier to read
    let a = "    ┌── a_file";
    let b = "    ├── hello_file";
    let c = "  ┌─┴ many";
    let d = " ─┴ test_dir";
    assert_cli::Assert::main_binary()
        .with_args(&["-r", "src/test_dir"])
        .stdout()
        .contains(a)
        .stdout()
        .contains(b)
        .stdout()
        .contains(c)
        .stdout()
        .contains(d)
        .unwrap();
 }
 #[test]
 pub fn test_d_flag_works() {
    // We should see the top level directory but not the sub dirs / files:
    assert_cli::Assert::main_binary()
        .with_args(&["-d", "1", "-s", "src/test_dir"])
        .stdout()
        .doesnt_contain("hello_file")
        .unwrap();
 }
 fn build_temp_file(dir: &TempDir) -> PathBuf {
    let file_path = dir.path().join("notes.txt");
    let mut file = File::create(&file_path).unwrap();
    writeln!(file, "I am a temp file").unwrap();
@@ -93,34 +178,19 @@ pub fn test_soft_sym_link() {
        .output();
    assert!(c.is_ok());
-    assert_cli::Assert::main_binary()
+    let a = format!(" ─┬ {}", dir_s);
-        .with_args(&[dir_s])
+    let b = format!("  ├── {}", file_path_s);
-        .stdout()
+    let c = format!("  └── {}", link_name_s);
        .contains(soft_sym_link_output(dir_s, file_path_s, link_name_s))
        .unwrap();
 }
-#[cfg(target_os = "macos")]
+    assert_cli::Assert::main_binary()
-fn soft_sym_link_output(dir: &str, file_path: &str, link_name: &str) -> String {
+        .with_args(&["-p", &dir_s])
-    format!(
+        .stdout()
-        "{}
+        .contains(a)
-{}
+        .stdout()
-{}",
+        .contains(b)
-        format_string(dir, true, " 8.0K", ""),
+        .stdout()
-        format_string(file_path, true, " 4.0K", "├──",),
+        .contains(c)
-        format_string(link_name, false, " 4.0K", "└──",),
+        .unwrap();
    )
 }
 #[cfg(target_os = "linux")]
 fn soft_sym_link_output(dir: &str, file_path: &str, link_name: &str) -> String {
    format!(
        "{}
 {}
 {}",
        format_string(dir, true, " 4.0K", ""),
        format_string(file_path, true, " 4.0K", "├──",),
        format_string(link_name, false, "   0B", "└──",),
    )
 }
 // Hard links are ignored as the inode is the same as the file
@@ -139,39 +209,33 @@ pub fn test_hard_sym_link() {
        .output();
    assert!(c.is_ok());
-    let r = format!(
+    let a = format!(" ─┬ {}", dir_s);
-        "{}
+    let b = format!("  └── {}", link_name_s);
-{}",
+    let b2 = format!("  └── {}", file_path_s);
        format_string(dir_s, true, " 4.0K", ""),
        format_string(file_path_s, true, " 4.0K", "└──")
    );
    let r2 = format!(
        "{}
 {}",
        format_string(dir_s, true, " 4.0K", ""),
        format_string(link_name_s, true, " 4.0K", "└──")
    );
-    // Because this is a hard link the file and hard link look identicle. Therefore
+    // Because this is a hard link the file and hard link look identical. Therefore
    // we cannot guarantee which version will appear first.
    // TODO: Consider adding predictable itteration order (sort file entries by name?)
    let result = panic::catch_unwind(|| {
        assert_cli::Assert::main_binary()
-            .with_args(&[dir_s])
+            .with_args(&["-p", dir_s])
            .stdout()
-            .contains(r)
+            .contains(a.clone())
            .stdout()
            .contains(b)
            .unwrap();
    });
    if result.is_err() {
        assert_cli::Assert::main_binary()
-            .with_args(&[dir_s])
+            .with_args(&["-p", dir_s])
            .stdout()
-            .contains(r2)
+            .contains(a)
            .stdout()
            .contains(b2)
            .unwrap();
    }
 }
-//Check we don't recurse down an infinite symlink tree
+// Check we don't recurse down an infinite symlink tree
 #[test]
 pub fn test_recursive_sym_link() {
    let dir = Builder::new().tempdir().unwrap();
@@ -187,28 +251,50 @@ pub fn test_recursive_sym_link() {
        .output();
    assert!(c.is_ok());
    let a = format!(" ─┬ {}", dir_s);
    let b = format!("  └── {}", link_name_s);
    assert_cli::Assert::main_binary()
-        .with_args(&[dir_s])
+        .with_args(&["-p", dir_s])
        .stdout()
-        .contains(recursive_sym_link_output(dir_s, link_name_s))
+        .contains(a)
        .stdout()
        .contains(b)
        .unwrap();
 }
-#[cfg(target_os = "macos")]
+// Check against directories and files whos names are substrings of each other
-fn recursive_sym_link_output(dir: &str, link_name: &str) -> String {
+#[test]
-    format!(
+pub fn test_substring_of_names() {
-        "{}
+    assert_cli::Assert::main_binary()
-{}",
+        .with_args(&["-c", "src/test_dir2"])
-        format_string(dir, true, " 4.0K", ""),
+        .stdout()
-        format_string(link_name, true, " 4.0K", "└──",),
+        .is(no_substring_of_names_output())
-    )
+        .unwrap();
 }
 #[cfg(target_os = "linux")]
-fn recursive_sym_link_output(dir: &str, link_name: &str) -> String {
+fn no_substring_of_names_output() -> String {
-    format!(
+    "
-        "{}
+  24K ─┬ test_dir2
-{}",
+ 8.0K  ├─┬ dir
-        format_string(dir, true, "   0B", ""),
+ 4.0K  │ └── hello
-        format_string(link_name, true, "   0B", "└──",),
+ 8.0K  ├─┬ dir_substring
-    )
+ 4.0K  │ └── hello
 4.0K  └── dir_name_clash
    "
    .into()
 }
 #[cfg(target_os = "macos")]
 fn no_substring_of_names_output() -> String {
    "
  12K ─┬ test_dir2
 4.0K  ├─┬ dir
 4.0K  │ └── hello
 4.0K  ├── dir_name_clash
 4.0K  └─┬ dir_substring
 4.0K    └── hello
    "
    .into()
 }
@@ -1,56 +1,120 @@
 use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::collections::HashSet;
-use std::fs;
+use jwalk::WalkDir;
 use std::path::Path;
 use lib::Node;
 mod platform;
 use self::platform::*;
-pub fn get_dir_tree(filenames: &Vec<&str>, apparent_size: bool) -> (bool, Vec<Node>) {
+#[derive(Debug, Default, Eq)]
-    let mut permissions = true;
+pub struct Node {
-    let mut inodes: HashSet<(u64, u64)> = HashSet::new();
+    pub name: String,
-    let mut results = vec![];
+    pub size: u64,
-    for &b in filenames {
+    pub children: Vec<Node>,
        let filename = strip_end_slashes(b);
        let (hp, data) = examine_dir(&Path::new(&filename), apparent_size, &mut inodes);
        permissions = permissions && hp;
        match data {
            Some(d) => results.push(d),
            None => permissions = false,
        }
    }
    (permissions, results)
 }
-fn strip_end_slashes(s: &str) -> String {
+impl Ord for Node {
-    let mut new_name = String::from(s);
+    fn cmp(&self, other: &Self) -> Ordering {
-    while new_name.chars().last() == Some('/') && new_name.len() != 1 {
+        if self.size == other.size {
-        new_name.pop();
+            self.name.cmp(&other.name)
        } else {
            self.size.cmp(&other.size)
        }
    }
 }
 impl PartialOrd for Node {
    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
        Some(self.cmp(other))
    }
 }
 impl PartialEq for Node {
    fn eq(&self, other: &Self) -> bool {
        self.name == other.name && self.size == other.size && self.children == other.children
    }
 }
 pub fn is_a_parent_of(parent: &str, child: &str) -> bool {
    child.starts_with(parent) && child.chars().nth(parent.chars().count()) == Some('/')
 }
 pub fn simplify_dir_names(filenames: Vec<&str>) -> HashSet<String> {
    let mut top_level_names: HashSet<String> = HashSet::with_capacity(filenames.len());
    let mut to_remove: Vec<String> = Vec::with_capacity(filenames.len());
    for t in filenames {
        let top_level_name = strip_end_slash(t);
        let mut can_add = true;
        for tt in top_level_names.iter() {
            if is_a_parent_of(&top_level_name, tt) {
                to_remove.push(tt.to_string());
            } else if is_a_parent_of(tt, &top_level_name) {
                can_add = false;
            }
        }
        to_remove.sort_unstable();
        top_level_names.retain(|tr| to_remove.binary_search(tr).is_err());
        to_remove.clear();
        if can_add {
            top_level_names.insert(strip_end_slash(t).to_owned());
        }
    }
    top_level_names
 }
 pub fn get_dir_tree(
    top_level_names: &HashSet<String>,
    apparent_size: bool,
    threads: Option<usize>,
 ) -> (bool, HashMap<String, u64>) {
    let mut permissions = 0;
    let mut inodes: HashSet<(u64, u64)> = HashSet::new();
    let mut data: HashMap<String, u64> = HashMap::new();
    for b in top_level_names.iter() {
        examine_dir(
            &b,
            apparent_size,
            &mut inodes,
            &mut data,
            &mut permissions,
            threads,
        );
    }
    (permissions == 0, data)
 }
 pub fn strip_end_slash(mut new_name: &str) -> &str {
    while (new_name.ends_with('/') || new_name.ends_with("/.")) && new_name.len() > 1 {
        new_name = &new_name[..new_name.len() - 1];
    }
    new_name
 }
 fn examine_dir(
-    sdir: &Path,
+    top_dir: &str,
    apparent_size: bool,
    inodes: &mut HashSet<(u64, u64)>,
-) -> (bool, Option<Node>) {
+    data: &mut HashMap<String, u64>,
-    match fs::read_dir(sdir) {
+    file_count_no_permission: &mut u64,
-        Ok(file_iter) => {
+    threads: Option<usize>,
-            let mut result = vec![];
+) {
-            let mut have_permission = true;
+    let mut iter = WalkDir::new(top_dir)
-            let mut total_size = 0;
+        .preload_metadata(true)
        .skip_hidden(false);
    if let Some(threads_to_start) = threads {
        iter = iter.num_threads(threads_to_start);
    }
    for entry in iter {
        if let Ok(e) = entry {
            let maybe_size_and_inode = get_metadata(&e, apparent_size);
-            for single_path in file_iter {
+            match maybe_size_and_inode {
-                match single_path {
+                Some((size, maybe_inode)) => {
                    Ok(d) => {
                        let file_type = d.file_type().ok();
                        let maybe_size_and_inode = get_metadata(&d, apparent_size);
                        match (file_type, maybe_size_and_inode) {
                            (Some(file_type), Some((size, maybe_inode))) => {
                    if !apparent_size {
                        if let Some(inode_dev_pair) = maybe_inode {
                            if inodes.contains(&inode_dev_pair) {
@@ -59,63 +123,113 @@ fn examine_dir(
                            inodes.insert(inode_dev_pair);
                        }
                    }
-                                total_size += size;
+                    // This path and all its parent paths have their counter incremented
-
+                    for path_name in e.path().ancestors() {
-                                if d.path().is_dir() && !file_type.is_symlink() {
+                        let path_name = path_name.to_string_lossy();
-                                    let (hp, child) = examine_dir(&d.path(), apparent_size, inodes);
+                        let s = data.entry(path_name.to_string()).or_insert(0);
-                                    have_permission = have_permission && hp;
+                        *s += size;
-
+                        if path_name == top_dir {
-                                    match child {
+                            break;
                                        Some(c) => {
                                            total_size += c.size();
                                            result.push(c);
                        }
-                                        None => (),
+                    }
                }
                None => *file_count_no_permission += 1,
            }
        } else {
-                                    let path_name = d.path().to_string_lossy().to_string();
+            *file_count_no_permission += 1
                                    result.push(Node::new(path_name, size, vec![]))
        }
    }
                            (_, None) => have_permission = false,
                            (_, _) => (),
                        }
                    }
                    Err(_) => (),
                }
            }
            let n = Node::new(sdir.to_string_lossy().to_string(), total_size, result);
            (have_permission, Some(n))
        }
        Err(_) => (false, None),
    }
 }
-// We start with a list of root directories - these must be the biggest folders
+pub fn sort_by_size_first_name_second(a: &(String, u64), b: &(String, u64)) -> Ordering {
-// We then repeadedly merge in the children of the biggest directory - Each iteration
+    let result = b.1.cmp(&a.1);
-// the next biggest directory's children are merged in.
+    if result == Ordering::Equal {
-pub fn find_big_ones<'a>(l: &'a Vec<Node>, max_to_show: usize) -> Vec<&Node> {
+        a.0.cmp(&b.0)
-    let mut new_l: Vec<&Node> = l.iter().map(|a| a).collect();
+    } else {
-    new_l.sort();
+        result
    for processed_pointer in 0..max_to_show {
        if new_l.len() == processed_pointer {
            break;
        }
        // Must be a list of pointers into new_l otherwise b_list will go out of scope
        // when it is deallocated
        let mut b_list: Vec<&Node> = new_l[processed_pointer]
            .children()
            .iter()
            .map(|a| a)
            .collect();
        new_l.extend(b_list);
        new_l.sort();
    }
 }
-    if new_l.len() > max_to_show {
+pub fn sort(data: HashMap<String, u64>) -> Vec<(String, u64)> {
-        new_l[0..max_to_show + 1].to_vec()
+    let mut new_l: Vec<(String, u64)> = data.iter().map(|(a, b)| (a.clone(), *b)).collect();
    new_l.sort_unstable_by(sort_by_size_first_name_second);
    new_l
 }
 pub fn find_big_ones(new_l: Vec<(String, u64)>, max_to_show: usize) -> Vec<(String, u64)> {
    if max_to_show > 0 && new_l.len() > max_to_show {
        new_l[0..max_to_show].to_vec()
    } else {
        new_l
    }
 }
 pub fn trim_deep_ones(
    input: Vec<(String, u64)>,
    max_depth: u64,
    top_level_names: &HashSet<String>,
 ) -> Vec<(String, u64)> {
    let mut result: Vec<(String, u64)> = Vec::with_capacity(input.len() * top_level_names.len());
    for name in top_level_names {
        let my_max_depth = name.matches('/').count() + max_depth as usize;
        let name_ref: &str = name.as_ref();
        for &(ref k, ref v) in input.iter() {
            if k.starts_with(name_ref) && k.matches('/').count() <= my_max_depth {
                result.push((k.clone(), *v));
            }
        }
    }
    result
 }
 mod tests {
    #[allow(unused_imports)]
    use super::*;
    #[test]
    fn test_simplify_dir() {
        let mut correct = HashSet::new();
        correct.insert("a".to_string());
        assert_eq!(simplify_dir_names(vec!["a"]), correct);
    }
    #[test]
    fn test_simplify_dir_rm_subdir() {
        let mut correct = HashSet::new();
        correct.insert("a/b".to_string());
        assert_eq!(simplify_dir_names(vec!["a/b", "a/b/c", "a/b/d/f"]), correct);
    }
    #[test]
    fn test_simplify_dir_duplicates() {
        let mut correct = HashSet::new();
        correct.insert("a/b".to_string());
        correct.insert("c".to_string());
        assert_eq!(simplify_dir_names(vec!["a/b", "a/b//", "c", "c/"]), correct);
    }
    #[test]
    fn test_simplify_dir_rm_subdir_and_not_substrings() {
        let mut correct = HashSet::new();
        correct.insert("b".to_string());
        correct.insert("c/a/b".to_string());
        correct.insert("a/b".to_string());
        assert_eq!(simplify_dir_names(vec!["a/b", "c/a/b/", "b"]), correct);
    }
    #[test]
    fn test_simplify_dir_dots() {
        let mut correct = HashSet::new();
        correct.insert("src".to_string());
        assert_eq!(simplify_dir_names(vec!["src/."]), correct);
    }
    #[test]
    fn test_simplify_dir_substring_names() {
        let mut correct = HashSet::new();
        correct.insert("src".to_string());
        correct.insert("src_v2".to_string());
        assert_eq!(simplify_dir_names(vec!["src/", "src_v2"]), correct);
    }
 }
@@ -1,4 +1,4 @@
-use std;
+use jwalk::DirEntry;
 fn get_block_size() -> u64 {
    // All os specific implementations of MetatdataExt seem to define a block as 512 bytes
@@ -6,67 +6,25 @@ fn get_block_size() -> u64 {
    512
 }
-#[cfg(target_os = "linux")]
+#[cfg(target_family = "unix")]
-pub fn get_metadata(
+pub fn get_metadata(d: &DirEntry, use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    d: &std::fs::DirEntry,
    use_apparent_size: bool,
 ) -> Option<(u64, Option<(u64, u64)>)> {
    use std::os::linux::fs::MetadataExt;
    match d.metadata().ok() {
        Some(md) => {
            let inode = Some((md.st_ino(), md.st_dev()));
            if use_apparent_size {
                Some((md.len(), inode))
            } else {
                Some((md.st_blocks() * get_block_size(), inode))
            }
        }
        None => None,
    }
 }
 #[cfg(target_os = "unix")]
 pub fn get_metadata(
    d: &std::fs::DirEntry,
    use_apparent_size: bool,
 ) -> Option<(u64, Option<(u64, u64)>)> {
    use std::os::unix::fs::MetadataExt;
-    match d.metadata().ok() {
+    d.metadata.as_ref().unwrap().as_ref().ok().map(|md| {
        Some(md) => {
        let inode = Some((md.ino(), md.dev()));
        if use_apparent_size {
-                Some((md.len(), inode))
+            (md.len(), inode)
        } else {
-                Some((md.blocks() * get_block_size(), inode))
+            (md.blocks() * get_block_size(), inode)
            }
        }
        None => None,
        }
    })
 }
-#[cfg(target_os = "macos")]
+#[cfg(not(target_family = "unix"))]
-pub fn get_metadata(
+pub fn get_metadata(d: &DirEntry, _apparent: bool) -> Option<(u64, Option<(u64, u64)>)> {
-    d: &std::fs::DirEntry,
+    d.metadata
-    use_apparent_size: bool,
+        .as_ref()
-) -> Option<(u64, Option<(u64, u64)>)> {
+        .unwrap()
-    use std::os::macos::fs::MetadataExt;
+        .as_ref()
-    match d.metadata().ok() {
+        .ok()
-        Some(md) => {
+        .map(|md| (md.len(), None))
            let inode = Some((md.st_ino(), md.st_dev()));
            if use_apparent_size {
                Some((md.len(), inode))
            } else {
                Some((md.st_blocks() * get_block_size(), inode))
            }
        }
        None => None,
    }
 }
 #[cfg(not(any(target_os = "linux", target_os = "unix", target_os = "macos")))]
 pub fn get_metadata(d: &std::fs::DirEntry, _apparent: bool) -> Option<(u64, Option<(u64, u64)>)> {
    match d.metadata().ok() {
        Some(md) => Some((md.len(), None)),
        None => None,
    }
 }
Author	SHA1	Message	Date
andy.boot	7e47d5b47a	Increment version number	2019-12-08 23:36:48 +00:00
andy.boot	6a65570f3f	Refactor tests Make use of the 'is' more to test the entire output. Add test for no_color mode. Replace several calls to format_string with calls that build a string directly. I feel format_string is becoming unweildly and this simplfies the tests	2019-12-08 23:34:28 +00:00
andy.boot	a4ca78dbe4	Add option flag for no colors https://github.com/bootandy/dust/issues/37	2019-12-08 14:46:45 +00:00
andy boot	bfbe8a57ae	Merge pull request #42 from bootandy/cleanup Cleanup code & fix issue	2019-12-07 09:16:51 +00:00
andy.boot	b4b73e45f3	Cargo update	2019-12-05 21:51:04 +00:00
andy.boot	78119aba0f	Mark function as ignored by clippy We don't want to collapse this if - it is easier to reason about this way	2019-12-05 21:50:26 +00:00
andy.boot	5535478fe8	Fix substring bug When one directory was a substring of another the directory would appear as a subdirectory instead of a sibling Fixed originally by this: `6e03dd77e6` Broken by this: `db6c8a019d` Added integration test as this has bitten me before	2019-12-05 21:35:15 +00:00
andy.boot	7ba91a4a22	Rename variable cpu -> threads. threads more accurately represents the number of threads we will start to run	2019-12-04 20:49:45 +00:00
andy boot	79416fd5fc	Merge pull request #40 from AdminXVII/parallel-walk Use jwalk instead of walkdir: parallel walking for performance boost	2019-12-04 20:45:25 +00:00
Xavier L'Heureux	b66523cff3	Apply clippy lints	2019-12-03 18:34:47 -05:00
Xavier L'Heureux	19a41aa382	Add CLI option for the number of threads to spawn	2019-12-03 18:27:02 -05:00
Xavier L'Heureux	62ac9b623a	Make sure to count the hidden directories	2019-11-26 08:31:52 -05:00
Xavier L'Heureux	bf28d42483	Update Performance section of README	2019-11-26 08:31:52 -05:00
Xavier L'Heureux	f8ce6c97bf	Use more rusty patterns and preallocate enough space	2019-11-26 08:31:52 -05:00
Xavier L'Heureux	86b3cccaf6	perf(IO): use parallel walkdir (jwalk) for super faster traversal	2019-11-26 08:31:52 -05:00
andy boot	3c920431fa	Merge pull request #38 from lespea/update_deps Latest deps	2019-11-25 23:32:09 +00:00
Adam Lesperance	a1ece05af5	Testing deps should only be used when testing	2019-11-21 00:05:53 -06:00
Adam Lesperance	cef2c588b7	Latest deps	2019-11-20 23:05:57 -06:00
andy boot	7d8e498238	Merge pull request #36 from bootandy/try_to_fix_releases Update secure key in Travis	2019-11-02 01:11:42 +00:00
andy boot	53c7a69dcb	Merge pull request #35 from bootandy/fix-version Provide version information with -V	2019-11-02 00:45:36 +00:00
andy.boot	9a9cbefd3d	Provide version information with -V clap does most of this for you - I had forgotten to wire it up https://github.com/bootandy/dust/issues/33 increment build version	2019-11-02 00:42:57 +00:00
andy boot	224a2c6f25	Merge pull request #32 from mvertescher/update-edition Upgrade to the 2018 edition	2019-10-27 10:39:04 +00:00
Matt Vertescher	99003cbba9	Upgrade to the 2018 edition	2019-10-26 15:19:07 -04:00
andy.boot	c83803b440	Add comment to travis file So I don't forget how to do a release next time	2019-10-09 00:43:04 +01:00
andy.boot	a41862d799	Travis release: Read API key from variable secure key was probably removed. Read from travis ci env variable instead	2019-10-09 00:35:30 +01:00
andy.boot	6ab46d8471	Add reverse instructions	2019-10-08 22:46:52 +01:00
andy boot	c727eb2d11	Merge pull request #31 from bootandy/nodes_rev Refactor & support reverse	2019-10-08 21:31:11 +01:00
andy.boot	0effaa7fd7	Increment version	2019-10-08 21:05:37 +01:00
andy.boot	25c50f88c4	cargo upgrade	2019-10-08 21:05:09 +01:00
andy.boot	0c19a66432	Add test for reverse flag	2019-10-08 20:57:44 +01:00
andy.boot	4cffc4370b	Bring back the reverse flag Following the large refactor on the previous commit, this commit fixes the reverse functionality. Depth detection moved into the tree building instead of being calculated when drawing the tree to screen	2019-10-06 22:00:40 +01:00
andy.boot	db6c8a019d	Massive refactor WIP Replace array of (string, int) pairs with tree of nodes. A tree of nodes more accurately represents the underlying file structure and hence is a better fit for the problem space. Regression: Reverse doesn't work in this commit. I suspect more methods can be simplifed and reduced.	2019-10-05 17:57:47 +01:00
andy.boot	e03094a4fa	Add reverse flag Pull several variables related to how output is printed into DisplayData struct	2019-10-03 23:07:52 +01:00
andy.boot	1d9a56e025	A way of supporting reverse	2019-10-02 22:31:49 +01:00
andy.boot	ec2d9e19d4	Run format, introduce new function. strip_end_slash_including_root will remove end slashes including the root directory. The root directory has been a long running problem because if we strip the final slash we will run dust on no directory instead of the root.	2019-10-02 20:14:13 +01:00
andy.boot	9fbfcb275a	pull out a method (will be needed for reverse)	2019-10-02 20:06:09 +01:00
andy.boot	1c60d1e2ac	Display: replace boolean with integer count This will probably be useful when i refactor for the reverse mode	2019-10-02 19:54:00 +01:00
andy.boot	fd35734a94	Simplify string code, remove into	2019-10-02 19:48:57 +01:00
andy boot	c6f4ace2b6	Merge pull request #30 from bootandy/neaten Neaten	2019-10-02 19:16:31 +01:00
Bob	d46b63fad8	Add detection of files which fail permission Old code caught some file permission denied but not all.	2019-10-01 22:44:17 +01:00
Bob	872a49bb7d	better var name	2019-10-01 22:35:29 +01:00
andy boot	04c6c204c3	Merge pull request #27 from bootandy/new2	2019-10-01 22:26:56 +01:00
Bob	7ac01e8166	Increment version number	2019-10-01 22:18:36 +01:00
Bob	2f7a88e8dc	Fix issues from running on root directory clean up: `80338f4` Fixes -d flag to work again. Add test to stop regression	2019-10-01 22:18:16 +01:00
Bob	2ca2cebdad	New Cargo lock	2019-09-29 11:28:51 +01:00
bootandy	80338f4731	Fix running on root dir / Fixes: https://github.com/bootandy/dust/issues/22 Allows code to run on the root directory	2019-07-04 00:03:33 +01:00
bootandy	d327bd2e68	Fix code to handle single dots in path Before this fix adding a single dot to the end of a path would cause the code to crash.	2019-07-02 00:56:43 +01:00
bootandy	7db6cf2f32	Add test to handle single dot in path	2019-07-02 00:54:58 +01:00
bootandy	76d0762c97	Add assert to stop infinite loops	2019-07-01 22:43:10 +01:00
bootandy	6e03dd77e6	Fix obscure display bug When one directory was a substring of another with files in the files could appear as children of the wrong directory Fix: https://github.com/bootandy/dust/issues/25	2019-07-01 22:25:06 +01:00
bootandy	4906e9efda	comment typos	2019-07-01 22:25:06 +01:00
bootandy	876609f2cb	Obey new clippy Clippy is like having a reviewer fix your dodgy code.	2019-07-01 22:25:06 +01:00
bootandy	12775db94b	Update git ignore to ignore idea	2019-07-01 22:25:06 +01:00
bootandy	bfaf5ee173	Add bash line to ci script	2019-07-01 22:25:06 +01:00
bootandy	fd68330815	Update cargo lock	2019-07-01 22:25:06 +01:00
andy.boot	0bf4ebf554	Fix minor color bug If we are not using RED then the Color should be the terminal default not 7	2018-06-19 23:39:23 +01:00
andy boot	cab24f58d5	Merge pull request #20 from bootandy/refac Refactor	2018-05-10 18:28:07 +01:00
andy.boot	b1b933d851	Refactor & Optimize use of depth Code Refactored Using Depth now prunes the tree below the displayable depth so display calls finish quicker.	2018-05-10 17:36:56 +01:00
andy.boot	6a86e8befd	Increment version number	2018-05-09 11:46:42 +01:00
andy boot	3fb91a6c29	Merge pull request #19 from bootandy/rm_dup_input code to remove duplicate arguments	2018-05-09 11:44:38 +01:00
andy.boot	51561994c5	Break up display_node function slightly Also: run rustformat	2018-05-09 11:28:23 +01:00
andy.boot	ce0e14bf00	Tweak output - the root node now has a: ─┬	2018-05-09 10:58:32 +01:00
andy.boot	dd75ec4aa7	wip: code to remove duplicate arguments Also handle case where an argument is a substring of another argument	2018-05-09 10:35:30 +01:00
andy boot	65cd42736a	Update README.md	2018-05-09 09:43:30 +01:00
andy boot	4792e97177	Merge pull request #18 from bootandy/fixes Fixes	2018-05-02 09:51:21 +01:00
bootandy	3e9f09e339	Remove unnecessary path & pathbuf code	2018-05-02 00:42:03 +01:00
bootandy	dba465a094	Tweak error message	2018-05-02 00:39:57 +01:00
bootandy	25d1ee7b43	Remove naked unwrap	2018-05-02 00:39:57 +01:00
bootandy	2556885622	Rust format	2018-05-02 00:39:57 +01:00
bootandy	8c088a7026	Fix: Passing a string into -n will no longer panic fixes: #https://github.com/bootandy/dust/issues/16	2018-05-02 00:39:57 +01:00
bootandy	39db8b86fd	Replace simple match with map_or	2018-05-01 14:38:34 +01:00
bootandy	c5830c5d00	Stop using target_os just use target_family target_family unix covers linux and mac and wraps up the call for inodes in a common interface.	2018-05-01 13:59:48 +01:00
bootandy	b68c450710	use eprintln!	2018-05-01 13:55:19 +01:00
andy.boot	6e2e5761d8	Increment version	2018-04-27 12:46:27 +01:00
andy boot	6842526d2c	Merge pull request #15 from bootandy/depth2 Add support for -d depth flag	2018-04-27 12:28:15 +01:00
andy.boot	4ac85d7dc9	Simplify tests dust sort is now more predictable as it orders first by size and second by name. Walkdir still gives different iteration orders on different systems so all output is not entirely predictable	2018-04-27 11:35:47 +01:00
andy.boot	8170a07886	Increase default to 20 from 15 Clean up README a bit.	2018-04-27 10:23:20 +01:00
andy.boot	0f1f823736	Add long options to cmd line params	2018-04-27 10:15:30 +01:00
andy.boot	e6c777fb8b	Add support for -d depth flag Following a user request the option '-d N' allows a user to output N levels of sub directories. Fixed bug: so that trailing slashes are now removed.	2018-04-27 10:01:41 +01:00
andy boot	0bded9698a	Merge pull request #14 from bootandy/fix_mac Fix tests on mac	2018-04-24 17:09:30 +01:00
bootandy	c7f0ea59f0	Fix tests on mac Macos does not appear to have a predictable iteration order of the files	2018-04-24 16:50:37 +01:00
andy boot	6d62cfb9ae	Merge pull request #13 from bootandy/walkdir2 Rewrite to use walkdir instead of recursion	2018-04-24 15:41:51 +01:00
andy.boot	803934d84b	By default only print last leaf of path Fixes #9 https://github.com/bootandy/dust/issues/9 Instead of printing the all sub tree leaves only the last leaf is now printed. See readme change for example The flag '-p' was added to print the sub tree the old way	2018-04-24 14:54:11 +01:00
andy.boot	24c97ef92f	Rewrite to use walkdir instead of recursion Advised to use walkdir by burntsushi as using recursion on file systems can blow the stack. walkdir is slower but allows the code to be cleaner and more reliable Also experimented with ignore but locking the hashmap resulted in similar performance to walkdir but with much uglier code.	2018-04-24 14:53:47 +01:00
andy boot	270edf0a76	Update README.md	2018-04-18 13:49:05 +01:00