Update packages

Increment version
[core] New flag: width
2025-12-15 17:11:17 -08:00 · 2021-01-16 15:12:52 +00:00 · 2021-01-16 15:05:33 +00:00 · 2021-01-16 15:01:42 +00:00 · 2021-01-16 14:56:45 +00:00
27 changed files with 1468 additions and 2520 deletions
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -22,56 +22,56 @@ jobs:
          - { os: macos-latest }
          - { os: windows-latest }
    steps:
-      - uses: actions/checkout@v1
-      - name: Initialize workflow variables
-        id: vars
-        shell: bash
-        run: |
-          # 'windows-latest' `cargo fmt` is bugged for this project (see reasons @ GH:rust-lang/rustfmt #3324, #3590, #3688 ; waiting for repair)
-          JOB_DO_FORMAT_TESTING="true"
-          case ${{ matrix.job.os }} in windows-latest) unset JOB_DO_FORMAT_TESTING ;; esac;
-          echo set-output name=JOB_DO_FORMAT_TESTING::${JOB_DO_FORMAT_TESTING:-<empty>/false}
-          echo ::set-output name=JOB_DO_FORMAT_TESTING::${JOB_DO_FORMAT_TESTING}
-          # target-specific options
-          # * CARGO_FEATURES_OPTION
-          CARGO_FEATURES_OPTION='' ;
-          if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
-          echo set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
-          echo ::set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
-      - name: Install `rust` toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          profile: minimal # minimal component installation (ie, no documentation)
-          components: rustfmt, clippy
-      - name: "`fmt` testing"
-        if: steps.vars.outputs.JOB_DO_FORMAT_TESTING
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-      - name: "`clippy` testing"
-        if: success() || failure() # run regardless of prior step ("`fmt` testing") success/failure
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -- -D warnings
+    - uses: actions/checkout@v1
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+        # 'windows-latest' `cargo fmt` is bugged for this project (see reasons @ GH:rust-lang/rustfmt #3324, #3590, #3688 ; waiting for repair)
+        JOB_DO_FORMAT_TESTING="true"
+        case ${{ matrix.job.os }} in windows-latest) unset JOB_DO_FORMAT_TESTING ;; esac;
+        echo set-output name=JOB_DO_FORMAT_TESTING::${JOB_DO_FORMAT_TESTING:-<empty>/false}
+        echo ::set-output name=JOB_DO_FORMAT_TESTING::${JOB_DO_FORMAT_TESTING}
+        # target-specific options
+        # * CARGO_FEATURES_OPTION
+        CARGO_FEATURES_OPTION='' ;
+        if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
+        echo set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
+        echo ::set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
+    - name: Install `rust` toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+        profile: minimal # minimal component installation (ie, no documentation)
+        components: rustfmt, clippy
+    - name: "`fmt` testing"
+      if: steps.vars.outputs.JOB_DO_FORMAT_TESTING
+      uses: actions-rs/cargo@v1
+      with:
+        command: fmt
+        args: --all -- --check
+    - name: "`clippy` testing"
+      if: success() || failure() # run regardless of prior step ("`fmt` testing") success/failure
+      uses: actions-rs/cargo@v1
+      with:
+        command: clippy
+        args: ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -- -D warnings

  min_version:
    name: MinSRV # Minimum supported rust version
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v1
-      - name: Install `rust` toolchain (v${{ env.RUST_MIN_SRV }})
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ env.RUST_MIN_SRV }}
-          profile: minimal # minimal component installation (ie, no documentation)
-      - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
+    - uses: actions/checkout@v1
+    - name: Install `rust` toolchain (v${{ env.RUST_MIN_SRV }})
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ env.RUST_MIN_SRV }}
+        profile: minimal # minimal component installation (ie, no documentation)
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        command: test

  build:
    name: Build
@@ -81,216 +81,166 @@ jobs:
      matrix:
        job:
          # { os, target, cargo-options, features, use-cross, toolchain }
