From d8521c5040541f1a9a15e4bed3d9969ca3719cd4 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 3 Mar 2024 19:28:57 +0200
Subject: chore: upgrade dependency on indicatif

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author
---
 Cargo.lock             | 31 +++++++++++++++++++++++++++----
 Cargo.toml             |  2 +-
 src/backup_progress.rs | 36 ++++++++++++++++++++++++++----------
 src/cmd/restore.rs     |  6 +++++-
 4 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5259fcd..304ee53 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -331,6 +331,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
+ "unicode-width",
  "windows-sys 0.52.0",
 ]
 
@@ -856,14 +857,24 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.16.2"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
- "lazy_static",
+ "instant",
  "number_prefix",
- "regex",
+ "portable-atomic",
+ "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]]
@@ -1305,6 +1316,12 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -2071,6 +2088,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
 [[package]]
 name = "universal-hash"
 version = "0.4.0"
diff --git a/Cargo.toml b/Cargo.toml
index 9a128f8..e57607e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ chrono = "0.4"
 clap = { version = "4", features = ["derive"] }
 directories-next = "2"
 futures = "0.3.30"
-indicatif = "0.16"
+indicatif = "0.17"
 libc = "0.2"
 log = "0.4"
 log4rs = "1"
diff --git a/src/backup_progress.rs b/src/backup_progress.rs
index 1e6805c..e3995f0 100644
--- a/src/backup_progress.rs
+++ b/src/backup_progress.rs
@@ -2,7 +2,7 @@
 
 use crate::generation::GenId;
 use indicatif::{ProgressBar, ProgressStyle};
-use std::path::Path;
+use std::{path::Path, time::Duration};
 
 const SHOW_PROGRESS: bool = true;
 
@@ -29,8 +29,12 @@ impl BackupProgress {
             "current: {wide_msg}",
             "{spinner}",
         ];
-        progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n")));
-        progress.enable_steady_tick(100);
+        progress.set_style(
+            ProgressStyle::default_bar()
+                .template(&parts.join("\n"))
+                .expect("create indicatif ProgressStyle value"),
+        );
+        progress.enable_steady_tick(Duration::from_millis(100));
 
         Self { progress }
     }
@@ -50,8 +54,12 @@ impl BackupProgress {
             "current: {wide_msg}",
             "{spinner}",
         ];
-        progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n")));
-        progress.enable_steady_tick(100);
+        progress.set_style(
+            ProgressStyle::default_bar()
+                .template(&parts.join("\n"))
+                .expect("create indicatif ProgressStyle value"),
+        );
+        progress.enable_steady_tick(Duration::from_millis(100));
 
         Self { progress }
     }
@@ -64,8 +72,12 @@ impl BackupProgress {
             "elapsed: {elapsed}",
             "{spinner}",
         ];
-        progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n")));
-        progress.enable_steady_tick(100);
+        progress.set_style(
+            ProgressStyle::default_bar()
+                .template(&parts.join("\n"))
+                .expect("create indicatif ProgressStyle value"),
+        );
+        progress.enable_steady_tick(Duration::from_millis(100));
 
         Self { progress }
     }
@@ -75,8 +87,12 @@ impl BackupProgress {
     pub fn download_generation(gen_id: &GenId) -> Self {
         let progress = ProgressBar::new(0);
         let parts = ["{msg}", "elapsed: {elapsed}", "{spinner}"];
-        progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n")));
-        progress.enable_steady_tick(100);
+        progress.set_style(
+            ProgressStyle::default_bar()
+                .template(&parts.join("\n"))
+                .expect("create indicatif ProgressStyle value"),
+        );
+        progress.enable_steady_tick(Duration::from_millis(100));
         progress.set_message(format!(
             "downloading previous generation metadata: {}",
             gen_id
@@ -102,7 +118,7 @@ impl BackupProgress {
     /// Update progress bar about number of actual files found.
     pub fn found_live_file(&self, filename: &Path) {
         self.progress.inc(1);
-        if self.progress.length() < self.progress.position() {
+        if self.progress.length() < Some(self.progress.position()) {
             self.progress.set_length(self.progress.position());
         }
         self.progress.set_message(format!("{}", filename.display()));
diff --git a/src/cmd/restore.rs b/src/cmd/restore.rs
index dff72fa..58caf61 100644
--- a/src/cmd/restore.rs
+++ b/src/cmd/restore.rs
@@ -306,6 +306,10 @@ fn create_progress_bar(file_count: FileId, verbose: bool) -> ProgressBar {
         "current: {wide_msg}",
         "{spinner}",
     ];
-    progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n")));
+    progress.set_style(
+        ProgressStyle::default_bar()
+            .template(&parts.join("\n"))
+            .expect("create indicatif ProgressStyle value"),
+    );
     progress
 }
-- 
cgit v1.2.1