chore: bump indicatif from 0.16.2 to 0.17.0 (solana-labs#26890)

* chore: bump indicatif from 0.16.2 to 0.17.0 Bumps [indicatif](https://github.com/console-rs/indicatif) from 0.16.2 to 0.17.0. - [Release notes](https://github.com/console-rs/indicatif/releases) - [Commits](console-rs/indicatif@0.16.2...0.17.0) --- updated-dependencies: - dependency-name: indicatif dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * [auto-commit] Update all Cargo lock files * Accommodate api changes Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot-buildkite <[email protected]> Co-authored-by: Tyera Eulberg <[email protected]>
apfitzge · Aug 9, 2022 · 090bac6 · 090bac6
1 parent 14aef57
commit 090bac6
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
@@ -16,7 +16,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.0"
 console = "0.15.0"
 humantime = "2.0.1"
-indicatif = "0.16.2"
+indicatif = "0.17.0"
 pretty-hex = "0.3.0"
 semver = "1.0.10"
 serde = "1.0.138"

diff --git a/cli-output/src/display.rs b/cli-output/src/display.rs
@@ -19,7 +19,7 @@ use {
     },
     solana_transaction_status::{Rewards, UiTransactionStatusMeta},
     spl_memo::{id as spl_memo_id, v1::id as spl_memo_v1_id},
-    std::{collections::HashMap, fmt, io},
+    std::{collections::HashMap, fmt, io, time::Duration},
 };
 
 #[derive(Clone, Debug)]
@@ -684,9 +684,12 @@ pub fn writeln_transaction(
 /// Creates a new process bar for processing that will take an unknown amount of time
 pub fn new_spinner_progress_bar() -> ProgressBar {
     let progress_bar = ProgressBar::new(42);
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
+    progress_bar.set_style(
+        ProgressStyle::default_spinner()
+            .template("{spinner:.green} {wide_msg}")
+            .expect("ProgresStyle::template direct input to be correct"),
+    );
+    progress_bar.enable_steady_tick(Duration::from_millis(100));
     progress_bar
 }
 

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -22,7 +22,7 @@ enum_dispatch = "0.3.8"
 futures = "0.3"
 futures-util = "0.3.21"
 indexmap = "1.9.1"
-indicatif = "0.16.2"
+indicatif = "0.17.0"
 itertools = "0.10.2"
 jsonrpc-core = "18.0.0"
 lazy_static = "1.4.0"

diff --git a/client/src/spinner.rs b/client/src/spinner.rs
@@ -1,12 +1,18 @@
 //! Spinner creator
 
-use indicatif::{ProgressBar, ProgressStyle};
+use {
+    indicatif::{ProgressBar, ProgressStyle},
+    std::time::Duration,
+};
 
 pub(crate) fn new_progress_bar() -> ProgressBar {
     let progress_bar = ProgressBar::new(42);
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
+    progress_bar.set_style(
+        ProgressStyle::default_spinner()
+            .template("{spinner:.green} {wide_msg}")
+            .expect("ProgresStyle::template direct input to be correct"),
+    );
+    progress_bar.enable_steady_tick(Duration::from_millis(100));
     progress_bar
 }
 

diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 console = "0.15.0"
-indicatif = "0.16.2"
+indicatif = "0.17.0"
 log = "0.4.17"
 reqwest = { version = "0.11.11", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] }
 solana-runtime = { path = "../runtime", version = "=1.11.6" }

diff --git a/download-utils/src/lib.rs b/download-utils/src/lib.rs
@@ -23,9 +23,12 @@ static SPARKLE: Emoji = Emoji("✨ ", "");
 /// Creates a new process bar for processing that will take an unknown amount of time
 fn new_spinner_progress_bar() -> ProgressBar {
     let progress_bar = ProgressBar::new(42);
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
+    progress_bar.set_style(
+        ProgressStyle::default_spinner()
+            .template("{spinner:.green} {wide_msg}")
+            .expect("ProgresStyle::template direct input to be correct"),
+    );
+    progress_bar.enable_steady_tick(Duration::from_millis(100));
     progress_bar
 }
 
@@ -112,6 +115,7 @@ pub fn download_file<'a, 'b>(
                 .template(
                     "{spinner:.green}{msg_wide}[{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})",
                 )
+                .expect("ProgresStyle::template direct input to be correct")
                 .progress_chars("=> "),
         );
         progress_bar.set_message(format!("{}Downloading~ {}", TRUCK, url));

diff --git a/install/Cargo.toml b/install/Cargo.toml
@@ -19,7 +19,7 @@ console = "0.15.0"
 crossbeam-channel = "0.5"
 ctrlc = { version = "3.2.2", features = ["termination"] }
 dirs-next = "2.0.0"
-indicatif = "0.16.2"
+indicatif = "0.17.0"
 lazy_static = "1.4.0"
 nix = "0.24.2"
 reqwest = { version = "0.11.11", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] }