-          - {
-              os: ubuntu-latest,
-              target: aarch64-unknown-linux-gnu,
-              use-cross: use-cross,
-            }
-          - {
-              os: ubuntu-latest,
-              target: aarch64-unknown-linux-musl,
-              use-cross: use-cross,
-            }
-          - {
-              os: ubuntu-latest,
-              target: arm-unknown-linux-gnueabihf,
-              use-cross: use-cross,
-            }
-          - {
-              os: ubuntu-latest,
-              target: i686-unknown-linux-gnu,
-              use-cross: use-cross,
-            }
-          - {
-              os: ubuntu-latest,
-              target: i686-unknown-linux-musl,
-              use-cross: use-cross,
-            }
-          - {
-              os: ubuntu-latest,
-              target: x86_64-unknown-linux-gnu,
-              use-cross: use-cross,
-            }
-          - {
-              os: ubuntu-latest,
-              target: x86_64-unknown-linux-musl,
-              use-cross: use-cross,
-            }
-          - { os: macos-latest, target: x86_64-apple-darwin }
-          - { os: windows-latest, target: i686-pc-windows-gnu }
-          - { os: windows-latest, target: i686-pc-windows-msvc }
-          - { os: windows-latest, target: x86_64-pc-windows-gnu } ## !maint: [rivy; 2020-01-21] may break due to rust bug; follow possible solution from GH:rust-lang/rust#47048 (refs: GH:rust-lang/rust#47048 , GH:rust-lang/rust#53454 , GH:bike-barn/hermit#172 )
-          - { os: windows-latest, target: x86_64-pc-windows-msvc }
+          - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: i686-unknown-linux-gnu      , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: i686-unknown-linux-musl     , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: x86_64-unknown-linux-musl   , use-cross: use-cross }
+          - { os: ubuntu-16.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
+          - { os: macos-latest   , target: x86_64-apple-darwin         }
+          - { os: windows-latest , target: i686-pc-windows-gnu         }
+          - { os: windows-latest , target: i686-pc-windows-msvc        }
+          - { os: windows-latest , target: x86_64-pc-windows-gnu       } ## !maint: [rivy; 2020-01-21] may break due to rust bug; follow possible solution from GH:rust-lang/rust#47048 (refs: GH:rust-lang/rust#47048 , GH:rust-lang/rust#53454 , GH:bike-barn/hermit#172 )
+          - { os: windows-latest , target: x86_64-pc-windows-msvc      }
    steps:
-      - uses: actions/checkout@v1
-      - name: Install any prerequisites
-        shell: bash
-        run: |
-          case ${{ matrix.job.target }} in
-            arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
-            aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install binutils-aarch64-linux-gnu ;;
-          esac
-      - name: Initialize workflow variables
-        id: vars
-        shell: bash
-        run: |
-          # toolchain
-          TOOLCHAIN="stable" ## default to "stable" toolchain
-          # * specify alternate TOOLCHAIN for *-pc-windows-gnu targets; gnu targets on Windows are broken for the standard *-pc-windows-msvc toolchain (refs: <https://github.com/rust-lang/rust/issues/47048>, <https://github.com/rust-lang/rust/issues/53454>, <https://github.com/rust-lang/cargo/issues/6754>)
-          case ${{ matrix.job.target }} in *-pc-windows-gnu) TOOLCHAIN="stable-${{ matrix.job.target }}" ;; esac;
-          # * use requested TOOLCHAIN if specified
-          if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
-          echo set-output name=TOOLCHAIN::${TOOLCHAIN}
-          echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}
-          # staging directory
-          STAGING='_staging'
-          echo set-output name=STAGING::${STAGING}
-          echo ::set-output name=STAGING::${STAGING}
-          # determine EXE suffix
-          EXE_suffix="" ; case ${{ matrix.job.target }} in *-pc-windows-*) EXE_suffix=".exe" ;; esac;
-          echo set-output name=EXE_suffix::${EXE_suffix}
-          echo ::set-output name=EXE_suffix::${EXE_suffix}
-          # parse commit reference info
-          REF_NAME=${GITHUB_REF#refs/*/}
-          unset REF_BRANCH ; case ${GITHUB_REF} in refs/heads/*) REF_BRANCH=${GITHUB_REF#refs/heads/} ;; esac;
-          unset REF_TAG ; case ${GITHUB_REF} in refs/tags/*) REF_TAG=${GITHUB_REF#refs/tags/} ;; esac;
-          REF_SHAS=${GITHUB_SHA:0:8}
-          echo set-output name=REF_NAME::${REF_NAME}
-          echo set-output name=REF_BRANCH::${REF_BRANCH}
-          echo set-output name=REF_TAG::${REF_TAG}
-          echo set-output name=REF_SHAS::${REF_SHAS}
-          echo ::set-output name=REF_NAME::${REF_NAME}
-          echo ::set-output name=REF_BRANCH::${REF_BRANCH}
-          echo ::set-output name=REF_TAG::${REF_TAG}
-          echo ::set-output name=REF_SHAS::${REF_SHAS}
-          # parse target
-          unset TARGET_ARCH ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) TARGET_ARCH=arm ;; aarch-*) TARGET_ARCH=aarch64 ;; i686-*) TARGET_ARCH=i686 ;; x86_64-*) TARGET_ARCH=x86_64 ;; esac;
-          echo set-output name=TARGET_ARCH::${TARGET_ARCH}
-          echo ::set-output name=TARGET_ARCH::${TARGET_ARCH}
-          unset TARGET_OS ; case ${{ matrix.job.target }} in *-linux-*) TARGET_OS=linux ;; *-apple-*) TARGET_OS=macos ;; *-windows-*) TARGET_OS=windows ;; esac;
-          echo set-output name=TARGET_OS::${TARGET_OS}
-          echo ::set-output name=TARGET_OS::${TARGET_OS}
-          # package name
-          PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
-          PKG_BASENAME=${PROJECT_NAME}-${REF_TAG:-$REF_SHAS}-${{ matrix.job.target }}
-          PKG_NAME=${PKG_BASENAME}${PKG_suffix}
-          echo set-output name=PKG_suffix::${PKG_suffix}
-          echo set-output name=PKG_BASENAME::${PKG_BASENAME}
-          echo set-output name=PKG_NAME::${PKG_NAME}
-          echo ::set-output name=PKG_suffix::${PKG_suffix}
-          echo ::set-output name=PKG_BASENAME::${PKG_BASENAME}
-          echo ::set-output name=PKG_NAME::${PKG_NAME}
-          # deployable tag? (ie, leading "vM" or "M"; M == version number)
-          unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
-          echo set-output name=DEPLOY::${DEPLOY:-<empty>/false}
-          echo ::set-output name=DEPLOY::${DEPLOY}
-          # target-specific options
-          # * CARGO_FEATURES_OPTION
-          CARGO_FEATURES_OPTION='' ;
-          if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
-          echo set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
-          echo ::set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
-          # * CARGO_USE_CROSS (truthy)
-          CARGO_USE_CROSS='true' ; case '${{ matrix.job.use-cross }}' in ''|0|f|false|n|no) unset CARGO_USE_CROSS ;; esac;
-          echo set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS:-<empty>/false}
-          echo ::set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS}
-          # # * `arm` cannot be tested on ubuntu-* hosts (b/c testing is currently primarily done via comparison of target outputs with built-in outputs and the `arm` target is not executable on the host)
-          JOB_DO_TESTING="true"
-          case ${{ matrix.job.target }} in arm-*|aarch64-*) unset JOB_DO_TESTING ;; esac;
-          echo set-output name=JOB_DO_TESTING::${JOB_DO_TESTING:-<empty>/false}
-          echo ::set-output name=JOB_DO_TESTING::${JOB_DO_TESTING}
-          # # * test only binary for arm-type targets
-          unset CARGO_TEST_OPTIONS
-          unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-*|aarch64-*) CARGO_TEST_OPTIONS="--bin ${PROJECT_NAME}" ;; esac;
-          echo set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
-          echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
-          # * strip executable?
-          STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; *-pc-windows-msvc) STRIP="" ;; aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;; aarch64-unknown-linux-musl) STRIP="" ;;esac;
-          echo set-output name=STRIP::${STRIP}
-          echo ::set-output name=STRIP::${STRIP}
-      - name: Create all needed build/work directories
-        shell: bash
-        run: |
-          mkdir -p '${{ steps.vars.outputs.STAGING }}'
-          mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}'
-      - name: rust toolchain ~ install
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
-          target: ${{ matrix.job.target }}
-          override: true
-          profile: minimal # minimal component installation (ie, no documentation)
-      - name: Info
-        shell: bash
-        run: |
-          gcc --version || true
-          rustup -V
-          rustup toolchain list
-          rustup default
-          cargo -V
-          rustc -V
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
-          command: build
-          args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
-      - name: Install cargo-deb
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-deb
-        if: matrix.job.target == 'i686-unknown-linux-musl' || matrix.job.target == 'x86_64-unknown-linux-musl'
-      - name: Build deb
-        uses: actions-rs/cargo@v1
-        with:
-          command: deb
-          args: --no-build --target=${{ matrix.job.target }}
-        if: matrix.job.target == 'i686-unknown-linux-musl' || matrix.job.target == 'x86_64-unknown-linux-musl'
-      - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
-          command: test
-          args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
-      - name: Archive executable artifacts
-        uses: actions/upload-artifact@master
-        with:
-          name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}
-          path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
-      - name: Archive deb artifacts
-        uses: actions/upload-artifact@master
-        with:
-          name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}.deb
-          path: target/${{ matrix.job.target }}/debian
-        if: matrix.job.target == 'i686-unknown-linux-musl' || matrix.job.target == 'x86_64-unknown-linux-musl'
-      - name: Package
-        shell: bash
-        run: |
-          # binary
-          cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
-          # `strip` binary (if needed)
-          if [ -n "${{ steps.vars.outputs.STRIP }}" ]; then "${{ steps.vars.outputs.STRIP }}" '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' ; fi
-          # README and LICENSE
-          cp README.md '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
-          cp LICENSE '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
-          # base compressed package
-          pushd '${{ steps.vars.outputs.STAGING }}/' >/dev/null
-          case ${{ matrix.job.target }} in
-            *-pc-windows-*) 7z -y a '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* | tail -2 ;;
-            *) tar czf '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* ;;
-          esac;
-          popd >/dev/null
-      - name: Publish
-        uses: softprops/action-gh-release@v1
-        if: steps.vars.outputs.DEPLOY
-        with:
-          files: |
-            ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
-            target/${{ matrix.job.target }}/debian/*.deb
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/checkout@v1
+    - name: Install any prerequisites
+      shell: bash
+      run: |
+        case ${{ matrix.job.target }} in
+          arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
+        esac
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+        # toolchain
+        TOOLCHAIN="stable" ## default to "stable" toolchain
+        # * specify alternate TOOLCHAIN for *-pc-windows-gnu targets; gnu targets on Windows are broken for the standard *-pc-windows-msvc toolchain (refs: <https://github.com/rust-lang/rust/issues/47048>, <https://github.com/rust-lang/rust/issues/53454>, <https://github.com/rust-lang/cargo/issues/6754>)
+        case ${{ matrix.job.target }} in *-pc-windows-gnu) TOOLCHAIN="stable-${{ matrix.job.target }}" ;; esac;
+        # * use requested TOOLCHAIN if specified
+        if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
+        echo set-output name=TOOLCHAIN::${TOOLCHAIN}
+        echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}
+        # staging directory
+        STAGING='_staging'
+        echo set-output name=STAGING::${STAGING}
+        echo ::set-output name=STAGING::${STAGING}
+        # determine EXE suffix
+        EXE_suffix="" ; case ${{ matrix.job.target }} in *-pc-windows-*) EXE_suffix=".exe" ;; esac;
+        echo set-output name=EXE_suffix::${EXE_suffix}
+        echo ::set-output name=EXE_suffix::${EXE_suffix}
+        # parse commit reference info
+        REF_NAME=${GITHUB_REF#refs/*/}
+        unset REF_BRANCH ; case ${GITHUB_REF} in refs/heads/*) REF_BRANCH=${GITHUB_REF#refs/heads/} ;; esac;
+        unset REF_TAG ; case ${GITHUB_REF} in refs/tags/*) REF_TAG=${GITHUB_REF#refs/tags/} ;; esac;
+        REF_SHAS=${GITHUB_SHA:0:8}
+        echo set-output name=REF_NAME::${REF_NAME}
+        echo set-output name=REF_BRANCH::${REF_BRANCH}
+        echo set-output name=REF_TAG::${REF_TAG}
+        echo set-output name=REF_SHAS::${REF_SHAS}
+        echo ::set-output name=REF_NAME::${REF_NAME}
+        echo ::set-output name=REF_BRANCH::${REF_BRANCH}
+        echo ::set-output name=REF_TAG::${REF_TAG}
+        echo ::set-output name=REF_SHAS::${REF_SHAS}
+        # parse target
+        unset TARGET_ARCH ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) TARGET_ARCH=arm ;; i686-*) TARGET_ARCH=i686 ;; x86_64-*) TARGET_ARCH=x86_64 ;; esac;
+        echo set-output name=TARGET_ARCH::${TARGET_ARCH}
+        echo ::set-output name=TARGET_ARCH::${TARGET_ARCH}
+        unset TARGET_OS ; case ${{ matrix.job.target }} in *-linux-*) TARGET_OS=linux ;; *-apple-*) TARGET_OS=macos ;; *-windows-*) TARGET_OS=windows ;; esac;
+        echo set-output name=TARGET_OS::${TARGET_OS}
+        echo ::set-output name=TARGET_OS::${TARGET_OS}
+        # package name
+        PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
+        PKG_BASENAME=${PROJECT_NAME}-${REF_TAG:-$REF_SHAS}-${{ matrix.job.target }}
+        PKG_NAME=${PKG_BASENAME}${PKG_suffix}
+        echo set-output name=PKG_suffix::${PKG_suffix}
+        echo set-output name=PKG_BASENAME::${PKG_BASENAME}
+        echo set-output name=PKG_NAME::${PKG_NAME}
+        echo ::set-output name=PKG_suffix::${PKG_suffix}
+        echo ::set-output name=PKG_BASENAME::${PKG_BASENAME}
+        echo ::set-output name=PKG_NAME::${PKG_NAME}
+        # deployable tag? (ie, leading "vM" or "M"; M == version number)
+        unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
+        echo set-output name=DEPLOY::${DEPLOY:-<empty>/false}
+        echo ::set-output name=DEPLOY::${DEPLOY}
+        # target-specific options
+        # * CARGO_FEATURES_OPTION
+        CARGO_FEATURES_OPTION='' ;
+        if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
+        echo set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
+        echo ::set-output name=CARGO_FEATURES_OPTION::${CARGO_FEATURES_OPTION}
+        # * CARGO_USE_CROSS (truthy)
+        CARGO_USE_CROSS='true' ; case '${{ matrix.job.use-cross }}' in ''|0|f|false|n|no) unset CARGO_USE_CROSS ;; esac;
+        echo set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS:-<empty>/false}
+        echo ::set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS}
+        # # * `arm` cannot be tested on ubuntu-* hosts (b/c testing is currently primarily done via comparison of target outputs with built-in outputs and the `arm` target is not executable on the host)
+        JOB_DO_TESTING="true"
+        case ${{ matrix.job.target }} in arm-*) unset JOB_DO_TESTING ;; esac;
+        echo set-output name=JOB_DO_TESTING::${JOB_DO_TESTING:-<empty>/false}
+        echo ::set-output name=JOB_DO_TESTING::${JOB_DO_TESTING}
+        # # * test only binary for arm-type targets
+        unset CARGO_TEST_OPTIONS
+        unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-*) CARGO_TEST_OPTIONS="--bin ${PROJECT_NAME}" ;; esac;
+        echo set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
+        echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
+        # * strip executable?
+        STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; *-pc-windows-msvc) STRIP="" ;; esac;
+        echo set-output name=STRIP::${STRIP}
+        echo ::set-output name=STRIP::${STRIP}
+    - name: Create all needed build/work directories
+      shell: bash
+      run: |
+        mkdir -p '${{ steps.vars.outputs.STAGING }}'
+        mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}'
+    - name: rust toolchain ~ install
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
+        target: ${{ matrix.job.target }}
+        override: true
+        profile: minimal # minimal component installation (ie, no documentation)
+    - name: Info
+      shell: bash
+      run: |
+        gcc --version || true
+        rustup -V
+        rustup toolchain list
+        rustup default
+        cargo -V
+        rustc -V
+    - name: Build
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: build
+        args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: test
+        args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
+    - name: Archive executable artifacts
+      uses: actions/upload-artifact@master
+      with:
+        name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}
+        path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
+    - name: Package
+      shell: bash
+      run: |
+        # binary
+        cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
+        # `strip` binary (if needed)
+        if [ -n "${{ steps.vars.outputs.STRIP }}" ]; then "${{ steps.vars.outputs.STRIP }}" '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' ; fi
+        # README and LICENSE
+        cp README.md '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
+        cp LICENSE '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
+        # base compressed package
+        pushd '${{ steps.vars.outputs.STAGING }}/' >/dev/null
+        case ${{ matrix.job.target }} in
+          *-pc-windows-*) 7z -y a '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* | tail -2 ;;
+          *) tar czf '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* ;;
+        esac;
+        popd >/dev/null
+    - name: Publish
+      uses: softprops/action-gh-release@v1
+      if: steps.vars.outputs.DEPLOY
+      with:
+        files: |
+          ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  ## fix! [rivy; 2020-22-01] `cargo tarpaulin` is unable to test this repo at the moment; alternate recipe or another testing framework?
  # coverage:
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,16 +1,23 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
 "memchr",
 ]

+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -22,11 +29,10 @@ dependencies = [

 [[package]]
 name = "assert_cmd"
-version = "1.0.8"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe"
+checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
 dependencies = [
- "bstr",
 "doc-comment",
 "predicates",
 "predicates-core",
@@ -47,27 +53,31 @@ dependencies = [

 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "bstr"
-version = "0.2.17"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
 dependencies = [
- "lazy_static",
 "memchr",
- "regex-automata",
 ]

+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -76,118 +86,56 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "3.2.17"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
+ "ansi_term 0.11.0",
 "atty",
 "bitflags",
- "clap_lex",
- "indexmap",
 "strsim",
- "termcolor",
 "textwrap",
-]
-
-[[package]]
-name = "clap_complete"
-version = "3.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4179da71abd56c26b54dd0c248cc081c1f43b0a1a7e8448e28e57a29baa993d"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "config-file"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df51e72c150781d2c7d4cbcb0b803277caaa80476786994a62961a8f1010dafb"
-dependencies = [
- "serde",
- "thiserror",
- "toml",
+ "unicode-width",
+ "vec_map",
 ]

 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
 dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "once_cell",
- "scopeguard",
+ "crossbeam-utils 0.7.2",
+ "maybe-uninit",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "cfg-if",
- "once_cell",
+ "autocfg",
+ "cfg-if 0.1.10",
+ "lazy_static",
 ]

 [[package]]
-name = "difflib"
-version = "0.4.0"
+name = "crossbeam-utils"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
-
-[[package]]
-name = "directories"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
 dependencies = [
- "dirs-sys",
+ "autocfg",
+ "cfg-if 1.0.0",
+ "lazy_static",
 ]

 [[package]]
-name = "dirs-sys"
-version = "0.3.7"
+name = "difference"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"

 [[package]]
 name = "doc-comment"
@@ -197,93 +145,79 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

 [[package]]
 name = "du-dust"
-version = "0.8.3"
+version = "0.5.4"
 dependencies = [
- "ansi_term",
+ "ansi_term 0.12.1",
 "assert_cmd",
 "clap",
- "clap_complete",
- "config-file",
- "directories",
+ "crossbeam-channel",
+ "ignore",
 "lscolors",
- "rayon",
- "regex",
- "serde",
+ "num_cpus",
 "stfu8",
 "tempfile",
 "terminal_size",
 "thousands",
 "unicode-width",
+ "walkdir",
 "winapi-util",
 ]

 [[package]]
-name = "either"
-version = "1.8.0"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "getrandom"
-version = "0.2.7"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 "libc",
 "wasi",
 ]

 [[package]]
-name = "hashbrown"
-version = "0.12.3"
+name = "globset"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
+]

 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
 dependencies = [
 "libc",
 ]

 [[package]]
-name = "indexmap"
-version = "1.9.1"
+name = "ignore"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
 dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
+ "crossbeam-utils 0.8.1",
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
 ]

 [[package]]
@@ -294,9 +228,18 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
+
+[[package]]
+name = "log"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
+dependencies = [
+ "cfg-if 0.1.10",
+]

 [[package]]
 name = "lscolors"
@@ -304,157 +247,129 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d24b894c45c9da468621cdd615a5a79ee5e5523dd4f75c76ebc03d458940c16e"
 dependencies = [
- "ansi_term",
+ "ansi_term 0.12.1",
 ]

+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"

 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
 dependencies = [
 "hermit-abi",
 "libc",
 ]

 [[package]]
-name = "once_cell"
-version = "1.13.1"
+name = "ppv-lite86"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"

 [[package]]
 name = "predicates"
-version = "2.1.1"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
+checksum = "73dd9b7b200044694dfede9edf907c1ca19630908443e9447e624993700c6932"
 dependencies = [
- "difflib",
- "itertools",
+ "difference",
 "predicates-core",
 ]

 [[package]]
 name = "predicates-core"
-version = "1.0.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
+checksum = "fb3dbeaaf793584e29c58c7e3a82bbb3c7c06b63cea68d13b0e3cddc124104dc"

 [[package]]
 name = "predicates-tree"
-version = "1.0.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
+checksum = "aee95d988ee893cb35c06b148c80ed2cd52c8eea927f50ba7a0be1a786aeab73"
 dependencies = [
 "predicates-core",
- "termtree",
+ "treeline",
 ]

 [[package]]
-name = "proc-macro2"
-version = "1.0.43"
+name = "rand"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e"
 dependencies = [
- "unicode-ident",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
 ]

 [[package]]
-name = "quote"
-version = "1.0.21"
+name = "rand_chacha"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
 dependencies = [
- "proc-macro2",
+ "ppv-lite86",
+ "rand_core",
 ]

 [[package]]
-name = "rayon"
-version = "1.5.3"
+name = "rand_core"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
+checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
 dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
+ "getrandom",
 ]

 [[package]]
-name = "rayon-core"
-version = "1.9.3"
+name = "rand_hc"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
 dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
+ "rand_core",
 ]

 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
 dependencies = [
 "bitflags",
 ]

-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
-]
-
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
 dependencies = [
 "aho-corasick",
 "memchr",
 "regex-syntax",
+ "thread_local",
 ]

-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"

 [[package]]
 name = "remove_dir_all"
@@ -466,36 +381,19 @@ dependencies = [
 ]

 [[package]]
-name = "scopeguard"
-version = "1.1.0"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "serde"
-version = "1.0.143"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.143"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "winapi-util",
 ]

 [[package]]
 name = "stfu8"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019f0c664fd85d5a87dcfb62b40b691055392a35a6e59f4df83d4b770db7e876"
+checksum = "4bf70433e3300a3c395d06606a700cdf4205f4f14dbae2c6833127c6bb22db77"
 dependencies = [
 "lazy_static",
 "regex",
@@ -503,84 +401,41 @@ dependencies = [

 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "1.0.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
- "cfg-if",
- "fastrand",
+ "cfg-if 1.0.0",
 "libc",
+ "rand",
 "redox_syscall",
 "remove_dir_all",
 "winapi",
 ]

-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "terminal_size"
-version = "0.1.17"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
+checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1"
 dependencies = [
 "libc",
 "winapi",
 ]

-[[package]]
-name = "termtree"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
-
 [[package]]
 name = "textwrap"
-version = "0.15.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
-[[package]]
-name = "thiserror"
-version = "1.0.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "unicode-width",
 ]

 [[package]]
@@ -590,25 +445,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"

 [[package]]
-name = "toml"
-version = "0.5.9"
+name = "thread_local"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
 dependencies = [
- "serde",
+ "lazy_static",
 ]

 [[package]]
-name = "unicode-ident"
-version = "1.0.3"
+name = "treeline"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"

 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"

 [[package]]
 name = "wait-timeout"
@@ -620,10 +481,21 @@ dependencies = [
 ]

 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "walkdir"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+dependencies = [
+ "same-file",
+ "winapi",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.10.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"

 [[package]]
 name = "winapi"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,9 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "0.8.3"
+version = "0.5.4"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
-edition = "2021"
-readme = "README.md"
+edition = "2018"

 documentation = "https://github.com/bootandy/dust"
 homepage = "https://github.com/bootandy/dust"
@@ -15,67 +14,33 @@ categories = ["command-line-utilities"]
 license = "Apache-2.0"

 [badges]
-travis-ci = { repository = "https://travis-ci.org/bootandy/dust" }
+travis-ci = {repository = "https://travis-ci.org/bootandy/dust"}

 [[bin]]
 name = "dust"
 path = "src/main.rs"

-[profile.release]
-codegen-units = 1
-lto = true
-strip = true
-
 [dependencies]
 ansi_term = "0.12"
-clap = "3.2.17"
+clap = "=2.33"
 lscolors = "0.7"
+num_cpus = "1"
 terminal_size = "0.1"
 unicode-width = "0.1"
-rayon = "1"
+ignore="0.4"
+crossbeam-channel = "0.4"
+walkdir="2.3"
 thousands = "0.2"
 stfu8 = "0.2"
-regex = "1"
-config-file = "0.2"
-serde = { version = "1.0", features = ["derive"] }
-directories = "4"

 [target.'cfg(windows)'.dependencies]
 winapi-util = "0.1"

 [dev-dependencies]
-assert_cmd = "1"
+assert_cmd ="1"
 tempfile = "=3"

-[build-dependencies]
-clap = "3.2.17"
-clap_complete = "3.2.4"

 [[test]]
 name = "integration"
 path = "tests/tests.rs"
-
-[package.metadata.deb]
-section = "utils"
-assets = [
-  [
-    "target/release/dust",
-    "usr/bin/",
-    "755",
-  ],
-  [
-    "LICENSE",
-    "usr/share/doc/du-dust/",
-    "644",
-  ],
-  [
-    "README.md",
-    "usr/share/doc/du-dust/README",
-    "644",
-  ],
-]
-extended-description = """\
-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 one
-'Did not have permissions message'.
-"""
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
 [![Build Status](https://travis-ci.org/bootandy/dust.svg?branch=master)](https://travis-ci.org/bootandy/dust)

 # Dust
@@ -9,37 +10,27 @@ du + rust = dust. Like du but more intuitive.
 Because I want an easy way to see where my disk is being used.

 # Demo
-
 ![Example](media/snap.png)

 ## Install

 #### Cargo <a href="https://repology.org/project/du-dust/versions"><img src="https://repology.org/badge/vertical-allrepos/du-dust.svg" alt="Packaging status" align="right"></a>

- `cargo install du-dust`
+* `cargo install du-dust`

 #### 🍺 Homebrew (Mac OS)

- `brew install dust`
+* `brew install dust`

 #### 🍺 Homebrew (Linux)

- `brew tap tgotwig/linux-dust && brew install dust`
-
-#### [Pacstall](https://github.com/pacstall/pacstall) (Debian/Ubuntu)
-
- `pacstall -I dust-bin`
-
-#### Windows:
-
- Windows GNU version - works
- Windows MSVC - requires: [VCRUNTIME140.dll](https://docs.microsoft.com/en-gb/cpp/windows/latest-supported-vc-redist?view=msvc-170)
+* `brew tap tgotwig/linux-dust && brew install dust`

 #### Download

- 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/`
+* 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

@@ -47,40 +38,27 @@ Dust is meant to give you an instant overview of which directories are using dis

 Dust will list a slightly-less-than-the-terminal-height number of the biggest subdirectories 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 subdirectories will be colored.

-The different colors on the bars: These represent the combined tree hierarchy & disk usage. The shades of grey are used to indicate which parent folder a subfolder belongs to. For instance, look at the above screenshot. `.steam` is a folder taking 44% of the space. From the `.steam` bar is a light grey line that goes up. All these folders are inside `.steam` so if you delete `.steam` all that stuff will be gone too.
-
 ## Usage

 ```
 Usage: dust
 Usage: dust <dir>
 Usage: dust <dir>  <another_dir> <and_more>
-Usage: dust -p (full-path - Show fullpath of the subdirectories)
-Usage: dust -s (apparent-size - shows the length of the file as opposed to the amount of disk space it uses)
-Usage: dust -n 30  (Shows 30 directories instead of the default [default is terminal height])
-Usage: dust -d 3  (Shows 3 levels of subdirectories)
-Usage: dust -r (reverse order of output)
-Usage: dust -H (si print sizes in powers of 1000 instead of 1024)
-Usage: dust -X ignore  (ignore all files and directories with the name 'ignore')
-Usage: dust -x (Only show directories on the same filesystem)
-Usage: dust -b (Do not show percentages or draw ASCII bars)
-Usage: dust -i (Do not show hidden files)
-Usage: dust -c (No colors [monochrome])
-Usage: dust -f (Count files instead of diskspace)
-Usage: dust -t (Group by filetype)
-Usage: dust -z 10M (min-size, Only include files larger than 10M)
-Usage: dust -e regex (Only include files matching this regex (eg dust -e "\.png$" would match png files))
-Usage: dust -v regex (Exclude files matching this regex (eg dust -v "\.png$" would ignore png files))
-
+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 instead of the default)
+Usage: dust -d 3  <dir>  (shows 3 levels of subdirectories)
+Usage: dust -r  <dir>  (reverse order of output, with root at the lowest)
+Usage: dust -x  <dir>  (only show directories on the same filesystem)
+Usage: dust -X ignore  <dir>  (ignore all files and directories with the name 'ignore')
+Usage: dust -b <dir>  (do not show percentages or draw ASCII bars)
 ```

+
 ## Alternatives

- [NCDU](https://dev.yorhel.nl/ncdu)
- [dutree](https://github.com/nachoparker/dutree)
- [dua](https://github.com/Byron/dua-cli/)
- [pdu](https://github.com/KSXGitHub/parallel-disk-usage)
- [dirstat-rs](https://github.com/scullionw/dirstat-rs)
- du -d 1 -h | sort -h
+* [NCDU](https://dev.yorhel.nl/ncdu)
+* [dutree](https://github.com/nachoparker/dutree)
+* 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.
--- a/build.rs
+++ b/build.rs
@@ -1,18 +0,0 @@
-use clap_complete::{generate_to, shells::*};
-use std::io::Error;
-
-include!("src/cli.rs");
-
-fn main() -> Result<(), Error> {
-    let outdir = "completions";
-    let app_name = "dust";
-    let mut cmd = build_cli();
-
-    generate_to(Bash, &mut cmd, app_name, outdir)?;
-    generate_to(Zsh, &mut cmd, app_name, outdir)?;
-    generate_to(Fish, &mut cmd, app_name, outdir)?;
-    generate_to(PowerShell, &mut cmd, app_name, outdir)?;
-    generate_to(Elvish, &mut cmd, app_name, outdir)?;
-
-    Ok(())
-}
--- a/ci/how2publish.txt
+++ b/ci/how2publish.txt
@@ -1,6 +1,6 @@
 # ----------- To do a release ---------
 # edit version in cargo.toml
-# tag a commit and push (increment version in Cargo.toml first):
+# tag a commit and push (increment version first):
 #   git tag v0.4.5
 #   git push origin v0.4.5

--- a/completions/_dust
+++ b/completions/_dust
@@ -1,67 +0,0 @@
-#compdef dust
-
-autoload -U is-at-least
-
-_dust() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
-
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
-
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'-d+[Depth to show]: : ' \
-'--depth=[Depth to show]: : ' \
-'-n+[Number of lines of output to show. (Default is terminal_height - 10)]: : ' \
-'--number-of-lines=[Number of lines of output to show. (Default is terminal_height - 10)]: : ' \
-'*-X+[Exclude any file or directory with this name]: : ' \
-'*--ignore-directory=[Exclude any file or directory with this name]: : ' \
-'-z+[Minimum size file to include in output]: : ' \
-'--min-size=[Minimum size file to include in output]: : ' \
-'(-e --filter -t --file_types)*-v+[Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$" ]: : ' \
-'(-e --filter -t --file_types)*--invert-filter=[Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$" ]: : ' \
-'(-t --file_types)*-e+[Only include filepaths matching this regex. For png files type: -e "\\.png$" ]: : ' \
-'(-t --file_types)*--filter=[Only include filepaths matching this regex. For png files type: -e "\\.png$" ]: : ' \
-'-w+[Specify width of output overriding the auto detection of terminal width]: : ' \
-'--terminal_width=[Specify width of output overriding the auto detection of terminal width]: : ' \
-'-h[Print help information]' \
-'--help[Print help information]' \
-'-V[Print version information]' \
-'--version[Print version information]' \
-'-p[Subdirectories will not have their path shortened]' \
-'--full-paths[Subdirectories will not have their path shortened]' \
-'-x[Only count the files and directories on the same filesystem as the supplied directory]' \
-'--limit-filesystem[Only count the files and directories on the same filesystem as the supplied directory]' \
-'-s[Use file length instead of blocks]' \
-'--apparent-size[Use file length instead of blocks]' \
-'-r[Print tree upside down (biggest highest)]' \
-'--reverse[Print tree upside down (biggest highest)]' \
-'-c[No colors will be printed (Useful for commands like: watch)]' \
-'--no-colors[No colors will be printed (Useful for commands like: watch)]' \
-'-b[No percent bars or percentages will be displayed]' \
-'--no-percent-bars[No percent bars or percentages will be displayed]' \
-'--skip-total[No total row will be displayed]' \
-'-f[Directory '\''size'\'' is number of child files/dirs not disk size]' \
-'--filecount[Directory '\''size'\'' is number of child files/dirs not disk size]' \
-'-i[Do not display hidden files]' \
-'--ignore_hidden[Do not display hidden files]' \
-'(-d --depth)-t[show only these file types]' \
-'(-d --depth)--file_types[show only these file types]' \
-'-H[print sizes in powers of 1000 (e.g., 1.1G)]' \
-'--si[print sizes in powers of 1000 (e.g., 1.1G)]' \
-'*::inputs:' \
-&& ret=0
-}
-
-(( $+functions[_dust_commands] )) ||
-_dust_commands() {
-    local commands; commands=()
-    _describe -t commands 'dust commands' commands "$@"
-}
-
-_dust "$@"
--- a/completions/_dust.ps1
+++ b/completions/_dust.ps1
@@ -1,69 +0,0 @@
-
-using namespace System.Management.Automation
-using namespace System.Management.Automation.Language
-
-Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
-    param($wordToComplete, $commandAst, $cursorPosition)
-
-    $commandElements = $commandAst.CommandElements
-    $command = @(
-        'dust'
-        for ($i = 1; $i -lt $commandElements.Count; $i++) {
-            $element = $commandElements[$i]
-            if ($element -isnot [StringConstantExpressionAst] -or
-                $element.StringConstantType -ne [StringConstantType]::BareWord -or
-                $element.Value.StartsWith('-') -or
-                $element.Value -eq $wordToComplete) {
-                break
-        }
-        $element.Value
-    }) -join ';'
-
-    $completions = @(switch ($command) {
-        'dust' {
-            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'Depth to show')
-            [CompletionResult]::new('--depth', 'depth', [CompletionResultType]::ParameterName, 'Depth to show')
-            [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
-            [CompletionResult]::new('--number-of-lines', 'number-of-lines', [CompletionResultType]::ParameterName, 'Number of lines of output to show. (Default is terminal_height - 10)')
-            [CompletionResult]::new('-X', 'X', [CompletionResultType]::ParameterName, 'Exclude any file or directory with this name')
-            [CompletionResult]::new('--ignore-directory', 'ignore-directory', [CompletionResultType]::ParameterName, 'Exclude any file or directory with this name')
-            [CompletionResult]::new('-z', 'z', [CompletionResultType]::ParameterName, 'Minimum size file to include in output')
-            [CompletionResult]::new('--min-size', 'min-size', [CompletionResultType]::ParameterName, 'Minimum size file to include in output')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" ')
-            [CompletionResult]::new('--invert-filter', 'invert-filter', [CompletionResultType]::ParameterName, 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" ')
-            [CompletionResult]::new('-e', 'e', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
-            [CompletionResult]::new('--filter', 'filter', [CompletionResultType]::ParameterName, 'Only include filepaths matching this regex. For png files type: -e "\.png$" ')
-            [CompletionResult]::new('-w', 'w', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('--terminal_width', 'terminal_width', [CompletionResultType]::ParameterName, 'Specify width of output overriding the auto detection of terminal width')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Print version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Print version information')
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
-            [CompletionResult]::new('--full-paths', 'full-paths', [CompletionResultType]::ParameterName, 'Subdirectories will not have their path shortened')
-            [CompletionResult]::new('-x', 'x', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
-            [CompletionResult]::new('--limit-filesystem', 'limit-filesystem', [CompletionResultType]::ParameterName, 'Only count the files and directories on the same filesystem as the supplied directory')
-            [CompletionResult]::new('-s', 's', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
-            [CompletionResult]::new('--apparent-size', 'apparent-size', [CompletionResultType]::ParameterName, 'Use file length instead of blocks')
-            [CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
-            [CompletionResult]::new('--reverse', 'reverse', [CompletionResultType]::ParameterName, 'Print tree upside down (biggest highest)')
-            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
-            [CompletionResult]::new('--no-colors', 'no-colors', [CompletionResultType]::ParameterName, 'No colors will be printed (Useful for commands like: watch)')
-            [CompletionResult]::new('-b', 'b', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
-            [CompletionResult]::new('--no-percent-bars', 'no-percent-bars', [CompletionResultType]::ParameterName, 'No percent bars or percentages will be displayed')
-            [CompletionResult]::new('--skip-total', 'skip-total', [CompletionResultType]::ParameterName, 'No total row will be displayed')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files/dirs not disk size')
-            [CompletionResult]::new('--filecount', 'filecount', [CompletionResultType]::ParameterName, 'Directory ''size'' is number of child files/dirs not disk size')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Do not display hidden files')
-            [CompletionResult]::new('--ignore_hidden', 'ignore_hidden', [CompletionResultType]::ParameterName, 'Do not display hidden files')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('--file_types', 'file_types', [CompletionResultType]::ParameterName, 'show only these file types')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'print sizes in powers of 1000 (e.g., 1.1G)')
-            [CompletionResult]::new('--si', 'si', [CompletionResultType]::ParameterName, 'print sizes in powers of 1000 (e.g., 1.1G)')
-            break
-        }
-    })
-
-    $completions.Where{ $_.CompletionText -like "$wordToComplete*" } |
-        Sort-Object -Property ListItemText
-}
--- a/completions/dust.bash
+++ b/completions/dust.bash
@@ -1,94 +0,0 @@
-_dust() {
-    local i cur prev opts cmds
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    cmd=""
-    opts=""
-
-    for i in ${COMP_WORDS[@]}
-    do
-        case "${i}" in
-            "$1")
-                cmd="dust"
-                ;;
-            *)
-                ;;
-        esac
-    done
-
-    case "${cmd}" in
-        dust)
-            opts="-h -V -d -n -p -X -x -s -r -c -b -z -f -i -v -e -t -w -H --help --version --depth --number-of-lines --full-paths --ignore-directory --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --min-size --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si <inputs>..."
-            if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
-                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
-                return 0
-            fi
-            case "${prev}" in
-                --depth)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -d)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --number-of-lines)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -n)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --ignore-directory)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -X)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --min-size)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -z)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --invert-filter)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -v)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --filter)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -e)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --terminal_width)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                -w)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                *)
-                    COMPREPLY=()
-                    ;;
-            esac
-            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
-            return 0
-            ;;
-    esac
-}
-
-complete -F _dust -o bashdefault -o default dust
--- a/completions/dust.elv
+++ b/completions/dust.elv
@@ -1,63 +0,0 @@
-
-use builtin;
-use str;
-
-set edit:completion:arg-completer[dust] = {|@words|
-    fn spaces {|n|
-        builtin:repeat $n ' ' | str:join ''
-    }
-    fn cand {|text desc|
-        edit:complex-candidate $text &display=$text' '(spaces (- 14 (wcswidth $text)))$desc
-    }
-    var command = 'dust'
-    for word $words[1..-1] {
-        if (str:has-prefix $word '-') {
-            break
-        }
-        set command = $command';'$word
-    }
-    var completions = [
-        &'dust'= {
-            cand -d 'Depth to show'
-            cand --depth 'Depth to show'
-            cand -n 'Number of lines of output to show. (Default is terminal_height - 10)'
-            cand --number-of-lines 'Number of lines of output to show. (Default is terminal_height - 10)'
-            cand -X 'Exclude any file or directory with this name'
-            cand --ignore-directory 'Exclude any file or directory with this name'
-            cand -z 'Minimum size file to include in output'
-            cand --min-size 'Minimum size file to include in output'
-            cand -v 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" '
-            cand --invert-filter 'Exclude filepaths matching this regex. To ignore png files type: -v "\.png$" '
-            cand -e 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
-            cand --filter 'Only include filepaths matching this regex. For png files type: -e "\.png$" '
-            cand -w 'Specify width of output overriding the auto detection of terminal width'
-            cand --terminal_width 'Specify width of output overriding the auto detection of terminal width'
-            cand -h 'Print help information'
-            cand --help 'Print help information'
-            cand -V 'Print version information'
-            cand --version 'Print version information'
-            cand -p 'Subdirectories will not have their path shortened'
-            cand --full-paths 'Subdirectories will not have their path shortened'
-            cand -x 'Only count the files and directories on the same filesystem as the supplied directory'
-            cand --limit-filesystem 'Only count the files and directories on the same filesystem as the supplied directory'
-            cand -s 'Use file length instead of blocks'
-            cand --apparent-size 'Use file length instead of blocks'
-            cand -r 'Print tree upside down (biggest highest)'
-            cand --reverse 'Print tree upside down (biggest highest)'
-            cand -c 'No colors will be printed (Useful for commands like: watch)'
-            cand --no-colors 'No colors will be printed (Useful for commands like: watch)'
-            cand -b 'No percent bars or percentages will be displayed'
-            cand --no-percent-bars 'No percent bars or percentages will be displayed'
-            cand --skip-total 'No total row will be displayed'
-            cand -f 'Directory ''size'' is number of child files/dirs not disk size'
-            cand --filecount 'Directory ''size'' is number of child files/dirs not disk size'
-            cand -i 'Do not display hidden files'
-            cand --ignore_hidden 'Do not display hidden files'
-            cand -t 'show only these file types'
-            cand --file_types 'show only these file types'
-            cand -H 'print sizes in powers of 1000 (e.g., 1.1G)'
-            cand --si 'print sizes in powers of 1000 (e.g., 1.1G)'
-        }
-    ]
-    $completions[$command]
-}
--- a/completions/dust.fish
+++ b/completions/dust.fish
@@ -1,20 +0,0 @@
-complete -c dust -s d -l depth -d 'Depth to show' -r
-complete -c dust -s n -l number-of-lines -d 'Number of lines of output to show. (Default is terminal_height - 10)' -r
-complete -c dust -s X -l ignore-directory -d 'Exclude any file or directory with this name' -r
-complete -c dust -s z -l min-size -d 'Minimum size file to include in output' -r
-complete -c dust -s v -l invert-filter -d 'Exclude filepaths matching this regex. To ignore png files type: -v "\\.png$" ' -r
-complete -c dust -s e -l filter -d 'Only include filepaths matching this regex. For png files type: -e "\\.png$" ' -r
-complete -c dust -s w -l terminal_width -d 'Specify width of output overriding the auto detection of terminal width' -r
-complete -c dust -s h -l help -d 'Print help information'
-complete -c dust -s V -l version -d 'Print version information'
-complete -c dust -s p -l full-paths -d 'Subdirectories will not have their path shortened'
-complete -c dust -s x -l limit-filesystem -d 'Only count the files and directories on the same filesystem as the supplied directory'
-complete -c dust -s s -l apparent-size -d 'Use file length instead of blocks'
-complete -c dust -s r -l reverse -d 'Print tree upside down (biggest highest)'
-complete -c dust -s c -l no-colors -d 'No colors will be printed (Useful for commands like: watch)'
-complete -c dust -s b -l no-percent-bars -d 'No percent bars or percentages will be displayed'
-complete -c dust -l skip-total -d 'No total row will be displayed'
-complete -c dust -s f -l filecount -d 'Directory \'size\' is number of child files/dirs not disk size'
-complete -c dust -s i -l ignore_hidden -d 'Do not display hidden files'
-complete -c dust -s t -l file_types -d 'show only these file types'
-complete -c dust -s H -l si -d 'print sizes in powers of 1000 (e.g., 1.1G)'
--- a/config/config.toml
+++ b/config/config.toml
@@ -1,13 +0,0 @@
-# Sample Config file, works with toml and yaml
-# Place in either:
-#   ~/.config/dust/config.toml
-#   ~/.dust.toml
-
-reverse=true
-display-full-paths=true
-display-apparent-size=true
-no-colors=true
-no-bars=true
-skip-total=true
-ignore-hidden=true
-iso=true
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,135 +0,0 @@
-use clap::{Arg, Command};
-
-pub fn build_cli() -> Command<'static> {
-    Command::new("Dust")
-        .about("Like du but more intuitive")
-        .version(env!("CARGO_PKG_VERSION"))
-        .trailing_var_arg(true)
-        .arg(
-            Arg::new("depth")
-                .short('d')
-                .long("depth")
-                .help("Depth to show")
-                .takes_value(true)
-        )
-        .arg(
-            Arg::new("number_of_lines")
-                .short('n')
-                .long("number-of-lines")
-                .help("Number of lines of output to show. (Default is terminal_height - 10)")
-                .takes_value(true)
-        )
-        .arg(
-            Arg::new("display_full_paths")
-                .short('p')
-                .long("full-paths")
-                .help("Subdirectories will not have their path shortened"),
-        )
-        .arg(
-            Arg::new("ignore_directory")
-                .short('X')
-                .long("ignore-directory")
-                .takes_value(true)
-                .number_of_values(1)
-                .multiple_occurrences(true)
-                .help("Exclude any file or directory with this name"),
-        )
-        .arg(
-            Arg::new("limit_filesystem")
-                .short('x')
-                .long("limit-filesystem")
-                .help("Only count the files and directories on the same filesystem as the supplied directory"),
-        )
-        .arg(
-            Arg::new("display_apparent_size")
-                .short('s')
-                .long("apparent-size")
-                .help("Use file length instead of blocks"),
-        )
-        .arg(
-            Arg::new("reverse")
-                .short('r')
-                .long("reverse")
-                .help("Print tree upside down (biggest highest)"),
-        )
-        .arg(
-            Arg::new("no_colors")
-                .short('c')
-                .long("no-colors")
-                .help("No colors will be printed (Useful for commands like: watch)"),
-        )
-        .arg(
-            Arg::new("no_bars")
-                .short('b')
-                .long("no-percent-bars")
-                .help("No percent bars or percentages will be displayed"),
-        )
-        .arg(
-            Arg::new("min_size")
-                .short('z')
-                .long("min-size")
-                .takes_value(true)
-                .number_of_values(1)
-                .help("Minimum size file to include in output"),
-        )
-        .arg(
-            Arg::new("skip_total")
-                .long("skip-total")
-                .help("No total row will be displayed"),
-        )
-        .arg(
-            Arg::new("by_filecount")
-                .short('f')
-                .long("filecount")
-                .help("Directory 'size' is number of child files/dirs not disk size"),
-        )
-        .arg(
-            Arg::new("ignore_hidden")
-                .short('i') // Do not use 'h' this is used by 'help'
-                .long("ignore_hidden")
-                .help("Do not display hidden files"),
-        )
-        .arg(
-            Arg::new("invert_filter")
-                .short('v')
-                .long("invert-filter")
-                .takes_value(true)
-                .number_of_values(1)
-                .multiple_occurrences(true)
-                .conflicts_with("filter")
-                .conflicts_with("types")
-                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
-        )
-        .arg(
-            Arg::new("filter")
-                .short('e')
-                .long("filter")
-                .takes_value(true)
-                .number_of_values(1)
-                .multiple_occurrences(true)
-                .conflicts_with("types")
-                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
-        )
-        .arg(
-            Arg::new("types")
-                .short('t')
-                .long("file_types")
-                .conflicts_with("depth")
-                .help("show only these file types"),
-        )
-        .arg(
-            Arg::new("width")
-                .short('w')
-                .long("terminal_width")
-                .takes_value(true)
-                .number_of_values(1)
-                .help("Specify width of output overriding the auto detection of terminal width"),
-        )
-        .arg(
-            Arg::new("iso")
-                .short('H')
-                .long("si")
-                .help("print sizes in powers of 1000 (e.g., 1.1G)")
-        )
-        .arg(Arg::new("inputs").multiple_occurrences(true).default_value("."))
-}
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,148 +0,0 @@
-use clap::ArgMatches;
-use config_file::FromConfigFile;
-use serde::Deserialize;
-use std::path::Path;
-use std::path::PathBuf;
-
-use crate::display::UNITS;
-
-#[derive(Deserialize, Default)]
-#[serde(rename_all = "kebab-case")]
-#[serde(deny_unknown_fields)]
-pub struct Config {
-    pub display_full_paths: Option<bool>,
-    pub display_apparent_size: Option<bool>,
-    pub reverse: Option<bool>,
-    pub no_colors: Option<bool>,
-    pub no_bars: Option<bool>,
-    pub skip_total: Option<bool>,
-    pub ignore_hidden: Option<bool>,
-    pub iso: Option<bool>,
-    pub min_size: Option<String>,
-}
-
-impl Config {
-    pub fn get_no_colors(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_colors || options.is_present("no_colors")
-    }
-    pub fn get_apparent_size(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_apparent_size || options.is_present("display_apparent_size")
-    }
-    pub fn get_ignore_hidden(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.ignore_hidden || options.is_present("ignore_hidden")
-    }
-    pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.display_full_paths || options.is_present("display_full_paths")
-    }
-    pub fn get_reverse(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.reverse || options.is_present("reverse")
-    }
-    pub fn get_no_bars(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.no_bars || options.is_present("no_bars")
-    }
-    pub fn get_iso(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.iso || options.is_present("iso")
-    }
-    pub fn get_skip_total(&self, options: &ArgMatches) -> bool {
-        Some(true) == self.skip_total || options.is_present("skip_total")
-    }
-    pub fn get_min_size(&self, options: &ArgMatches, iso: bool) -> Option<usize> {
-        let size_from_param = options.value_of("min_size");
-        self._get_min_size(size_from_param, iso)
-    }
-    fn _get_min_size(&self, min_size: Option<&str>, iso: bool) -> Option<usize> {
-        let size_from_param = min_size.and_then(|a| convert_min_size(a, iso));
-
-        if size_from_param.is_none() {
-            self.min_size
-                .as_ref()
-                .and_then(|a| convert_min_size(a.as_ref(), iso))
-        } else {
-            size_from_param
-        }
-    }
-}
-
-fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
-    let chars_as_vec: Vec<char> = input.chars().collect();
-    match chars_as_vec.split_last() {
-        Some((last, start)) => {
-            let mut starts: String = start.iter().collect::<String>();
-
-            for (i, u) in UNITS.iter().rev().enumerate() {
-                if Some(*u) == last.to_uppercase().next() {
-                    return match starts.parse::<usize>() {
-                        Ok(pure) => {
-                            let num: usize = if iso { 1000 } else { 1024 };
-                            let marker = pure * num.pow((i + 1) as u32);
-                            Some(marker)
-                        }
-                        Err(_) => {
-                            eprintln!("Ignoring invalid min-size: {}", input);
-                            None
-                        }
-                    };
-                }
-            }
-            starts.push(*last);
-            starts
-                .parse()
-                .map_err(|_| {
-                    eprintln!("Ignoring invalid min-size: {}", input);
-                })
-                .ok()
-        }
-        None => None,
-    }
-}
-
-fn get_config_locations(base: &Path) -> Vec<PathBuf> {
-    vec![
-        base.join(".dust.toml"),
-        base.join(".config").join("dust").join("config.toml"),
-    ]
-}
-
-pub fn get_config() -> Config {
-    if let Some(home) = directories::BaseDirs::new() {
-        for path in get_config_locations(home.home_dir()) {
-            if path.exists() {
-                if let Ok(config) = Config::from_config_file(path) {
-                    return config;
-                }
-            }
-        }
-    }
-    Config {
-        ..Default::default()
-    }
-}
-
-mod tests {
-    #[allow(unused_imports)]
-    use super::*;
-
-    #[test]
-    fn test_conversion() {
-        assert_eq!(convert_min_size("55", false), Some(55));
-        assert_eq!(convert_min_size("12344321", false), Some(12344321));
-        assert_eq!(convert_min_size("95RUBBISH", false), None);
-        assert_eq!(convert_min_size("10K", false), Some(10 * 1024));
-        assert_eq!(convert_min_size("10M", false), Some(10 * 1024usize.pow(2)));
-        assert_eq!(convert_min_size("10M", true), Some(10 * 1000usize.pow(2)));
-        assert_eq!(convert_min_size("2G", false), Some(2 * 1024usize.pow(3)));
-    }
-
-    #[test]
-    fn test_min_size_from_config_applied_or_overridden() {
-        let c = Config {
-            min_size: Some("1K".to_owned()),
-            ..Default::default()
-        };
-        assert_eq!(c._get_min_size(None, false), Some(1024));
-        assert_eq!(c._get_min_size(Some("2K"), false), Some(2048));
-
-        assert_eq!(c._get_min_size(None, true), Some(1000));
-        assert_eq!(c._get_min_size(Some("2K"), true), Some(2000));
-    }
-}
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -1,226 +0,0 @@
-use std::fs;
-
-use crate::node::Node;
-use crate::utils::is_filtered_out_due_to_invert_regex;
-use crate::utils::is_filtered_out_due_to_regex;
-use rayon::iter::ParallelBridge;
-use rayon::prelude::ParallelIterator;
-use regex::Regex;
-use std::path::PathBuf;
-
-use std::sync::atomic;
-use std::sync::atomic::AtomicBool;
-
-use std::collections::HashSet;
-
-use crate::node::build_node;
-use std::fs::DirEntry;
-
-use crate::platform::get_metadata;
-
-pub struct WalkData<'a> {
-    pub ignore_directories: HashSet<PathBuf>,
-    pub filter_regex: &'a [Regex],
-    pub invert_filter_regex: &'a [Regex],
-    pub allowed_filesystems: HashSet<u64>,
-    pub use_apparent_size: bool,
-    pub by_filecount: bool,
-    pub ignore_hidden: bool,
-}
-
-pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: WalkData) -> (Vec<Node>, bool) {
-    let permissions_flag = AtomicBool::new(false);
-
-    let top_level_nodes: Vec<_> = dirs
-        .into_iter()
-        .filter_map(|d| {
-            clean_inodes(
-                walk(d, &permissions_flag, &walk_data, 0)?,
-                &mut HashSet::new(),
-                walk_data.use_apparent_size,
-            )
-        })
-        .collect();
-    (top_level_nodes, permissions_flag.into_inner())
-}
-
-// Remove files which have the same inode, we don't want to double count them.
-fn clean_inodes(
-    x: Node,
-    inodes: &mut HashSet<(u64, u64)>,
-    use_apparent_size: bool,
-) -> Option<Node> {
-    if !use_apparent_size {
-        if let Some(id) = x.inode_device {
-            if !inodes.insert(id) {
-                return None;
-            }
-        }
-    }
-
-    // Sort Nodes so iteration order is predictable
-    let mut tmp: Vec<_> = x.children;
-    tmp.sort_by(sort_by_inode);
-    let new_children: Vec<_> = tmp
-        .into_iter()
-        .filter_map(|c| clean_inodes(c, inodes, use_apparent_size))
-        .collect();
-
-    Some(Node {
-        name: x.name,
-        size: x.size + new_children.iter().map(|c| c.size).sum::<u64>(),
-        children: new_children,
-        inode_device: x.inode_device,
-        depth: x.depth,
-    })
-}
-
-fn sort_by_inode(a: &Node, b: &Node) -> std::cmp::Ordering {
-    // Sorting by inode is quicker than by sorting by name/size
-    if let Some(x) = a.inode_device {
-        if let Some(y) = b.inode_device {
-            if x.0 != y.0 {
-                return x.0.cmp(&y.0);
-            } else if x.1 != y.1 {
-                return x.1.cmp(&y.1);
-            }
-        }
-    }
-    a.name.cmp(&b.name)
-}
-
-fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
-    let is_dot_file = entry.file_name().to_str().unwrap_or("").starts_with('.');
-    let is_ignored_path = walk_data.ignore_directories.contains(&entry.path());
-
-    if !walk_data.allowed_filesystems.is_empty() {
-        let size_inode_device = get_metadata(&entry.path(), false);
-
-        if let Some((_size, Some((_id, dev)))) = size_inode_device {
-            if !walk_data.allowed_filesystems.contains(&dev) {
-                return true;
-            }
-        }
-    }
-
-    // Keeping `walk_data.filter_regex.is_empty()` is important for performance reasons, it stops unnecessary work
-    if !walk_data.filter_regex.is_empty()
-        && entry.path().is_file()
-        && is_filtered_out_due_to_regex(walk_data.filter_regex, &entry.path())
-    {
-        return true;
-    }
-
-    if !walk_data.invert_filter_regex.is_empty()
-        && entry.path().is_file()
-        && is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &entry.path())
-    {
-        return true;
-    }
-
-    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
-}
-
-fn walk(
-    dir: PathBuf,
-    permissions_flag: &AtomicBool,
-    walk_data: &WalkData,
-    depth: usize,
-) -> Option<Node> {
-    let mut children = vec![];
-
-    if let Ok(entries) = fs::read_dir(&dir) {
-        children = entries
-            .into_iter()
-            .par_bridge()
-            .filter_map(|entry| {
-                if let Ok(ref entry) = entry {
-                    // uncommenting the below line gives simpler code but
-                    // rayon doesn't parallelize as well giving a 3X performance drop
-                    // hence we unravel the recursion a bit
-
-                    // return walk(entry.path(), permissions_flag, ignore_directories, allowed_filesystems, use_apparent_size, by_filecount, ignore_hidden);
-
-                    if !ignore_file(entry, walk_data) {
-                        if let Ok(data) = entry.file_type() {
-                            return if data.is_dir() && !data.is_symlink() {
-                                walk(entry.path(), permissions_flag, walk_data, depth + 1)
-                            } else {
-                                build_node(
-                                    entry.path(),
-                                    vec![],
-                                    walk_data.filter_regex,
-                                    walk_data.invert_filter_regex,
-                                    walk_data.use_apparent_size,
-                                    data.is_symlink(),
-                                    data.is_file(),
-                                    walk_data.by_filecount,
-                                    depth,
-                                )
-                            };
-                        }
-                    }
-                } else {
-                    permissions_flag.store(true, atomic::Ordering::Relaxed);
-                }
-                None
-            })
-            .collect();
-    } else {
-        // Handle edge case where dust is called with a file instead of a directory
-        if !dir.exists() {
-            permissions_flag.store(true, atomic::Ordering::Relaxed);
-        }
-    }
-    build_node(
-        dir,
-        children,
-        walk_data.filter_regex,
-        walk_data.invert_filter_regex,
-        walk_data.use_apparent_size,
-        false,
-        false,
-        walk_data.by_filecount,
-        depth,
-    )
-}
-
-mod tests {
-    #[allow(unused_imports)]
-    use super::*;
-
-    #[cfg(test)]
-    fn create_node() -> Node {
-        Node {
-            name: PathBuf::new(),
-            size: 10,
-            children: vec![],
-            inode_device: Some((5, 6)),
-            depth: 0,
-        }
-    }
-
-    #[test]
-    #[allow(clippy::redundant_clone)]
-    fn test_should_ignore_file() {
-        let mut inodes = HashSet::new();
-        let n = create_node();
-
-        // First time we insert the node
-        assert_eq!(clean_inodes(n.clone(), &mut inodes, false), Some(n.clone()));
-
-        // Second time is a duplicate - we ignore it
-        assert_eq!(clean_inodes(n.clone(), &mut inodes, false), None);
-    }
-
-    #[test]
-    #[allow(clippy::redundant_clone)]
-    fn test_should_not_ignore_files_if_using_apparent_size() {
-        let mut inodes = HashSet::new();
-        let n = create_node();
-
-        // If using apparent size we include Nodes, even if duplicate inodes
-        assert_eq!(clean_inodes(n.clone(), &mut inodes, true), Some(n.clone()));
-        assert_eq!(clean_inodes(n.clone(), &mut inodes, true), Some(n.clone()));
-    }
-}
--- a/src/display.rs
+++ b/src/display.rs
@@ -1,6 +1,8 @@
-use crate::display_node::DisplayNode;
+extern crate ansi_term;

-use ansi_term::Colour::Red;
+use crate::utils::{Errors, Node};
+
+use self::ansi_term::Colour::Red;
 use lscolors::{LsColors, Style};

 use unicode_width::UnicodeWidthStr;
@@ -14,7 +16,7 @@ use std::iter::repeat;
 use std::path::Path;
 use thousands::Separable;

-pub static UNITS: [char; 4] = ['T', 'G', 'M', 'K'];
+static UNITS: [char; 4] = ['T', 'G', 'M', 'K'];
 static BLOCKS: [char; 5] = ['█', '▓', '▒', '░', ' '];

 pub struct DisplayData {
@@ -26,7 +28,6 @@ pub struct DisplayData {
    pub base_size: u64,
    pub longest_string_length: usize,
    pub ls_colors: LsColors,
-    pub iso: bool,
 }

 impl DisplayData {
@@ -59,7 +60,7 @@ impl DisplayData {
        }
    }

-    fn percent_size(&self, node: &DisplayNode) -> f32 {
+    fn percent_size(&self, node: &Node) -> f32 {
        let result = node.size as f32 / self.base_size as f32;
        if result.is_normal() {
            result
@@ -82,7 +83,7 @@ impl DrawData<'_> {
    }

    // TODO: can we test this?
-    fn generate_bar(&self, node: &DisplayNode, level: usize) -> String {
+    fn generate_bar(&self, node: &Node, level: usize) -> String {
        let chars_in_bar = self.percent_bar.chars().count();
        let num_bars = chars_in_bar as f32 * self.display_data.percent_size(node);
        let mut num_not_my_bar = (chars_in_bar as i32) - num_bars as i32;
@@ -106,94 +107,65 @@ impl DrawData<'_> {

 #[allow(clippy::too_many_arguments)]
 pub fn draw_it(
+    errors: Errors,
    use_full_path: bool,
    is_reversed: bool,
    no_colors: bool,
-    no_percent_bars: bool,
+    no_percents: bool,
    terminal_width: usize,
    by_filecount: bool,
-    root_node: &DisplayNode,
-    iso: bool,
-    skip_total: bool,
+    root_node: Node,
 ) {
-    let biggest = match skip_total {
-        false => root_node,
-        true => root_node
-            .get_children_from_node(false)
-            .next()
-            .unwrap_or(root_node),
-    };
-
+    if errors.permissions {
+        eprintln!("Did not have permissions for all directories");
+    }
+    if errors.not_found {
+        eprintln!("Not all directories were found");
+    }
    let num_chars_needed_on_left_most = if by_filecount {
-        let max_size = biggest.size;
+        let max_size = root_node.children.iter().map(|n| n.size).fold(0, max);
        max_size.separate_with_commas().chars().count()
    } else {
-        find_biggest_size_str(root_node, iso)
+        5 // Under normal usage we need 5 chars to display the size of a directory
    };

-    assert!(
-        terminal_width > num_chars_needed_on_left_most + 2,
-        "Not enough terminal width"
-    );
-
-    let allowed_width = terminal_width - num_chars_needed_on_left_most - 2;
+    let terminal_width = terminal_width - 9 - num_chars_needed_on_left_most;
    let num_indent_chars = 3;
-    let longest_string_length =
-        find_longest_dir_name(root_node, num_indent_chars, allowed_width, !use_full_path);
+    let longest_string_length = root_node
+        .children
+        .iter()
+        .map(|c| find_longest_dir_name(&c, num_indent_chars, terminal_width, !use_full_path))
+        .fold(0, max);

-    let max_bar_length = if no_percent_bars || longest_string_length + 7 >= allowed_width as usize {
+    let max_bar_length = if no_percents || longest_string_length >= terminal_width as usize {
        0
    } else {
-        allowed_width as usize - longest_string_length - 7
+        terminal_width as usize - longest_string_length
    };

-    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect();
+    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect::<String>();

-    let display_data = DisplayData {
-        short_paths: !use_full_path,
-        is_reversed,
-        colors_on: !no_colors,
-        by_filecount,
-        num_chars_needed_on_left_most,
-        base_size: biggest.size,
-        longest_string_length,
-        ls_colors: LsColors::from_env().unwrap_or_default(),
-        iso,
-    };
-    let draw_data = DrawData {
-        indent: "".to_string(),
-        percent_bar: first_size_bar,
-        display_data: &display_data,
-    };
-
-    if !skip_total {
-        display_node(root_node, &draw_data, true, true);
-    } else {
-        for (count, c) in root_node
-            .get_children_from_node(draw_data.display_data.is_reversed)
-            .enumerate()
-        {
-            let is_biggest = display_data.is_biggest(count, root_node.num_siblings());
-            let was_i_last = display_data.is_last(count, root_node.num_siblings());
-            display_node(c, &draw_data, is_biggest, was_i_last);
-        }
+    for c in root_node.get_children_from_node(is_reversed) {
+        let display_data = DisplayData {
+            short_paths: !use_full_path,
+            is_reversed,
+            colors_on: !no_colors,
+            by_filecount,
+            num_chars_needed_on_left_most,
+            base_size: c.size,
+            longest_string_length,
+            ls_colors: LsColors::from_env().unwrap_or_default(),
+        };
+        let draw_data = DrawData {
+            indent: "".to_string(),
+            percent_bar: first_size_bar.clone(),
+            display_data: &display_data,
+        };
+        display_node(c, &draw_data, true, true);
    }
 }

-fn find_biggest_size_str(node: &DisplayNode, iso: bool) -> usize {
-    let mut mx = human_readable_number(node.size, iso).chars().count();
-    for n in node.children.iter() {
-        mx = max(mx, find_biggest_size_str(n, iso));
-    }
-    mx
-}
-
-fn find_longest_dir_name(
-    node: &DisplayNode,
-    indent: usize,
-    terminal: usize,
-    long_paths: bool,
-) -> usize {
+fn find_longest_dir_name(node: &Node, indent: usize, terminal: usize, long_paths: bool) -> usize {
    let printable_name = get_printable_name(&node.name, long_paths);
    let longest = min(
        UnicodeWidthStr::width(&*printable_name) + 1 + indent,
@@ -207,20 +179,26 @@ fn find_longest_dir_name(
        .fold(longest, max)
 }

-fn display_node(node: &DisplayNode, draw_data: &DrawData, is_biggest: bool, is_last: bool) {
+fn display_node(node: Node, draw_data: &DrawData, is_biggest: bool, is_last: bool) {
    // hacky way of working out how deep we are in the tree
    let indent = draw_data.get_new_indent(!node.children.is_empty(), is_last);
    let level = ((indent.chars().count() - 1) / 2) - 1;
-    let bar_text = draw_data.generate_bar(node, level);
+    let bar_text = draw_data.generate_bar(&node, level);

-    let to_print = format_string(node, &indent, &bar_text, is_biggest, draw_data.display_data);
+    let to_print = format_string(
+        &node,
+        &*indent,
+        &*bar_text,
+        is_biggest,
+        draw_data.display_data,
+    );

    if !draw_data.display_data.is_reversed {
        println!("{}", to_print)
    }

    let dd = DrawData {
-        indent: clean_indentation_string(&indent),
+        indent: clean_indentation_string(&*indent),
        percent_bar: bar_text,
        display_data: draw_data.display_data,
    };
@@ -276,35 +254,26 @@ fn get_printable_name<P: AsRef<Path>>(dir_name: &P, long_paths: bool) -> String
    encode_u8(printable_name.display().to_string().as_bytes())
 }

-fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &DisplayData) -> String {
+fn pad_or_trim_filename(node: &Node, indent: &str, display_data: &DisplayData) -> String {
    let name = get_printable_name(&node.name, display_data.short_paths);
    let indent_and_name = format!("{} {}", indent, name);
    let width = UnicodeWidthStr::width(&*indent_and_name);

-    assert!(
-        display_data.longest_string_length >= width,
-        "Terminal width not wide enough to draw directory tree"
-    );
-
    // Add spaces after the filename so we can draw the % used bar chart.
    let name_and_padding = name
-        + " "
-            .repeat(display_data.longest_string_length - width)
-            .as_str();
+        + &(repeat(" ")
+            .take(display_data.longest_string_length - width)
+            .collect::<String>());

-    name_and_padding
+    maybe_trim_filename(name_and_padding, display_data)
 }

-fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
-    let indent_length = UnicodeWidthStr::width(indent);
-    assert!(
-        display_data.longest_string_length >= indent_length + 2,
-        "Terminal width not wide enough to draw directory tree"
-    );
-
-    let max_size = display_data.longest_string_length - indent_length;
-    if UnicodeWidthStr::width(&*name_in) > max_size {
-        let name = name_in.chars().take(max_size - 2).collect::<String>();
+fn maybe_trim_filename(name_in: String, display_data: &DisplayData) -> String {
+    if UnicodeWidthStr::width(&*name_in) > display_data.longest_string_length {
+        let name = name_in
+            .chars()
+            .take(display_data.longest_string_length - 2)
+            .collect::<String>();
        name + ".."
    } else {
        name_in
@@ -312,7 +281,7 @@ fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData
 }

 pub fn format_string(
-    node: &DisplayNode,
+    node: &Node,
    indent: &str,
    percent_bar: &str,
    is_biggest: bool,
@@ -325,7 +294,7 @@ pub fn format_string(
 }

 fn get_name_percent(
-    node: &DisplayNode,
+    node: &Node,
    indent: &str,
    bar_chart: &str,
    display_data: &DisplayData,
@@ -337,19 +306,20 @@ fn get_name_percent(
        (percents, name_and_padding)
    } else {
        let n = get_printable_name(&node.name, display_data.short_paths);
-        let name = maybe_trim_filename(n, indent, display_data);
+        let name = maybe_trim_filename(n, display_data);
        ("".into(), name)
    }
 }

-fn get_pretty_size(node: &DisplayNode, is_biggest: bool, display_data: &DisplayData) -> String {
+fn get_pretty_size(node: &Node, is_biggest: bool, display_data: &DisplayData) -> String {
    let output = if display_data.by_filecount {
-        node.size.separate_with_commas()
+        let size_as_str = node.size.separate_with_commas();
+        let spaces_to_add =
+            display_data.num_chars_needed_on_left_most - size_as_str.chars().count();
+        size_as_str + &*repeat(' ').take(spaces_to_add).collect::<String>()
    } else {
-        human_readable_number(node.size, display_data.iso)
+        format!("{:>5}", human_readable_number(node.size))
    };
-    let spaces_to_add = display_data.num_chars_needed_on_left_most - output.chars().count();
-    let output = " ".repeat(spaces_to_add) + output.as_str();

    if is_biggest && display_data.colors_on {
        format!("{}", Red.paint(output))
@@ -358,16 +328,12 @@ fn get_pretty_size(node: &DisplayNode, is_biggest: bool, display_data: &DisplayD
    }
 }

-fn get_pretty_name(
-    node: &DisplayNode,
-    name_and_padding: String,
-    display_data: &DisplayData,
-) -> String {
+fn get_pretty_name(node: &Node, name_and_padding: String, display_data: &DisplayData) -> String {
    if display_data.colors_on {
-        let meta_result = fs::metadata(&node.name);
+        let meta_result = fs::metadata(node.name.clone());
        let directory_color = display_data
            .ls_colors
-            .style_for_path_with_metadata(&node.name, meta_result.as_ref().ok());
+            .style_for_path_with_metadata(node.name.clone(), meta_result.as_ref().ok());
        let ansi_style = directory_color
            .map(Style::to_ansi_term_style)
            .unwrap_or_default();
@@ -377,10 +343,9 @@ fn get_pretty_name(
    }
 }

-fn human_readable_number(size: u64, iso: bool) -> String {
+fn human_readable_number(size: u64) -> String {
    for (i, u) in UNITS.iter().enumerate() {
-        let num: u64 = if iso { 1000 } else { 1024 };
-        let marker = num.pow((UNITS.len() - i) as u32);
+        let marker = 1024u64.pow((UNITS.len() - i) as u32);
        if size >= marker {
            if size / marker < 10 {
                return format!("{:.1}{}", (size as f32 / marker as f32), u);
@@ -389,7 +354,7 @@ fn human_readable_number(size: u64, iso: bool) -> String {
            }
        }
    }
-    format!("{}B", size)
+    return format!("{}B", size);
 }

 mod tests {
@@ -409,13 +374,12 @@ mod tests {
            base_size: 1,
            longest_string_length,
            ls_colors: LsColors::from_env().unwrap_or_default(),
-            iso: false,
        }
    }

    #[test]
    fn test_format_str() {
-        let n = DisplayNode {
+        let n = Node {
            name: PathBuf::from("/short"),
            size: 2_u64.pow(12), // This is 4.0K
            children: vec![],
@@ -429,7 +393,7 @@ mod tests {
            indent,
            percent_bar,
            is_biggest,
-            &get_fake_display_data(20),
+            &get_fake_display_data(6),
        );
        assert_eq!(s, " 4.0K ┌─┴ short");
    }
@@ -437,7 +401,7 @@ mod tests {
    #[test]
    fn test_format_str_long_name() {
        let name = "very_long_name_longer_than_the_eighty_character_limit_very_long_name_this_bit_will_truncate";
-        let n = DisplayNode {
+        let n = Node {
            name: PathBuf::from(name),
            size: 2_u64.pow(12), // This is 4.0K
            children: vec![],
@@ -450,27 +414,21 @@ mod tests {
        let s = format_string(&n, indent, percent_bar, is_biggest, &dd);
        assert_eq!(
            s,
-            " 4.0K ┌─┴ very_long_name_longer_than_the_eighty_character_limit_very_.."
+            " 4.0K ┌─┴ very_long_name_longer_than_the_eighty_character_limit_very_lon.."
        );
    }

    #[test]
    fn test_human_readable_number() {
-        assert_eq!(human_readable_number(1, false), "1B");
-        assert_eq!(human_readable_number(956, false), "956B");
-        assert_eq!(human_readable_number(1004, false), "1004B");
-        assert_eq!(human_readable_number(1024, false), "1.0K");
-        assert_eq!(human_readable_number(1536, false), "1.5K");
-        assert_eq!(human_readable_number(1024 * 512, false), "512K");
-        assert_eq!(human_readable_number(1024 * 1024, false), "1.0M");
-        assert_eq!(
-            human_readable_number(1024 * 1024 * 1024 - 1, false),
-            "1023M"
-        );
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 20, false), "20G");
-        assert_eq!(
-            human_readable_number(1024 * 1024 * 1024 * 1024, false),
-            "1.0T"
-        );
+        assert_eq!(human_readable_number(1), "1B");
+        assert_eq!(human_readable_number(956), "956B");
+        assert_eq!(human_readable_number(1004), "1004B");
+        assert_eq!(human_readable_number(1024), "1.0K");
+        assert_eq!(human_readable_number(1536), "1.5K");
+        assert_eq!(human_readable_number(1024 * 512), "512K");
+        assert_eq!(human_readable_number(1024 * 1024), "1.0M");
+        assert_eq!(human_readable_number(1024 * 1024 * 1024 - 1), "1023M");
+        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 20), "20G");
+        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 1024), "1.0T");
    }
 }
--- a/src/display_node.rs
+++ b/src/display_node.rs
@@ -1,25 +0,0 @@
-use std::path::PathBuf;
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
-pub struct DisplayNode {
-    // Note: the order of fields in important here, for PartialEq and PartialOrd
-    pub size: u64,
-    pub name: PathBuf, //todo: consider moving to a string?
-    pub children: Vec<DisplayNode>,
-}
-
-impl DisplayNode {
-    pub fn num_siblings(&self) -> u64 {
-        self.children.len() as u64
-    }
-
-    pub fn get_children_from_node(&self, is_reversed: bool) -> impl Iterator<Item = &DisplayNode> {
-        // we box to avoid the clippy lint warning
-        let out: Box<dyn Iterator<Item = &DisplayNode>> = if is_reversed {
-            Box::new(self.children.iter().rev())
-        } else {
-            Box::new(self.children.iter())
-        };
-        out
-    }
-}
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -1,87 +0,0 @@
-use crate::display_node::DisplayNode;
-use crate::node::Node;
-use std::collections::BinaryHeap;
-use std::collections::HashSet;
-use std::path::Path;
-use std::path::PathBuf;
-
-pub fn get_biggest(
-    top_level_nodes: Vec<Node>,
-    min_size: Option<usize>,
-    n: usize,
-    depth: usize,
-    using_a_filter: bool,
-) -> Option<DisplayNode> {
-    if top_level_nodes.is_empty() {
-        // perhaps change this, bring back Error object?
-        return None;
-    }
-
-    let mut heap = BinaryHeap::new();
-    let number_top_level_nodes = top_level_nodes.len();
-    let root = get_new_root(top_level_nodes);
-    let mut allowed_nodes = HashSet::new();
-
-    allowed_nodes.insert(root.name.as_path());
-    heap = add_children(using_a_filter, min_size, &root, depth, heap);
-
-    for _ in number_top_level_nodes..n {
-        let line = heap.pop();
-        match line {
-            Some(line) => {
-                allowed_nodes.insert(line.name.as_path());
-                heap = add_children(using_a_filter, min_size, line, depth, heap);
-            }
-            None => break,
-        }
-    }
-    recursive_rebuilder(&allowed_nodes, &root)
-}
-
-fn add_children<'a>(
-    using_a_filter: bool,
-    min_size: Option<usize>,
-    file_or_folder: &'a Node,
-    depth: usize,
-    mut heap: BinaryHeap<&'a Node>,
-) -> BinaryHeap<&'a Node> {
-    if depth > file_or_folder.depth {
-        heap.extend(file_or_folder.children.iter().filter(|c| match min_size {
-            Some(ms) => c.size > ms as u64,
-            None => !using_a_filter || c.name.is_file() || c.size > 0,
-        }))
-    }
-    heap
-}
-
-fn get_new_root(top_level_nodes: Vec<Node>) -> Node {
-    if top_level_nodes.len() != 1 {
-        let size = top_level_nodes.iter().map(|node| node.size).sum();
-        Node {
-            name: PathBuf::from("(total)"),
-            size,
-            children: top_level_nodes,
-            inode_device: None,
-            depth: 0,
-        }
-    } else {
-        top_level_nodes.into_iter().next().unwrap()
-    }
-}
-
-fn recursive_rebuilder(allowed_nodes: &HashSet<&Path>, current: &Node) -> Option<DisplayNode> {
-    let mut new_children: Vec<_> = current
-        .children
-        .iter()
-        .filter(|c| allowed_nodes.contains(c.name.as_path()))
-        .filter_map(|c| recursive_rebuilder(allowed_nodes, c))
-        .collect();
-
-    new_children.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
-
-    Some(DisplayNode {
-        name: current.name.clone(),
-        size: current.size,
-        children: new_children,
-    })
-}
--- a/src/filter_type.rs
+++ b/src/filter_type.rs
@@ -1,75 +0,0 @@
-use crate::display_node::DisplayNode;
-use crate::node::Node;
-use std::collections::HashMap;
-use std::ffi::OsStr;
-use std::path::PathBuf;
-
-#[derive(PartialEq, Eq, PartialOrd, Ord)]
-struct ExtensionNode<'a> {
-    size: u64,
-    extension: Option<&'a OsStr>,
-}
-
-pub fn get_all_file_types(top_level_nodes: &[Node], n: usize) -> Option<DisplayNode> {
-    let ext_nodes = {
-        let mut extension_cumulative_sizes = HashMap::new();
-        build_by_all_file_types(top_level_nodes, &mut extension_cumulative_sizes);
-
-        let mut extension_cumulative_sizes: Vec<ExtensionNode<'_>> = extension_cumulative_sizes
-            .iter()
-            .map(|(&extension, &size)| ExtensionNode { extension, size })
-            .collect();
-
-        extension_cumulative_sizes.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
-
-        extension_cumulative_sizes
-    };
-
-    let mut ext_nodes_iter = ext_nodes.iter();
-
-    // First, collect the first N - 1 nodes...
-    let mut displayed: Vec<DisplayNode> = ext_nodes_iter
-        .by_ref()
-        .take(if n > 1 { n - 1 } else { 1 })
-        .map(|node| DisplayNode {
-            name: PathBuf::from(
-                node.extension
-                    .map(|ext| format!(".{}", ext.to_string_lossy()))
-                    .unwrap_or_else(|| "(no extension)".to_owned()),
-            ),
-            size: node.size,
-            children: vec![],
-        })
-        .collect();
-
-    // ...then, aggregate the remaining nodes (if any) into a single  "(others)" node
-    if ext_nodes_iter.len() > 0 {
-        displayed.push(DisplayNode {
-            name: PathBuf::from("(others)"),
-            size: ext_nodes_iter.map(|node| node.size).sum(),
-            children: vec![],
-        });
-    }
-
-    let result = DisplayNode {
-        name: PathBuf::from("(total)"),
-        size: displayed.iter().map(|node| node.size).sum(),
-        children: displayed,
-    };
-
-    Some(result)
-}
-
-fn build_by_all_file_types<'a>(
-    top_level_nodes: &'a [Node],
-    counter: &mut HashMap<Option<&'a OsStr>, u64>,
-) {
-    for node in top_level_nodes {
-        if node.name.is_file() {
-            let ext = node.name.extension();
-            let cumulative_size = counter.entry(ext).or_default();
-            *cumulative_size += node.size;
-        }
-        build_by_all_file_types(&node.children, counter)
-    }
-}
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,193 +1,259 @@
-mod cli;
-mod config;
-mod dir_walker;
-mod display;
-mod display_node;
-mod filter;
-mod filter_type;
-mod node;
-mod platform;
-mod utils;
-
-use crate::cli::build_cli;
-use std::collections::HashSet;
-use std::process;
+#[macro_use]
+extern crate clap;
+extern crate crossbeam_channel as channel;
+extern crate ignore;
+extern crate unicode_width;
+extern crate walkdir;

 use self::display::draw_it;
-use clap::Values;
-use config::get_config;
-use dir_walker::{walk_it, WalkData};
-use filter::get_biggest;
-use filter_type::get_all_file_types;
-use regex::Regex;
+use crate::utils::is_a_parent_of;
+use clap::{App, AppSettings, Arg};
 use std::cmp::max;
 use std::path::PathBuf;
 use terminal_size::{terminal_size, Height, Width};
-use utils::get_filesystem_devices;
-use utils::simplify_dir_names;
+use utils::{find_big_ones, get_dir_tree, simplify_dir_names, sort, Node};
+
+mod display;
+mod utils;

 static DEFAULT_NUMBER_OF_LINES: usize = 30;
 static DEFAULT_TERMINAL_WIDTH: usize = 80;

+#[cfg(windows)]
 fn init_color(no_color: bool) -> bool {
-    #[cfg(windows)]
-    {
-        // If no color is already set do not print a warning message
-        if no_color {
-            true
-        } else {
-            // Required for windows 10
-            // Fails to resolve for windows 8 so disable color
-            match ansi_term::enable_ansi_support() {
-                Ok(_) => no_color,
-                Err(_) => {
-                    eprintln!(
+    // If no color is already set do not print a warning message
+    if no_color {
+        true
+    } else {
+        // Required for windows 10
+        // Fails to resolve for windows 8 so disable color
+        match ansi_term::enable_ansi_support() {
+            Ok(_) => no_color,
+            Err(_) => {
+                eprintln!(
                    "This version of Windows does not support ANSI colors, setting no_color flag"
                );
-                    true
-                }
+                true
            }
        }
    }
-    #[cfg(not(windows))]
-    {
-        no_color
-    }
+}
+
+#[cfg(not(windows))]
+fn init_color(no_color: bool) -> bool {
+    no_color
 }

 fn get_height_of_terminal() -> usize {
-    // Simplify once https://github.com/eminence/terminal-size/pull/41 is
-    // merged
-    terminal_size()
-        // Windows CI runners detect a terminal height of 0
-        .map(|(_, Height(h))| max(h as usize, DEFAULT_NUMBER_OF_LINES))
-        .unwrap_or(DEFAULT_NUMBER_OF_LINES)
-        - 10
+    // Windows CI runners detect a terminal height of 0
+    if let Some((Width(_w), Height(h))) = terminal_size() {
+        max(h as usize, DEFAULT_NUMBER_OF_LINES) - 10
+    } else {
+        DEFAULT_NUMBER_OF_LINES - 10
+    }
 }

 fn get_width_of_terminal() -> usize {
-    // Simplify once https://github.com/eminence/terminal-size/pull/41 is
-    // merged
-    terminal_size()
-        .map(|(Width(w), _)| match cfg!(windows) {
-            // Windows CI runners detect a very low terminal width
-            true => max(w as usize, DEFAULT_TERMINAL_WIDTH),
-            false => w as usize,
-        })
-        .unwrap_or(DEFAULT_TERMINAL_WIDTH)
-}
-
-fn get_regex_value(maybe_value: Option<Values>) -> Vec<Regex> {
-    maybe_value
-        .unwrap_or_default()
-        .map(|reg| {
-            Regex::new(reg).unwrap_or_else(|err| {
-                eprintln!("Ignoring bad value for regex {:?}", err);
-                process::exit(1)
-            })
-        })
-        .collect()
+    // Windows CI runners detect a very low terminal width
+    if let Some((Width(w), Height(_h))) = terminal_size() {
+        max(w as usize, DEFAULT_TERMINAL_WIDTH)
+    } else {
+        DEFAULT_TERMINAL_WIDTH
+    }
 }

 fn main() {
-    let options = build_cli().get_matches();
-    let config = get_config();
+    let default_height = get_height_of_terminal();
+    let def_num_str = default_height.to_string();

-    let target_dirs = options
-        .values_of("inputs")
-        .expect("Should be a default value here")
-        .collect();
+    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("number_of_lines")
+                .short("n")
+                .long("number-of-lines")
+                .help("Number of lines of output to show. This is Height, (but h is help)")
+                .takes_value(true)
+                .default_value(def_num_str.as_ref()),
+        )
+        .arg(
+            Arg::with_name("display_full_paths")
+                .short("p")
+                .long("full-paths")
+                .help("Subdirectories will not have their path shortened"),
+        )
+        .arg(
+            Arg::with_name("ignore_directory")
+                .short("X")
+                .long("ignore-directory")
+                .takes_value(true)
+                .number_of_values(1)
+                .multiple(true)
+                .help("Exclude any file or directory with this name"),
+        )
+        .arg(
+            Arg::with_name("limit_filesystem")
+                .short("x")
+                .long("limit-filesystem")
+                .help("Only count the files and directories on the same filesystem as the supplied directory"),
+        )
+        .arg(
+            Arg::with_name("display_apparent_size")
+                .short("s")
+                .long("apparent-size")
+                .help("Use file length instead of blocks"),
+        )
+        .arg(
+            Arg::with_name("reverse")
+                .short("r")
+                .long("reverse")
+                .help("Print tree upside down (biggest highest)"),
+        )
+        .arg(
+            Arg::with_name("no_colors")
+                .short("c")
+                .long("no-colors")
+                .help("No colors will be printed (normally largest directories are colored)"),
+        )
+        .arg(
+            Arg::with_name("no_bars")
+                .short("b")
+                .long("no-percent-bars")
+                .help("No percent bars or percentages will be displayed"),
+        )
+        .arg(
+            Arg::with_name("by_filecount")
+                .short("f")
+                .long("filecount")
+                .help("Directory 'size' is number of child files/dirs not disk size"),
+        )
+        .arg(
+            Arg::with_name("ignore_hidden")
+                .short("i") // Do not use 'h' this is used by 'help'
+                .long("ignore_hidden")
+                .help("Obey .git_ignore rules & Do not display hidden files"),
+        )
+        .arg(
+            Arg::with_name("width")
+                .short("w")
+                .long("terminal_width")
+                .takes_value(true)
+                .number_of_values(1)
+                .help("Specify width of output overriding the auto detection of terminal width"),
+        )

-    let summarize_file_types = options.is_present("types");
+        .arg(Arg::with_name("inputs").multiple(true))
+        .get_matches();

-    let filter_regexs = get_regex_value(options.values_of("filter"));
-    let invert_filter_regexs = get_regex_value(options.values_of("invert_filter"));
-
-    let terminal_width = options
-        .value_of_t("width")
-        .unwrap_or_else(|_| get_width_of_terminal());
-
-    let depth = options.value_of_t("depth").unwrap_or(usize::MAX);
-
-    // If depth is set, then we set the default number_of_lines to be max
-    // instead of screen height
-    let default_height = if depth != usize::MAX {
-        usize::MAX
-    } else {
-        get_height_of_terminal()
+    let target_dirs = {
+        match options.values_of("inputs") {
+            None => vec!["."],
+            Some(r) => r.collect(),
+        }
    };

-    let number_of_lines = options
-        .value_of("number_of_lines")
-        .and_then(|v| {
-            v.parse()
-                .map_err(|_| eprintln!("Ignoring bad value for number_of_lines"))
-                .ok()
-        })
-        .unwrap_or(default_height);
+    let number_of_lines = match value_t!(options.value_of("number_of_lines"), usize) {
+        Ok(v) => v,
+        Err(_) => {
+            eprintln!("Ignoring bad value for number_of_lines");
+            default_height
+        }
+    };

-    let no_colors = init_color(config.get_no_colors(&options));
+    let terminal_width = match value_t!(options.value_of("width"), usize) {
+        Ok(v) => v,
+        Err(_) => get_width_of_terminal(),
+    };

-    let ignore_directories = options
-        .values_of("ignore_directory")
-        .unwrap_or_default()
-        .map(PathBuf::from);
+    let depth = options.value_of("depth").and_then(|depth| {
+        depth
+            .parse::<usize>()
+            .map(|v| v + 1)
+            .map_err(|_| eprintln!("Ignoring bad value for depth"))
+            .ok()
+    });
+    if options.is_present("depth") && number_of_lines != default_height {
+        eprintln!("Use either -n or -d. Not both");
+        return;
+    }

-    let by_filecount = options.is_present("by_filecount");
+    let no_colors = init_color(options.is_present("no_colors"));
+    let use_apparent_size = options.is_present("display_apparent_size");
    let limit_filesystem = options.is_present("limit_filesystem");
+    let ignore_directories = match options.values_of("ignore_directory") {
+        Some(i) => Some(i.map(PathBuf::from).collect()),
+        None => None,
+    };
+    let by_filecount = options.is_present("by_filecount");
+    let show_hidden = !options.is_present("ignore_hidden");

    let simplified_dirs = simplify_dir_names(target_dirs);
-    let allowed_filesystems = limit_filesystem
-        .then(|| get_filesystem_devices(simplified_dirs.iter()))
-        .unwrap_or_default();
-
-    let ignored_full_path: HashSet<PathBuf> = ignore_directories
-        .flat_map(|x| simplified_dirs.iter().map(move |d| d.join(&x)))
-        .collect();
-
-    let walk_data = WalkData {
-        ignore_directories: ignored_full_path,
-        filter_regex: &filter_regexs,
-        invert_filter_regex: &invert_filter_regexs,
-        allowed_filesystems,
-        use_apparent_size: config.get_apparent_size(&options),
+    let (errors, nodes) = get_dir_tree(
+        &simplified_dirs,
+        &ignore_directories,
+        use_apparent_size,
+        limit_filesystem,
        by_filecount,
-        ignore_hidden: config.get_ignore_hidden(&options),
+        show_hidden,
+    );
+    let sorted_data = sort(nodes);
+    let biggest_ones = {
+        match depth {
+            None => find_big_ones(sorted_data, number_of_lines),
+            Some(_) => sorted_data,
+        }
    };
-    // Larger stack size to handle cases with lots of nested directories
-    rayon::ThreadPoolBuilder::new()
-        .stack_size(usize::pow(1024, 3))
-        .build_global()
-        .unwrap_or_else(|e| eprintln!("Warning: Could not configure threads {:?}", e));
+    let tree = build_tree(biggest_ones, depth);

-    let iso = config.get_iso(&options);
-    let (top_level_nodes, has_errors) = walk_it(simplified_dirs, walk_data);
+    draw_it(
+        errors,
+        options.is_present("display_full_paths"),
+        !options.is_present("reverse"),
+        no_colors,
+        options.is_present("no_bars"),
+        terminal_width,
+        by_filecount,
+        tree,
+    );
+}

-    let tree = match summarize_file_types {
-        true => get_all_file_types(&top_level_nodes, number_of_lines),
-        false => get_biggest(
-            top_level_nodes,
-            config.get_min_size(&options, iso),
-            number_of_lines,
-            depth,
-            options.values_of("filter").is_some() || options.value_of("invert_filter").is_some(),
-        ),
-    };
+fn build_tree(biggest_ones: Vec<(PathBuf, u64)>, depth: Option<usize>) -> Node {
+    let mut top_parent = Node::default();

-    if has_errors {
-        eprintln!("Did not have permissions for all directories");
+    // 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);
    }
-    if let Some(root_node) = tree {
-        draw_it(
-            config.get_full_paths(&options),
-            !config.get_reverse(&options),
-            no_colors,
-            config.get_no_bars(&options),
-            terminal_width,
-            by_filecount,
-            &root_node,
-            iso,
-            config.get_skip_total(&options),
-        )
+    top_parent
+}
+
+fn recursively_build_tree(parent_node: &mut Node, new_node: Node, depth: Option<usize>) {
+    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);
    }
 }
--- a/src/node.rs
+++ b/src/node.rs
@@ -1,78 +0,0 @@
-use crate::platform::get_metadata;
-use crate::utils::is_filtered_out_due_to_invert_regex;
-use crate::utils::is_filtered_out_due_to_regex;
-
-use regex::Regex;
-use std::cmp::Ordering;
-use std::path::PathBuf;
-
-#[derive(Debug, Eq, Clone)]
-pub struct Node {
-    pub name: PathBuf,
-    pub size: u64,
-    pub children: Vec<Node>,
-    pub inode_device: Option<(u64, u64)>,
-    pub depth: usize,
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn build_node(
-    dir: PathBuf,
-    children: Vec<Node>,
-    filter_regex: &[Regex],
-    invert_filter_regex: &[Regex],
-    use_apparent_size: bool,
-    is_symlink: bool,
-    is_file: bool,
-    by_filecount: bool,
-    depth: usize,
-) -> Option<Node> {
-    get_metadata(&dir, use_apparent_size).map(|data| {
-        let inode_device = if is_symlink && !use_apparent_size {
-            None
-        } else {
-            data.1
-        };
-
-        let size = if is_filtered_out_due_to_regex(filter_regex, &dir)
-            || is_filtered_out_due_to_invert_regex(invert_filter_regex, &dir)
-            || (is_symlink && !use_apparent_size)
-            || by_filecount && !is_file
-        {
-            0
-        } else if by_filecount {
-            1
-        } else {
-            data.0
-        };
-
-        Node {
-            name: dir,
-            size,
-            children,
-            inode_device,
-            depth,
-        }
-    })
-}
-
-impl PartialEq for Node {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name && self.size == other.size && self.children == other.children
-    }
-}
-
-impl Ord for Node {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.size
-            .cmp(&other.size)
-            .then_with(|| self.name.cmp(&other.name))
-            .then_with(|| self.children.cmp(&other.children))
-    }
-}
-
-impl PartialOrd for Node {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,158 +0,0 @@
-use platform::get_metadata;
-use std::collections::HashSet;
-use std::path::{Path, PathBuf};
-
-use crate::platform;
-use regex::Regex;
-
-pub fn simplify_dir_names<P: AsRef<Path>>(filenames: Vec<P>) -> HashSet<PathBuf> {
-    let mut top_level_names: HashSet<PathBuf> = HashSet::with_capacity(filenames.len());
-
-    for t in filenames {
-        let top_level_name = normalize_path(t);
-        let mut can_add = true;
-        let mut to_remove: Vec<PathBuf> = Vec::new();
-
-        for tt in top_level_names.iter() {
-            if is_a_parent_of(&top_level_name, tt) {
-                to_remove.push(tt.to_path_buf());
-            } else if is_a_parent_of(tt, &top_level_name) {
-                can_add = false;
-            }
-        }
-        for r in to_remove {
-            top_level_names.remove(&r);
-        }
-        if can_add {
-            top_level_names.insert(top_level_name);
-        }
-    }
-
-    top_level_names
-}
-
-pub fn get_filesystem_devices<'a, P: IntoIterator<Item = &'a PathBuf>>(paths: P) -> HashSet<u64> {
-    // Gets the device ids for the filesystems which are used by the argument paths
-    paths
-        .into_iter()
-        .filter_map(|p| match get_metadata(p, false) {
-            Some((_size, Some((_id, dev)))) => Some(dev),
-            _ => None,
-        })
-        .collect()
-}
-
-pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
-    // normalize path ...
-    // 1. removing repeated separators
-    // 2. removing interior '.' ("current directory") path segments
-    // 3. removing trailing extra separators and '.' ("current directory") path segments
-    // * `Path.components()` does all the above work; ref: <https://doc.rust-lang.org/std/path/struct.Path.html#method.components>
-    // 4. changing to os preferred separator (automatically done by recollecting components back into a PathBuf)
-    path.as_ref().components().collect()
-}
-
-pub fn is_filtered_out_due_to_regex(filter_regex: &[Regex], dir: &Path) -> bool {
-    if filter_regex.is_empty() {
-        false
-    } else {
-        filter_regex
-            .iter()
-            .all(|f| !f.is_match(&dir.as_os_str().to_string_lossy()))
-    }
-}
-
-pub fn is_filtered_out_due_to_invert_regex(filter_regex: &[Regex], dir: &Path) -> bool {
-    filter_regex
-        .iter()
-        .any(|f| f.is_match(&dir.as_os_str().to_string_lossy()))
-}
-
-fn is_a_parent_of<P: AsRef<Path>>(parent: P, child: P) -> bool {
-    let parent = parent.as_ref();
-    let child = child.as_ref();
-    child.starts_with(parent) && !parent.starts_with(child)
-}
-
-mod tests {
-    #[allow(unused_imports)]
-    use super::*;
-
-    #[test]
-    fn test_simplify_dir() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("a"));
-        assert_eq!(simplify_dir_names(vec!["a"]), correct);
-    }
-
-    #[test]
-    fn test_simplify_dir_rm_subdir() {
-        let mut correct = HashSet::new();
-        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        assert_eq!(simplify_dir_names(vec!["a/b/c", "a/b", "a/b/d/f"]), correct);
-        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"].iter().collect::<PathBuf>());
-        correct.insert(PathBuf::from("c"));
-        assert_eq!(
-            simplify_dir_names(vec![
-                "a/b",
-                "a/b//",
-                "a/././b///",
-                "c",
-                "c/",
-                "c/.",
-                "c/././",
-                "c/././."
-            ]),
-            correct
-        );
-    }
-    #[test]
-    fn test_simplify_dir_rm_subdir_and_not_substrings() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("b"));
-        correct.insert(["c", "a", "b"].iter().collect::<PathBuf>());
-        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        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(PathBuf::from("src"));
-        assert_eq!(simplify_dir_names(vec!["src/."]), correct);
-    }
-
-    #[test]
-    fn test_simplify_dir_substring_names() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("src"));
-        correct.insert(PathBuf::from("src_v2"));
-        assert_eq!(simplify_dir_names(vec!["src/", "src_v2"]), correct);
-    }
-
-    #[test]
-    fn test_is_a_parent_of() {
-        assert!(is_a_parent_of("/usr", "/usr/andy"));
-        assert!(is_a_parent_of("/usr", "/usr/andy/i/am/descendant"));
-        assert!(!is_a_parent_of("/usr", "/usr/."));
-        assert!(!is_a_parent_of("/usr", "/usr/"));
-        assert!(!is_a_parent_of("/usr", "/usr"));
-        assert!(!is_a_parent_of("/usr/", "/usr"));
-        assert!(!is_a_parent_of("/usr/andy", "/usr"));
-        assert!(!is_a_parent_of("/usr/andy", "/usr/sibling"));
-        assert!(!is_a_parent_of("/usr/folder", "/usr/folder_not_a_child"));
-    }
-
-    #[test]
-    fn test_is_a_parent_of_root() {
-        assert!(is_a_parent_of("/", "/usr/andy"));
-        assert!(is_a_parent_of("/", "/usr"));
-        assert!(!is_a_parent_of("/", "/"));
-    }
-}
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -0,0 +1,402 @@
+use std::cmp::Ordering;
+use std::collections::HashMap;
+use std::collections::HashSet;
+use std::path::{Path, PathBuf};
+use std::sync::atomic::AtomicBool;
+
+use channel::Receiver;
+use std::thread::JoinHandle;
+
+use ignore::{WalkBuilder, WalkState};
+use std::sync::atomic;
+use std::thread;
+
+mod platform;
+use self::platform::*;
+
+type PathData = (PathBuf, u64, Option<(u64, u64)>);
+
+#[derive(Debug, Default, Eq, Clone)]
+pub struct Node {
+    pub name: PathBuf,
+    pub size: u64,
+    pub children: Vec<Node>,
+}
+
+impl Ord for Node {
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.size == other.size {
+            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
+    }
+}
+
+impl Node {
+    pub fn num_siblings(&self) -> u64 {
+        self.children.len() as u64
+    }
+
+    pub fn get_children_from_node(&self, is_reversed: bool) -> impl Iterator<Item = Node> {
+        if is_reversed {
+            let children: Vec<Node> = self.children.clone().into_iter().rev().collect();
+            children.into_iter()
+        } else {
+            self.children.clone().into_iter()
+        }
+    }
+}
+
+pub struct Errors {
+    pub permissions: bool,
+    pub not_found: bool,
+}
+
+pub fn is_a_parent_of<P: AsRef<Path>>(parent: P, child: P) -> bool {
+    let parent = parent.as_ref();
+    let child = child.as_ref();
+    child.starts_with(parent) && !parent.starts_with(child)
+}
+
+pub fn simplify_dir_names<P: AsRef<Path>>(filenames: Vec<P>) -> HashSet<PathBuf> {
+    let mut top_level_names: HashSet<PathBuf> = HashSet::with_capacity(filenames.len());
+    let mut to_remove: Vec<PathBuf> = Vec::with_capacity(filenames.len());
+
+    for t in filenames {
+        let top_level_name = normalize_path(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_path_buf());
+            } 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(top_level_name);
+        }
+    }
+
+    top_level_names
+}
+
+fn prepare_walk_dir_builder<P: AsRef<Path>>(
+    top_level_names: &HashSet<P>,
+    limit_filesystem: bool,
+    show_hidden: bool,
+) -> WalkBuilder {
+    let mut it = top_level_names.iter();
+    let mut builder = WalkBuilder::new(it.next().unwrap());
+    builder.follow_links(false);
+    if show_hidden {
+        builder.hidden(false);
+        builder.ignore(false);
+        builder.git_global(false);
+        builder.git_ignore(false);
+        builder.git_exclude(false);
+    }
+
+    if limit_filesystem {
+        builder.same_file_system(true);
+    }
+
+    for b in it {
+        builder.add(b);
+    }
+    builder
+}
+
+fn is_not_found(e: &ignore::Error) -> bool {
+    use ignore::Error;
+    if let Error::WithPath { err, .. } = e {
+        if let Error::Io(e) = &**err {
+            if e.kind() == std::io::ErrorKind::NotFound {
+                return true;
+            }
+        }
+    }
+    false
+}
+
+pub fn get_dir_tree<P: AsRef<Path>>(
+    top_level_names: &HashSet<P>,
+    ignore_directories: &Option<Vec<PathBuf>>,
+    apparent_size: bool,
+    limit_filesystem: bool,
+    by_filecount: bool,
+    show_hidden: bool,
+) -> (Errors, HashMap<PathBuf, u64>) {
+    let (tx, rx) = channel::bounded::<PathData>(1000);
+
+    let permissions_flag = AtomicBool::new(false);
+    let not_found_flag = AtomicBool::new(false);
+
+    let t2 = top_level_names
+        .iter()
+        .map(|p| p.as_ref().to_path_buf())
+        .collect();
+
+    let t = create_reader_thread(rx, t2, apparent_size);
+    let walk_dir_builder = prepare_walk_dir_builder(top_level_names, limit_filesystem, show_hidden);
+
+    walk_dir_builder.build_parallel().run(|| {
+        let txc = tx.clone();
+        let pf = &permissions_flag;
+        let nf = &not_found_flag;
+        Box::new(move |path| {
+            match path {
+                Ok(p) => {
+                    if let Some(dirs) = ignore_directories {
+                        let path = p.path();
+                        let parts = path.components().collect::<Vec<std::path::Component>>();
+                        for d in dirs {
+                            if parts
+                                .windows(d.components().count())
+                                .any(|window| window.iter().collect::<PathBuf>() == *d)
+                            {
+                                return WalkState::Continue;
+                            }
+                        }
+                    }
+
+                    let maybe_size_and_inode = get_metadata(&p, apparent_size);
+
+                    match maybe_size_and_inode {
+                        Some(data) => {
+                            let (size, inode_device) =
+                                if by_filecount { (1, data.1) } else { data };
+                            txc.send((p.into_path(), size, inode_device)).unwrap();
+                        }
+                        None => {
+                            pf.store(true, atomic::Ordering::Relaxed);
+                        }
+                    }
+                }
+                Err(e) => {
+                    if is_not_found(&e) {
+                        nf.store(true, atomic::Ordering::Relaxed);
+                    } else {
+                        pf.store(true, atomic::Ordering::Relaxed);
+                    }
+                }
+            };
+            WalkState::Continue
+        })
+    });
+
+    drop(tx);
+    let data = t.join().unwrap();
+    let errors = Errors {
+        permissions: permissions_flag.load(atomic::Ordering::SeqCst),
+        not_found: not_found_flag.load(atomic::Ordering::SeqCst),
+    };
+    (errors, data)
+}
+
+fn create_reader_thread(
+    rx: Receiver<PathData>,
+    top_level_names: HashSet<PathBuf>,
+    apparent_size: bool,
+) -> JoinHandle<HashMap<PathBuf, u64>> {
+    // Receiver thread
+    thread::spawn(move || {
+        let mut hash: HashMap<PathBuf, u64> = HashMap::new();
+        let mut inodes: HashSet<(u64, u64)> = HashSet::new();
+
+        for dent in rx {
+            let (path, size, maybe_inode_device) = dent;
+
+            if should_ignore_file(apparent_size, &mut inodes, maybe_inode_device) {
+                continue;
+            } else {
+                for p in path.ancestors() {
+                    let s = hash.entry(p.to_path_buf()).or_insert(0);
+                    *s += size;
+
+                    if top_level_names.contains(p) {
+                        break;
+                    }
+                }
+            }
+        }
+        hash
+    })
+}
+
+pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
+    // normalize path ...
+    // 1. removing repeated separators
+    // 2. removing interior '.' ("current directory") path segments
+    // 3. removing trailing extra separators and '.' ("current directory") path segments
+    // * `Path.components()` does all the above work; ref: <https://doc.rust-lang.org/std/path/struct.Path.html#method.components>
+    // 4. changing to os preferred separator (automatically done by recollecting components back into a PathBuf)
+    path.as_ref().components().collect::<PathBuf>()
+}
+
+fn should_ignore_file(
+    apparent_size: bool,
+    inodes: &mut HashSet<(u64, u64)>,
+    maybe_inode_device: Option<(u64, u64)>,
+) -> bool {
+    match maybe_inode_device {
+        None => false,
+        Some(data) => {
+            let (inode, device) = data;
+            if !apparent_size {
+                // Ignore files already visited or symlinked
+                if inodes.contains(&(inode, device)) {
+                    return true;
+                }
+                inodes.insert((inode, device));
+            }
+            false
+        }
+    }
+}
+
+pub fn sort_by_size_first_name_second(a: &(PathBuf, u64), b: &(PathBuf, u64)) -> Ordering {
+    let result = b.1.cmp(&a.1);
+    if result == Ordering::Equal {
+        a.0.cmp(&b.0)
+    } else {
+        result
+    }
+}
+
+pub fn sort(data: HashMap<PathBuf, u64>) -> Vec<(PathBuf, u64)> {
+    let mut new_l: Vec<(PathBuf, 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<(PathBuf, u64)>, max_to_show: usize) -> Vec<(PathBuf, u64)> {
+    if max_to_show > 0 && new_l.len() > max_to_show {
+        new_l[0..max_to_show].to_vec()
+    } else {
+        new_l
+    }
+}
+
+mod tests {
+    #[allow(unused_imports)]
+    use super::*;
+
+    #[test]
+    fn test_simplify_dir() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("a"));
+        assert_eq!(simplify_dir_names(vec!["a"]), correct);
+    }
+
+    #[test]
+    fn test_simplify_dir_rm_subdir() {
+        let mut correct = HashSet::new();
+        correct.insert(["a", "b"].iter().collect::<PathBuf>());
+        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"].iter().collect::<PathBuf>());
+        correct.insert(PathBuf::from("c"));
+        assert_eq!(
+            simplify_dir_names(vec![
+                "a/b",
+                "a/b//",
+                "a/././b///",
+                "c",
+                "c/",
+                "c/.",
+                "c/././",
+                "c/././."
+            ]),
+            correct
+        );
+    }
+    #[test]
+    fn test_simplify_dir_rm_subdir_and_not_substrings() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("b"));
+        correct.insert(["c", "a", "b"].iter().collect::<PathBuf>());
+        correct.insert(["a", "b"].iter().collect::<PathBuf>());
+        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(PathBuf::from("src"));
+        assert_eq!(simplify_dir_names(vec!["src/."]), correct);
+    }
+
+    #[test]
+    fn test_simplify_dir_substring_names() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("src"));
+        correct.insert(PathBuf::from("src_v2"));
+        assert_eq!(simplify_dir_names(vec!["src/", "src_v2"]), correct);
+    }
+
+    #[test]
+    fn test_is_a_parent_of() {
+        assert!(is_a_parent_of("/usr", "/usr/andy"));
+        assert!(is_a_parent_of("/usr", "/usr/andy/i/am/descendant"));
+        assert!(!is_a_parent_of("/usr", "/usr/."));
+        assert!(!is_a_parent_of("/usr", "/usr/"));
+        assert!(!is_a_parent_of("/usr", "/usr"));
+        assert!(!is_a_parent_of("/usr/", "/usr"));
+        assert!(!is_a_parent_of("/usr/andy", "/usr"));
+        assert!(!is_a_parent_of("/usr/andy", "/usr/sibling"));
+        assert!(!is_a_parent_of("/usr/folder", "/usr/folder_not_a_child"));
+    }
+
+    #[test]
+    fn test_is_a_parent_of_root() {
+        assert!(is_a_parent_of("/", "/usr/andy"));
+        assert!(is_a_parent_of("/", "/usr"));
+        assert!(!is_a_parent_of("/", "/"));
+    }
+
+    #[test]
+    fn test_should_ignore_file() {
+        let mut files = HashSet::new();
+        files.insert((10, 20));
+
+        assert!(!should_ignore_file(true, &mut files, Some((0, 0))));
+
+        // New file is not known it will be inserted to the hashmp and should not be ignored
+        assert!(!should_ignore_file(false, &mut files, Some((11, 12))));
+        assert!(files.contains(&(11, 12)));
+
+        // The same file will be ignored the second time
+        assert!(should_ignore_file(false, &mut files, Some((11, 12))));
+    }
+
+    #[test]
+    fn test_should_ignore_file_on_different_device() {
+        let mut files = HashSet::new();
+        files.insert((10, 20));
+
+        // We do not ignore files on the same device
+        assert!(!should_ignore_file(false, &mut files, Some((2, 99))));
+        assert!(!should_ignore_file(true, &mut files, Some((2, 99))));
+    }
+}
--- a/src/utils/platform.rs
+++ b/src/utils/platform.rs
@@ -1,17 +1,16 @@
+use ignore::DirEntry;
 #[allow(unused_imports)]
 use std::fs;

-use std::path::Path;
-
 #[cfg(target_family = "unix")]
 fn get_block_size() -> u64 {
-    // All os specific implementations of MetadataExt seem to define a block as 512 bytes
+    // All os specific implementations of MetatdataExt seem to define a block as 512 bytes
    // https://doc.rust-lang.org/std/os/linux/fs/trait.MetadataExt.html#tymethod.st_blocks
    512
 }

 #[cfg(target_family = "unix")]
-pub fn get_metadata(d: &Path, use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
+pub fn get_metadata(d: &DirEntry, use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    use std::os::unix::fs::MetadataExt;
    match d.metadata() {
        Ok(md) => {
@@ -26,7 +25,7 @@ pub fn get_metadata(d: &Path, use_apparent_size: bool) -> Option<(u64, Option<(u
 }

 #[cfg(target_family = "windows")]
-pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
+pub fn get_metadata(d: &DirEntry, _use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    // On windows opening the file to get size, file ID and volume can be very
    // expensive because 1) it causes a few system calls, and more importantly 2) it can cause
    // windows defender to scan the file.
@@ -64,6 +63,7 @@ pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(
    // With this optimization:         8 sec.

    use std::io;
+    use std::path::Path;
    use winapi_util::Handle;
    fn handle_from_path_limited<P: AsRef<Path>>(path: P) -> io::Result<Handle> {
        use std::fs::OpenOptions;
@@ -90,10 +90,10 @@ pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(
        Ok(Handle::from_file(file))
    }

-    fn get_metadata_expensive(d: &Path) -> Option<(u64, Option<(u64, u64)>)> {
+    fn get_metadata_expensive(d: &DirEntry) -> Option<(u64, Option<(u64, u64)>)> {
        use winapi_util::file::information;

-        let h = handle_from_path_limited(d).ok()?;
+        let h = handle_from_path_limited(d.path()).ok()?;
        let info = information(&h).ok()?;

        Some((
@@ -105,24 +105,24 @@ pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(
    use std::os::windows::fs::MetadataExt;
    match d.metadata() {
        Ok(ref md) => {
-            const FILE_ATTRIBUTE_ARCHIVE: u32 = 0x20;
-            const FILE_ATTRIBUTE_READONLY: u32 = 0x01;
-            const FILE_ATTRIBUTE_HIDDEN: u32 = 0x02;
-            const FILE_ATTRIBUTE_SYSTEM: u32 = 0x04;
-            const FILE_ATTRIBUTE_NORMAL: u32 = 0x80;
-            const FILE_ATTRIBUTE_DIRECTORY: u32 = 0x10;
+            const FILE_ATTRIBUTE_ARCHIVE: u32 = 0x20u32;
+            const FILE_ATTRIBUTE_READONLY: u32 = 0x1u32;
+            const FILE_ATTRIBUTE_HIDDEN: u32 = 0x2u32;
+            const FILE_ATTRIBUTE_SYSTEM: u32 = 0x4u32;
+            const FILE_ATTRIBUTE_NORMAL: u32 = 0x80u32;
+            const FILE_ATTRIBUTE_DIRECTORY: u32 = 0x10u32;

            let attr_filtered = md.file_attributes()
                & !(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM);
-            if (attr_filtered & FILE_ATTRIBUTE_ARCHIVE) != 0
-                || (attr_filtered & FILE_ATTRIBUTE_DIRECTORY) != 0
+            if attr_filtered == FILE_ATTRIBUTE_ARCHIVE
+                || attr_filtered == FILE_ATTRIBUTE_DIRECTORY
                || md.file_attributes() == FILE_ATTRIBUTE_NORMAL
            {
                Some((md.len(), None))
            } else {
-                get_metadata_expensive(d)
+                get_metadata_expensive(&d)
            }
        }
-        _ => get_metadata_expensive(d),
+        _ => get_metadata_expensive(&d),
    }
 }
--- a/tests/test_exact_output.rs
+++ b/tests/test_exact_output.rs
@@ -1,10 +1,11 @@
 use assert_cmd::Command;
-use std::ffi::OsStr;
 use std::str;
 use std::sync::Once;

 static INIT: Once = Once::new();

+mod tests_symlinks;
+
 /**
 * This file contains tests that verify the exact output of the command.
 * This output differs on Linux / Mac so the tests are harder to write and debug
@@ -17,23 +18,26 @@ static INIT: Once = Once::new();
 /// Copy to /tmp dir - we assume that the formatting of the /tmp partition
 /// is consistent. If the tests fail your /tmp filesystem probably differs
 fn copy_test_data(dir: &str) {
-    // First remove the existing directory - just in case it is there and has incorrect data
+    // First remove the existing directory - just incase it is there and has incorrect data
    let last_slash = dir.rfind('/').unwrap();
    let last_part_of_dir = dir.chars().skip(last_slash).collect::<String>();
-    let _ = Command::new("rm")
+    match Command::new("rm")
        .arg("-rf")
        .arg("/tmp/".to_owned() + &*last_part_of_dir)
-        .ok();
-
-    let _ = Command::new("cp")
-        .arg("-r")
-        .arg(dir)
-        .arg("/tmp/")
        .ok()
-        .map_err(|err| eprintln!("Error copying directory for test setup\n{:?}", err));
+    {
+        Ok(_) => {}
+        Err(_) => {}
+    };
+    match Command::new("cp").arg("-r").arg(dir).arg("/tmp/").ok() {
+        Ok(_) => {}
+        Err(err) => {
+            eprintln!("Error copying directory {:?}", err);
+        }
+    };
 }

-fn initialize() {
+pub fn initialize() {
    INIT.call_once(|| {
        copy_test_data("tests/test_dir");
        copy_test_data("tests/test_dir2");
@@ -41,168 +45,228 @@ fn initialize() {
    });
 }

-fn exact_output_test<T: AsRef<OsStr>>(valid_outputs: Vec<String>, command_args: Vec<T>) {
-    initialize();
-
-    let mut a = &mut Command::cargo_bin("dust").unwrap();
-
-    for p in command_args {
-        a = a.arg(p);
-    }
-
-    let output = str::from_utf8(&a.unwrap().stdout).unwrap().to_owned();
-
-    assert!(valid_outputs.iter().any(|i| output.contains(i)));
-}
-
 // "windows" result data can vary by host (size seems to be variable by one byte); fix code vs test and re-enable
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_basic() {
    // -c is no color mode - This makes testing much simpler
-    exact_output_test(main_output(), vec!["-c", "/tmp/test_dir/"])
+    initialize();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let assert = cmd.arg("-c").arg("/tmp/test_dir/").unwrap().stdout;
+    let output = str::from_utf8(&assert).unwrap();
+    assert!(output.contains(&main_output()));
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_multi_arg() {
-    let command_args = vec![
-        "-c",
-        "/tmp/test_dir/many/",
-        "/tmp/test_dir",
-        "/tmp/test_dir",
-    ];
-    exact_output_test(main_output(), command_args);
+    initialize();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let assert = cmd
+        .arg("-c")
+        .arg("/tmp/test_dir/many/")
+        .arg("/tmp/test_dir")
+        .arg("/tmp/test_dir")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&assert).unwrap();
+    assert!(output.contains(&main_output()));
 }

-fn main_output() -> Vec<String> {
-    // Some linux currently thought to be Manjaro, Arch
-    // Although probably depends on how drive is formatted
-    let mac_and_some_linux = r#"
-  0B     ┌── a_file    │░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
-4.0K     ├── hello_file│█████████████████████████████████████████████████ │ 100%
-4.0K   ┌─┴ many        │█████████████████████████████████████████████████ │ 100%
-4.0K ┌─┴ test_dir      │█████████████████████████████████████████████████ │ 100%
-"#
+#[cfg(target_os = "macos")]
+fn main_output() -> String {
+    r#"
+   0B     ┌── a_file    │░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
+ 4.0K     ├── hello_file│████████████████████████████████████████████████ │ 100%
+ 4.0K   ┌─┴ many        │████████████████████████████████████████████████ │ 100%
+ 4.0K ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%
+ "#
    .trim()
-    .to_string();
+    .to_string()
+}

-    let ubuntu = r#"
-  0B     ┌── a_file    │                ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
-4.0K     ├── hello_file│                ░░░░░░░░░░░░░░░░█████████████████ │  33%
-8.0K   ┌─┴ many        │                █████████████████████████████████ │  67%
- 12K ┌─┴ test_dir      │█████████████████████████████████████████████████ │ 100%
+#[cfg(target_os = "linux")]
+fn main_output() -> String {
+    r#"
+   0B     ┌── a_file    │               ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
+ 4.0K     ├── hello_file│               ░░░░░░░░░░░░░░░░█████████████████ │  33%
+ 8.0K   ┌─┴ many        │               █████████████████████████████████ │  67%
+  12K ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%
  "#
    .trim()
-    .to_string();
+    .to_string()
+}

-    vec![mac_and_some_linux, ubuntu]
+#[cfg(target_os = "windows")]
+fn main_output() -> String {
+    "windows results vary by host".to_string()
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_long_paths() {
-    let command_args = vec!["-c", "-p", "/tmp/test_dir/"];
-    exact_output_test(main_output_long_paths(), command_args);
+    initialize();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let assert = cmd
+        .arg("-c")
+        .arg("-p")
+        .arg("/tmp/test_dir/")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&assert).unwrap();
+    println!("{:?}", output.trim());
+    println!("{:?}", main_output_long_paths().trim());
+    assert!(output.contains(&main_output_long_paths()));
 }

-fn main_output_long_paths() -> Vec<String> {
-    let mac_and_some_linux = r#"
-  0B     ┌── /tmp/test_dir/many/a_file    │░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
-4.0K     ├── /tmp/test_dir/many/hello_file│██████████████████████████████ │ 100%
-4.0K   ┌─┴ /tmp/test_dir/many             │██████████████████████████████ │ 100%
-4.0K ┌─┴ /tmp/test_dir                    │██████████████████████████████ │ 100%
+#[cfg(target_os = "macos")]
+fn main_output_long_paths() -> String {
+    r#"
+   0B     ┌── /tmp/test_dir/many/a_file    │░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
+ 4.0K     ├── /tmp/test_dir/many/hello_file│█████████████████████████████ │ 100%
+ 4.0K   ┌─┴ /tmp/test_dir/many             │█████████████████████████████ │ 100%
+ 4.0K ┌─┴ /tmp/test_dir                    │█████████████████████████████ │ 100%
 "#
    .trim()
-    .to_string();
-    let ubuntu = r#"
-  0B     ┌── /tmp/test_dir/many/a_file    │         ░░░░░░░░░░░░░░░░░░░░█ │   0%
-4.0K     ├── /tmp/test_dir/many/hello_file│         ░░░░░░░░░░███████████ │  33%
-8.0K   ┌─┴ /tmp/test_dir/many             │         █████████████████████ │  67%
- 12K ┌─┴ /tmp/test_dir                    │██████████████████████████████ │ 100%
+    .to_string()
+}
+
+#[cfg(target_os = "linux")]
+fn main_output_long_paths() -> String {
+    r#"   
+   0B     ┌── /tmp/test_dir/many/a_file    │         ░░░░░░░░░░░░░░░░░░░█ │   0%
+ 4.0K     ├── /tmp/test_dir/many/hello_file│         ░░░░░░░░░░██████████ │  33%
+ 8.0K   ┌─┴ /tmp/test_dir/many             │         ████████████████████ │  67%
+  12K ┌─┴ /tmp/test_dir                    │█████████████████████████████ │ 100%
 "#
    .trim()
-    .to_string();
-    vec![mac_and_some_linux, ubuntu]
+    .to_string()
 }

-// Check against directories and files whose names are substrings of each other
-#[cfg_attr(target_os = "windows", ignore)]
-#[test]
-pub fn test_substring_of_names_and_long_names() {
-    let command_args = vec!["-c", "/tmp/test_dir2"];
-    exact_output_test(no_substring_of_names_output(), command_args);
-}
-
-fn no_substring_of_names_output() -> Vec<String> {
-    let ubuntu = "
-  0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_goes..
-4.0K   ├── dir_name_clash
-4.0K   │ ┌── hello
-8.0K   ├─┴ dir
-4.0K   │ ┌── hello
-8.0K   ├─┴ dir_substring
- 24K ┌─┴ test_dir2
-    "
-    .trim()
-    .into();
-
-    let mac_and_some_linux = "
-  0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_goes..
-4.0K   │ ┌── hello
-4.0K   ├─┴ dir
-4.0K   ├── dir_name_clash
-4.0K   │ ┌── hello
-4.0K   ├─┴ dir_substring
- 12K ┌─┴ test_dir2
-  "
-    .trim()
-    .into();
-    vec![mac_and_some_linux, ubuntu]
-}
-
-#[cfg_attr(target_os = "windows", ignore)]
-#[test]
-pub fn test_unicode_directories() {
-    let command_args = vec!["-c", "/tmp/test_dir_unicode"];
-    exact_output_test(unicode_dir(), command_args);
-}
-
-fn unicode_dir() -> Vec<String> {
-    // The way unicode & asian characters are rendered on the terminal should make this line up
-    let ubuntu = "
-  0B   ┌── ラウトは難しいです！.japan│                                  █ │   0%
-  0B   ├── 👩.unicode                │                                  █ │   0%
-4.0K ┌─┴ test_dir_unicode            │███████████████████████████████████ │ 100%
-    "
-    .trim()
-    .into();
-
-    let mac_and_some_linux = "
-0B   ┌── ラウトは難しいです！.japan│                                    █ │   0%
-0B   ├── 👩.unicode                │                                    █ │   0%
-0B ┌─┴ test_dir_unicode            │                                    █ │   0%
-    "
-    .trim()
-    .into();
-    vec![mac_and_some_linux, ubuntu]
+#[cfg(target_os = "windows")]
+fn main_output_long_paths() -> String {
+    "windows results vary by host".to_string()
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_apparent_size() {
-    let command_args = vec!["-c", "-s", "-b", "/tmp/test_dir"];
-    exact_output_test(apparent_size_output(), command_args);
+    initialize();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let assert = cmd.arg("-c").arg("-s").arg("/tmp/test_dir").unwrap().stdout;
+    let output = str::from_utf8(&assert).unwrap();
+    assert!(output.contains(&output_apparent_size()));
 }

-fn apparent_size_output() -> Vec<String> {
-    // The apparent directory sizes are too unpredictable and system dependent to try and match
-    let files = r#"
-  0B     ┌── a_file
-  6B     ├── hello_file
- "#
+#[cfg(target_os = "linux")]
+fn output_apparent_size() -> String {
+    r#"
+   0B     ┌── a_file    │                       ░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
+   6B     ├── hello_file│                       ░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
+ 4.0K   ┌─┴ many        │                       █████████████████████████ │  50%
+ 8.0K ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%     
+"#
    .trim()
-    .to_string();
-
-    vec![files]
+    .to_string()
+}
+
+#[cfg(target_os = "macos")]
+fn output_apparent_size() -> String {
+    r#"
+   0B     ┌── a_file    │                    ░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
+   6B     ├── hello_file│                    ░░░░░░░░░░░░░░░░░░░░░░░░░░██ │   3%
+ 134B   ┌─┴ many        │                    ████████████████████████████ │  58%
+ 230B ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%
+"#
+    .trim()
+    .to_string()
+}
+
+#[cfg(target_os = "windows")]
+fn output_apparent_size() -> String {
+    "windows results vary by host".to_string()
+}
+
+// Check against directories and files whos names are substrings of each other
+#[cfg_attr(target_os = "windows", ignore)]
+#[test]
+pub fn test_substring_of_names_and_long_names() {
+    initialize();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd.arg("-c").arg("/tmp/test_dir2").unwrap().stdout;
+    let output = str::from_utf8(&output).unwrap();
+    assert!(output.contains(&no_substring_of_names_output()));
+}
+
+#[cfg(target_os = "linux")]
+fn no_substring_of_names_output() -> String {
+    "
+   0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_g..
+ 4.0K   ├── dir_name_clash
+ 4.0K   │ ┌── hello
+ 8.0K   ├─┴ dir_substring
+ 4.0K   │ ┌── hello
+ 8.0K   ├─┴ dir
+  24K ┌─┴ test_dir2
+    "
+    .trim()
+    .into()
+}
+
+#[cfg(target_os = "macos")]
+fn no_substring_of_names_output() -> String {
+    "
+   0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_g..
+ 4.0K   │ ┌── hello
+ 4.0K   ├─┴ dir_substring
+ 4.0K   ├── dir_name_clash
+ 4.0K   │ ┌── hello
+ 4.0K   ├─┴ dir
+  12K ┌─┴ test_dir2
+  "
+    .trim()
+    .into()
+}
+
+#[cfg(target_os = "windows")]
+fn no_substring_of_names_output() -> String {
+    "PRs".into()
+}
+
+#[cfg_attr(target_os = "windows", ignore)]
+#[test]
+pub fn test_unicode_directories() {
+    initialize();
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd.arg("-c").arg("/tmp/test_dir_unicode").unwrap().stdout;
+    let output = str::from_utf8(&output).unwrap();
+    assert!(output.contains(&unicode_dir()));
+}
+
+#[cfg(target_os = "linux")]
+fn unicode_dir() -> String {
+    // The way unicode & asian characters are rendered on the terminal should make this line up
+    "
+   0B   ┌── 👩.unicode                │                                 █ │   0%
+   0B   ├── ラウトは難しいです！.japan│                                 █ │   0%
+ 4.0K ┌─┴ test_dir_unicode            │██████████████████████████████████ │ 100%
+    "
+    .trim()
+    .into()
+}
+
+#[cfg(target_os = "macos")]
+fn unicode_dir() -> String {
+    "
+   0B   ┌── 👩.unicode                │                                 █ │   0%
+   0B   ├── ラウトは難しいです！.japan│                                 █ │   0%
+   0B ┌─┴ test_dir_unicode            │                                 █ │   0%
+    "
+    .trim()
+    .into()
+}
+
+#[cfg(target_os = "windows")]
+fn unicode_dir() -> String {
+    "".into()
 }
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -1,29 +1,17 @@
 use assert_cmd::Command;
-use std::ffi::OsStr;
 use std::str;
-
 /**
 * This file contains tests that test a substring of the output using '.contains'
 *
 * These tests should be the same cross platform
 */

