From 003c2c1c43c3ec01a8fe95453e4193fcbbcca75d Mon Sep 17 00:00:00 2001
From: structix <janek@schoff.it>
Date: Fri, 20 Oct 2023 01:15:52 +0200
Subject: [PATCH] Upgrade indicatif to 0.17.7

---
 Cargo.lock  | 24 ++++++++++++++++++++----
 Cargo.toml  |  2 +-
 src/main.rs | 14 +++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e3ac448..8359007 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -100,6 +100,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
+ "regex",
  "terminal_size",
  "unicode-width",
  "winapi",
@@ -315,19 +316,28 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indicatif"
-version = "0.16.2"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
 dependencies = [
  "console",
- "lazy_static",
+ "instant",
  "number_prefix",
+ "portable-atomic",
  "rayon",
- "regex",
  "unicode-segmentation",
  "unicode-width",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@@ -514,6 +524,12 @@ dependencies = [
  "miniz_oxide 0.7.1",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
diff --git a/Cargo.toml b/Cargo.toml
index 6ceeeb9..937346b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 image = "0.24.7"
 rayon = "1.8.0"
-indicatif = { version = "0.16.2", features = ["rayon", "improved_unicode"] }
+indicatif = { version = "0.17.7", features = ["rayon", "improved_unicode"] }
 structopt = "0.3.26"
 eyre = "0.6.8"
 
diff --git a/src/main.rs b/src/main.rs
index 01d16c2..b431a9e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,7 @@
 use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::time::Duration;
 
 use eyre::Result;
 use image::{DynamicImage, GenericImage, GenericImageView, Rgba};
@@ -74,23 +75,23 @@ fn make_pbar(msg: &'static str, len: u64) -> ProgressBar {
     bar.set_style(
         ProgressStyle::default_bar()
             .template("[{elapsed_precise}/{eta_precise}] {bar:40.green/red} {pos:>4}/{len:4} {msg}")
+            .expect("asdf")
             .progress_chars("##-")
-            .on_finish(ProgressFinish::AndLeave),
     );
     bar
 }
 
 /// Create a styled spinner
-fn make_spinner(msg: &'static str, done_msg: &'static str) -> ProgressBar {
+fn make_spinner(msg: &'static str) -> ProgressBar {
     let bar = ProgressBar::new(0);
     bar.set_message(msg);
     bar.set_style(
         ProgressStyle::default_bar()
             .template("{spinner:.yellow} {msg}")
+            .expect("asdf")
             .progress_chars("##-")
-            .on_finish(ProgressFinish::WithMessage(done_msg.into())),
     );
-    bar.enable_steady_tick(100);
+    bar.enable_steady_tick(Duration::from_millis(100));
     bar
 }
 
@@ -210,7 +211,10 @@ fn main() -> Result<()> {
             }
         }
 
-        let spinner = make_spinner("Saving", "Saved!");
+        // Optional export of group tiles
+        //
+
+        let spinner = make_spinner("Saving");
         mosaic.save(output)?;
         spinner.finish_using_style();
     }