diff --git a/install/src/command.rs b/install/src/command.rs
@@ -47,9 +47,12 @@ static RECYCLING: Emoji = Emoji("♻️  ", "");
 /// Creates a new process bar for processing that will take an unknown amount of time
 fn new_spinner_progress_bar() -> ProgressBar {
     let progress_bar = ProgressBar::new(42);
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
+    progress_bar.set_style(
+        ProgressStyle::default_spinner()
+            .template("{spinner:.green} {wide_msg}")
+            .expect("ProgresStyle::template direct input to be correct"),
+    );
+    progress_bar.enable_steady_tick(Duration::from_millis(100));
     progress_bar
 }
 
@@ -115,6 +118,7 @@ fn download_to_temp(
             .template(
                 "{spinner:.green}{wide_msg} [{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})",
             )
+            .expect("ProgresStyle::template direct input to be correct")
             .progress_chars("=> "),
     );
     progress_bar.set_message(format!("{}Downloading", TRUCK));
@@ -831,6 +835,7 @@ pub fn gc(config_file: &str) -> Result<(), String> {
             progress_bar.set_style(
                 ProgressStyle::default_bar()
                     .template("{spinner:.green}{wide_msg} [{bar:40.cyan/blue}] {pos}/{len} ({eta})")
+                    .expect("ProgresStyle::template direct input to be correct")
                     .progress_chars("=> "),
             );
             progress_bar.set_message(format!("{}Removing old releases", RECYCLING));

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
@@ -16,7 +16,7 @@ console = "0.15.0"
 csv = "1.1.6"
 ctrlc = { version = "3.2.2", features = ["termination"] }
 indexmap = "1.9.1"
-indicatif = "0.16.2"
+indicatif = "0.17.0"
 pickledb = "0.4.1"
 serde = { version = "1.0", features = ["derive"] }
 solana-account-decoder = { path = "../account-decoder", version = "=1.11.6" }

diff --git a/tokens/src/commands.rs b/tokens/src/commands.rs
@@ -528,9 +528,12 @@ fn read_allocations(
 
 fn new_spinner_progress_bar() -> ProgressBar {
     let progress_bar = ProgressBar::new(42);
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
+    progress_bar.set_style(
+        ProgressStyle::default_spinner()
+            .template("{spinner:.green} {wide_msg}")
+            .expect("ProgresStyle::template direct input to be correct"),
+    );
+    progress_bar.enable_steady_tick(Duration::from_millis(100));
     progress_bar
 }
 

diff --git a/validator/Cargo.toml b/validator/Cargo.toml
@@ -17,7 +17,7 @@ console = "0.15.0"
 core_affinity = "0.5.10"
 crossbeam-channel = "0.5"
 fd-lock = "3.0.5"
-indicatif = "0.16.2"
+indicatif = "0.17.0"
 jsonrpc-core = "18.0.0"
 jsonrpc-core-client = { version = "18.0.0", features = ["ipc"] }
 jsonrpc-derive = "18.0.0"

diff --git a/validator/src/lib.rs b/validator/src/lib.rs
@@ -14,6 +14,7 @@ use {
         path::Path,
         process::exit,
         thread::JoinHandle,
+        time::Duration,
     },
 };
 
@@ -121,9 +122,12 @@ pub fn println_name_value(name: &str, value: &str) {
 pub fn new_spinner_progress_bar() -> ProgressBar {
     let progress_bar = indicatif::ProgressBar::new(42);
     progress_bar.set_draw_target(ProgressDrawTarget::stdout());
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
+    progress_bar.set_style(
+        ProgressStyle::default_spinner()
+            .template("{spinner:.green} {wide_msg}")
+            .expect("ProgresStyle::template direct input to be correct"),
+    );
+    progress_bar.enable_steady_tick(Duration::from_millis(100));
 
     ProgressBar {
         progress_bar,