-fn build_command<T: AsRef<OsStr>>(command_args: Vec<T>) -> String {
-    let mut cmd = &mut Command::cargo_bin("dust").unwrap();
-    for p in command_args {
-        cmd = cmd.arg(p);
-    }
-    let finished = &cmd.unwrap();
-    let stderr = str::from_utf8(&finished.stderr).unwrap();
-    assert_eq!(stderr, "");
-
-    str::from_utf8(&finished.stdout).unwrap().into()
-}
-
 // We can at least test the file names are there
 #[test]
 pub fn test_basic_output() {
-    let output = build_command(vec!["tests/test_dir/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd.arg("tests/test_dir/").unwrap().stdout;
+    let output = str::from_utf8(&output).unwrap();

    assert!(output.contains(" ┌─┴ "));
    assert!(output.contains("test_dir "));
@@ -37,7 +25,9 @@ pub fn test_basic_output() {

 #[test]
 pub fn test_output_no_bars_means_no_excess_spaces() {
-    let output = build_command(vec!["-b", "tests/test_dir/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd.arg("-b").arg("tests/test_dir/").unwrap().stdout;
+    let output = str::from_utf8(&output).unwrap();
    // If bars are not being shown we don't need to pad the output with spaces
    assert!(output.contains("many"));
    assert!(!output.contains("many    "));
@@ -45,7 +35,15 @@ pub fn test_output_no_bars_means_no_excess_spaces() {

 #[test]
 pub fn test_reverse_flag() {
-    let output = build_command(vec!["-r", "-c", "tests/test_dir/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-c")
+        .arg("-r")
+        .arg("tests/test_dir/")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
+
    assert!(output.contains(" └─┬ test_dir "));
    assert!(output.contains("  └─┬ many "));
    assert!(output.contains("    ├── hello_file"));
@@ -55,7 +53,15 @@ pub fn test_reverse_flag() {
 #[test]
 pub fn test_d_flag_works() {
    // We should see the top level directory but not the sub dirs / files:
-    let output = build_command(vec!["-d", "1", "tests/test_dir/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-d")
+        .arg("1")
+        .arg("-s")
+        .arg("tests/test_dir/")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
    assert!(!output.contains("hello_file"));
 }

@@ -63,34 +69,64 @@ pub fn test_d_flag_works() {
 pub fn test_d_flag_works_and_still_recurses_down() {
    // We had a bug where running with '-d 1' would stop at the first directory and the code
    // would fail to recurse down
-    let output = build_command(vec!["-d", "1", "-f", "-c", "tests/test_dir2/"]);
-    assert!(output.contains("4 ┌─┴ test_dir2"));
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-d")
+        .arg("1")
+        .arg("-f")
+        .arg("-c")
+        .arg("tests/test_dir2/")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
+    assert!(output.contains("7 ┌─┴ test_dir2"));
 }

-// Check against directories and files whose names are substrings of each other
+// Check against directories and files whos names are substrings of each other
 #[test]
 pub fn test_ignore_dir() {
-    let output = build_command(vec!["-c", "-X", "dir_substring", "tests/test_dir2/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-c")
+        .arg("-X")
+        .arg("dir_substring")
+        .arg("tests/test_dir2")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
    assert!(!output.contains("dir_substring"));
 }

 #[test]
 pub fn test_with_bad_param() {
    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let result = cmd.arg("bad_place").unwrap();
-    let stderr = str::from_utf8(&result.stderr).unwrap();
+    let stderr = cmd.arg("-").unwrap().stderr;
+    let stderr = str::from_utf8(&stderr).unwrap();
    assert!(stderr.contains("Did not have permissions for all directories"));
 }

 #[test]
 pub fn test_hidden_flag() {
    // Check we can see the hidden file normally
-    let output = build_command(vec!["-c", "tests/test_dir_hidden_entries/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-c")
+        .arg("tests/test_dir_hidden_entries")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
    assert!(output.contains(".hidden_file"));
    assert!(output.contains("┌─┴ test_dir_hidden_entries"));

    // Check that adding the '-h' flag causes us to not see hidden files
-    let output = build_command(vec!["-c", "-i", "tests/test_dir_hidden_entries/"]);
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-c")
+        .arg("-i")
+        .arg("tests/test_dir_hidden_entries")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
    assert!(!output.contains(".hidden_file"));
    assert!(output.contains("┌── test_dir_hidden_entries"));
 }
@@ -98,98 +134,16 @@ pub fn test_hidden_flag() {
 #[test]
 pub fn test_number_of_files() {
    // Check we can see the hidden file normally
-    let output = build_command(vec!["-c", "-f", "tests/test_dir"]);
-    assert!(output.contains("1     ┌── a_file "));
-    assert!(output.contains("1     ├── hello_file"));
-    assert!(output.contains("2   ┌─┴ many"));
-    assert!(output.contains("2 ┌─┴ test_dir"));
-}
-
-#[test]
-pub fn test_show_files_by_type() {
-    // Check we can list files by type
-    let output = build_command(vec!["-c", "-t", "tests"]);
-    assert!(output.contains(" .unicode"));
-    assert!(output.contains(" .japan"));
-    assert!(output.contains(" .rs"));
-    assert!(output.contains(" (no extension)"));
-    assert!(output.contains("┌─┴ (total)"));
-}
-
-#[test]
-pub fn test_output_skip_total() {
-    let output = build_command(vec![
-        "--skip-total",
-        "tests/test_dir/many/hello_file",
-        "tests/test_dir/many/a_file",
-    ]);
-    assert!(output.contains("hello_file"));
-    assert!(!output.contains("(total)"));
-}
-
-#[test]
-pub fn test_show_files_by_regex_match_lots() {
-    // Check we can see '.rs' files in the tests directory
-    let output = build_command(vec!["-c", "-e", "\\.rs$", "tests"]);
-    assert!(output.contains(" ┌─┴ tests"));
-    assert!(!output.contains("0B ┌── tests"));
-    assert!(!output.contains("0B ┌─┴ tests"));
-}
-
-#[test]
-pub fn test_show_files_by_regex_match_nothing() {
-    // Check there are no files named: '.match_nothing' in the tests directory
-    let output = build_command(vec!["-c", "-e", "match_nothing$", "tests"]);
-    assert!(output.contains("0B ┌── tests"));
-}
-
-#[test]
-pub fn test_show_files_by_regex_match_multiple() {
-    let output = build_command(vec![
-        "-c",
-        "-e",
-        "test_dir_hidden",
-        "-e",
-        "test_dir2",
-        "-n",
-        "100",
-        "tests",
-    ]);
-    assert!(output.contains("test_dir2"));
-    assert!(output.contains("test_dir_hidden"));
-    assert!(!output.contains("many")); // We do not find the 'many' folder in the 'test_dir' folder
-}
-
-#[test]
-pub fn test_show_files_by_invert_regex() {
-    let output = build_command(vec!["-c", "-f", "-v", "e", "tests/test_dir2"]);
-    // There are 0 files without 'e' in the name
-    assert!(output.contains("0 ┌── test_dir2"));
-
-    let output = build_command(vec!["-c", "-f", "-v", "a", "tests/test_dir2"]);
-    // There are 2 files without 'a' in the name
-    assert!(output.contains("2 ┌─┴ test_dir2"));
-
-    // There are 4 files in the test_dir2 hierarchy
-    let output = build_command(vec!["-c", "-f", "-v", "match_nothing$", "tests/test_dir2"]);
-    assert!(output.contains("4 ┌─┴ test_dir2"));
-}
-
-#[test]
-pub fn test_show_files_by_invert_regex_match_multiple() {
-    // We ignore test_dir2 & test_dir_unicode, leaving the test_dir folder
-    // which has the 'many' folder inside
-    let output = build_command(vec![
-        "-c",
-        "-v",
-        "test_dir2",
-        "-v",
-        "test_dir_unicode",
-        "-n",
-        "100",
-        "tests",
-    ]);
-    assert!(!output.contains("test_dir2"));
-    assert!(!output.contains("test_dir_unicode"));
-    assert!(output.contains("many"));
+    let mut cmd = Command::cargo_bin("dust").unwrap();
+    let output = cmd
+        .arg("-c")
+        .arg("-f")
+        .arg("tests/test_dir")
+        .unwrap()
+        .stdout;
+    let output = str::from_utf8(&output).unwrap();
+    assert!(output.contains("1     ┌── hello_file"));
+    assert!(output.contains("1     ├── a_file "));
+    assert!(output.contains("3   ┌─┴ many"));
+    assert!(output.contains("4 ┌─┴ test_dir"));
 }
--- a/tests/tests_symlinks.rs
+++ b/tests/tests_symlinks.rs
@@ -1,15 +1,42 @@
 use assert_cmd::Command;
+use std::cmp::max;
 use std::fs::File;
 use std::io::Write;
+use std::panic;
 use std::path::PathBuf;
 use std::str;

+use terminal_size::{terminal_size, Height, Width};
+use unicode_width::UnicodeWidthStr;
+
 use tempfile::Builder;
 use tempfile::TempDir;

 // File sizes differ on both platform and on the format of the disk.
 // Windows: `ln` is not usually an available command; creation of symbolic links requires special enhanced permissions

+fn get_width_of_terminal() -> u16 {
+    if let Some((Width(w), Height(_h))) = terminal_size() {
+        max(w, 80)
+    } else {
+        80
+    }
+}
+
+// Mac test runners create tmp files with very long names, hence it may be shortened in the output
+fn get_file_name(name: String) -> String {
+    let terminal_plus_buffer = (get_width_of_terminal() - 14) as usize;
+    if UnicodeWidthStr::width(&*name) > terminal_plus_buffer {
+        let trimmed_name = name
+            .chars()
+            .take(terminal_plus_buffer - 2)
+            .collect::<String>();
+        trimmed_name + ".."
+    } else {
+        name
+    }
+}
+
 fn build_temp_file(dir: &TempDir) -> PathBuf {
    let file_path = dir.path().join("notes.txt");
    let mut file = File::create(&file_path).unwrap();
@@ -34,16 +61,12 @@ pub fn test_soft_sym_link() {
        .output();
    assert!(c.is_ok());

-    let c = format!(" ├── {}", link_name_s);
-    let b = format!(" ┌── {}", file_path_s);
+    let c = format!(" ┌── {}", get_file_name(link_name_s.into()));
+    let b = format!(" ├── {}", get_file_name(file_path_s.into()));
    let a = format!("─┴ {}", dir_s);

    let mut cmd = Command::cargo_bin("dust").unwrap();
-    // Mac test runners create long filenames in tmp directories
-    let output = cmd
-        .args(["-p", "-c", "-s", "-w 999", dir_s])
-        .unwrap()
-        .stdout;
+    let output = cmd.arg("-p").arg("-c").arg(dir_s).unwrap().stdout;

    let output = str::from_utf8(&output).unwrap();

@@ -68,18 +91,18 @@ pub fn test_hard_sym_link() {
        .output();
    assert!(c.is_ok());

-    let file_output = format!(" ┌── {}", file_path_s);
+    let link_output = format!(" ┌── {}", get_file_name(link_name_s.into()));
+    let file_output = format!(" ┌── {}", get_file_name(file_path_s.into()));
    let dirs_output = format!("─┴ {}", dir_s);

    let mut cmd = Command::cargo_bin("dust").unwrap();
-    // Mac test runners create long filenames in tmp directories
-    let output = cmd.args(["-p", "-c", "-w 999", dir_s]).unwrap().stdout;
+    let output = cmd.arg("-p").arg("-c").arg(dir_s).unwrap().stdout;

-    // The link should not appear in the output because multiple inodes are now ordered
-    // then filtered.
+    // Because this is a hard link the file and hard link look identical. Therefore
+    // we cannot guarantee which version will appear first.
    let output = str::from_utf8(&output).unwrap();
    assert!(output.contains(dirs_output.as_str()));
-    assert!(output.contains(file_output.as_str()));
+    assert!(output.contains(link_output.as_str()) || output.contains(file_output.as_str()));
 }

 #[cfg_attr(target_os = "windows", ignore)]
@@ -99,20 +122,12 @@ pub fn test_recursive_sym_link() {
    assert!(c.is_ok());

    let a = format!("─┬ {}", dir_s);
-    let b = format!(" └── {}", link_name_s);
+    let b = format!(" └── {}", get_file_name(link_name_s.into()));

    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-p")
-        .arg("-c")
-        .arg("-r")
-        .arg("-s")
-        .arg("-w 999")
-        .arg(dir_s)
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = cmd.arg("-p").arg("-c").arg("-r").arg(dir_s).unwrap().stdout;

+    let output = str::from_utf8(&output).unwrap();
    assert!(output.contains(a.as_str()));
    assert!(output.contains(b.as_str()));
 }
Author	SHA1	Message	Date
andy.boot	36fd75b9ee	Update packages	2021-01-16 15:12:52 +00:00
andy.boot	51a0ccb1ed	Increment version	2021-01-16 15:05:33 +00:00
andy.boot	68b0dd5562	[core] New flag: width Add support for width flag https://github.com/bootandy/dust/issues/126 Requested because some people may cat the output All terminal height/width detection is now in the main file. One method now has too many args for clippy, this complaint is valid and in the future we should consider pulling these out into a separate object.	2021-01-16 15:01:42 +00:00
andy.boot	360143ee91	Notes on how to publish	2021-01-16 14:56:45 +00:00