Upgrade to latest iteration of prodash

Cargo.toml

@@ -25,34 +25,34 @@ doctest = false
 [features]
 default = ["max"]
 
-max = ["fast", "pretty-cli", "prodash/tui-renderer-crossterm", "prodash-line-renderer-crossterm"]
-max-termion = ["fast", "pretty-cli", "prodash/tui-renderer-termion", "prodash-line-renderer-termion"]
+max = ["fast", "pretty-cli", "prodash/render-tui-crossterm", "prodash-render-line-crossterm"]
+max-termion = ["fast", "pretty-cli", "prodash/render-tui-termion", "prodash-render-line-termion"]
 
-lean = ["fast", "lean-cli", "prodash-line-renderer-crossterm", "git-features/interruptible"]
-lean-termion = ["fast", "lean-cli", "prodash-line-renderer-termion", "git-features/interruptible"]
+lean = ["fast", "lean-cli", "prodash-render-line-crossterm", "git-features/interruptible"]
+lean-termion = ["fast", "lean-cli", "prodash-render-line-termion", "git-features/interruptible"]
 
 light = ["fast", "lean-cli", "git-features/interruptible"]
 small = ["lean-cli"]
 
 fast = ["git-features/parallel", "git-features/fast-sha1"]
 pretty-cli = ["clap",
-    "git-features/progress-prodash",
     "git-features/interruptible",
     "gitoxide-core/serde1",
-    "prodash/log-renderer",
-    "prodash-tui-renderer",
-    "prodash-line-renderer",
+    "prodash/progress-tree",
+    "prodash/progress-tree-log",
     "prodash/localtime",
+    "prodash-render-tui",
+    "prodash-render-line",
     "env_logger",
     "futures-lite"]
-lean-cli = ["argh", "git-features/progress-log", "env_logger"]
+lean-cli = ["argh", "prodash/progress-log", "prodash/progress-tree", "env_logger"]
 
-prodash-line-renderer-crossterm = ["prodash-line-renderer", "prodash/line-renderer-crossterm", "git-features/progress-prodash", "atty", "crosstermion"]
-prodash-line-renderer-termion = ["prodash-line-renderer", "prodash/line-renderer-termion", "git-features/progress-prodash", "atty", "crosstermion"]
+prodash-render-line-crossterm = ["prodash-render-line", "prodash/render-line-crossterm", "atty", "crosstermion"]
+prodash-render-line-termion = ["prodash-render-line", "prodash/render-line-termion", "atty", "crosstermion"]
 
 # internal
-prodash-tui-renderer = ["prodash/tui-renderer"]
-prodash-line-renderer = ["prodash/line-renderer"]
+prodash-render-tui = ["prodash/render-tui"]
+prodash-render-line = ["prodash/render-line"]
 
 
 [dependencies]

README.md

@@ -253,19 +253,19 @@ The top-level command-line interface.
     * Use `argh` to produce a usable binary with decent documentation that is smallest in size, usually 300kb less than `pretty-cli`.
     * If `pretty-cli` is enabled as well, `lean-cli` will take precedence, and you pay for building unnecessary dependencies.
     * provides a line renderer for log-like progress
-* **prodash-line-renderer-crossterm** or **prodash-line-renderer-termion** _(mutually exclusive)_
+* **prodash-render-line-crossterm** or **prodash-render-line-termion** _(mutually exclusive)_
   * The `--verbose` flag will be powered by an interactive progress mechanism that doubles as log as well as interactive progress
     that appears after a short duration.
 
 There are **convenience features**, which combine common choices of the above into one name
 
-* **max** = *pretty-cli* + *fast* + *prodash-tui-renderer-crossterm*
+* **max** = *pretty-cli* + *fast* + *prodash-render-tui-crossterm*
   * _default_, for unix and windows
-* **max-termion** = *pretty-cli* + *fast* + *prodash-tui-renderer-termion*
+* **max-termion** = *pretty-cli* + *fast* + *prodash-render-tui-termion*
   * for unix only, faster compile times, a little smaller
-* **lean** = *lean-cli* + *fast* + *prodash-line-renderer-crossterm*
+* **lean** = *lean-cli* + *fast* + *prodash-render-line-crossterm*
   * for unix and windows, significantly smaller than _max_, but without `--progress` terminal user interface.
-* **lean-termion** = *lean-cli* + *fast* + *prodash-line-renderer-termion*
+* **lean-termion** = *lean-cli* + *fast* + *prodash-render-line-termion*
   * for unix only, faster compile times, a little smaller
 * **light** = *lean-cli* + *fast*
   * crossplatform by nature as this comes with simplified log based progress
@@ -285,12 +285,6 @@ All feature toggles are additive.
 * **fast-sha1** 
   * a multi-crate implementation that can use hardware acceleration, thus bearing the potential for up to 2Gb/s throughput on 
     CPUs that support it, like AMD Ryzen or Intel Core i3.
-* **progress-log**
-  * Implement the `Progress` trait using the `log` crate. Throttle progress output to one every 0.5 seconds unless messages
-    are sent manually.
-* **progress-prodash**
-  * Implement the `Progress` trait for the tree data structures provided by `prodash`, which enables using a terminal user
-    interface for progress.
 * **interruptible**
   * Listen to interrupts and termination requests and provide long-running operations tooling to allow aborting the input stream.
   * If unset, these utilities will be a no-op which may lead to leaking temporary files when interrupted.

git-features/Cargo.toml

@@ -14,8 +14,6 @@ test = false
 [features]
 parallel = ["crossbeam-utils", "crossbeam-channel", "num_cpus"]
 fast-sha1 = ["fastsha1"]
-progress-log = ["log"]
-progress-prodash = ["prodash"]
 interruptible = ["ctrlc", "once_cell"]
 
 [[test]]
@@ -46,7 +44,7 @@ fastsha1 = { package = "sha-1", version = "0.9.1", optional = true }
 
 # progress
 log = { version = "0.4.8", optional = true }
-prodash = { version = "8.0.0", optional = true, default-features = false }
+prodash = { version = "8.0.0", default-features = false }
 
 # interruptible
 ctrlc = { version = "3.1.4", optional = true, default-features = false, features = ['termination'] }