chore: bump indicatif from 0.16.2 to 0.17.0 (#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](https://github.com/console-rs/indicatif/compare/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] <support@github.com>

* [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 <dependabot-buildkite@noreply.solana.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
dependabot[bot] 2022-08-05 21:11:17 +00:00 committed by GitHub
parent 69598ed4c0
commit 65e670725a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 57 additions and 34 deletions

7
Cargo.lock generated
View File

@ -2165,14 +2165,13 @@ dependencies = [
[[package]] [[package]]
name = "indicatif" name = "indicatif"
version = "0.16.2" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf"
dependencies = [ dependencies = [
"console", "console",
"lazy_static",
"number_prefix", "number_prefix",
"regex", "unicode-width",
] ]
[[package]] [[package]]

View File

@ -16,7 +16,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
clap = "2.33.0" clap = "2.33.0"
console = "0.15.0" console = "0.15.0"
humantime = "2.0.1" humantime = "2.0.1"
indicatif = "0.16.2" indicatif = "0.17.0"
pretty-hex = "0.3.0" pretty-hex = "0.3.0"
semver = "1.0.10" semver = "1.0.10"
serde = "1.0.138" serde = "1.0.138"

View File

@ -19,7 +19,7 @@ use {
}, },
solana_transaction_status::{Rewards, UiTransactionStatusMeta}, solana_transaction_status::{Rewards, UiTransactionStatusMeta},
spl_memo::{id as spl_memo_id, v1::id as spl_memo_v1_id}, 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)] #[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 /// Creates a new process bar for processing that will take an unknown amount of time
pub fn new_spinner_progress_bar() -> ProgressBar { pub fn new_spinner_progress_bar() -> ProgressBar {
let progress_bar = ProgressBar::new(42); let progress_bar = ProgressBar::new(42);
progress_bar progress_bar.set_style(
.set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}")); ProgressStyle::default_spinner()
progress_bar.enable_steady_tick(100); .template("{spinner:.green} {wide_msg}")
.expect("ProgresStyle::template direct input to be correct"),
);
progress_bar.enable_steady_tick(Duration::from_millis(100));
progress_bar progress_bar
} }

View File

@ -22,7 +22,7 @@ enum_dispatch = "0.3.8"
futures = "0.3" futures = "0.3"
futures-util = "0.3.21" futures-util = "0.3.21"
indexmap = "1.9.1" indexmap = "1.9.1"
indicatif = "0.16.2" indicatif = "0.17.0"
itertools = "0.10.2" itertools = "0.10.2"
jsonrpc-core = "18.0.0" jsonrpc-core = "18.0.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1912,14 +1912,13 @@ dependencies = [
[[package]] [[package]]
name = "indicatif" name = "indicatif"
version = "0.16.2" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf"
dependencies = [ dependencies = [
"console", "console",
"lazy_static",
"number_prefix", "number_prefix",
"regex", "unicode-width",
] ]
[[package]] [[package]]

View File

@ -16,7 +16,7 @@ console = "0.15.0"
csv = "1.1.6" csv = "1.1.6"
ctrlc = { version = "3.2.2", features = ["termination"] } ctrlc = { version = "3.2.2", features = ["termination"] }
indexmap = "1.9.1" indexmap = "1.9.1"
indicatif = "0.16.2" indicatif = "0.17.0"
pickledb = "0.4.1" pickledb = "0.4.1"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
solana-account-decoder = { path = "../account-decoder", version = "=1.11.6" } solana-account-decoder = { path = "../account-decoder", version = "=1.11.6" }

View File

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

View File

@ -17,7 +17,7 @@ console = "0.15.0"
core_affinity = "0.5.10" core_affinity = "0.5.10"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
fd-lock = "3.0.5" fd-lock = "3.0.5"
indicatif = "0.16.2" indicatif = "0.17.0"
jsonrpc-core = "18.0.0" jsonrpc-core = "18.0.0"
jsonrpc-core-client = { version = "18.0.0", features = ["ipc"] } jsonrpc-core-client = { version = "18.0.0", features = ["ipc"] }
jsonrpc-derive = "18.0.0" jsonrpc-derive = "18.0.0"

View File

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