diff --git a/Cargo.lock b/Cargo.lock index 85a0dc8f2f..3f110ac133 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2161,15 +2161,14 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf" dependencies = [ "console", - "lazy_static", "number_prefix", "rayon", - "regex", + "unicode-width", ] [[package]] diff --git a/package/Cargo.toml b/package/Cargo.toml index 020c9258c0..5bebdb9892 100644 --- a/package/Cargo.toml +++ b/package/Cargo.toml @@ -10,7 +10,7 @@ anyhow = "1.0" clap = { version = "3.2", features = ["derive"] } futures = "0.3.23" hex = "0.4.3" -indicatif = { version = "0.16.2", features = ["rayon"] } +indicatif = { version = "0.17.0", features = ["rayon"] } omicron-common = { path = "../common" } omicron-sled-agent = { path = "../sled-agent" } omicron-zone-package = "0.3.2" diff --git a/package/src/bin/omicron-package.rs b/package/src/bin/omicron-package.rs index 80208a240c..9d3799d193 100644 --- a/package/src/bin/omicron-package.rs +++ b/package/src/bin/omicron-package.rs @@ -293,7 +293,6 @@ async fn do_package(config: &Config, output_directory: &Path) -> Result<()> { }, ); - tokio::task::spawn_blocking(move || ui.multi.join()); tokio::try_join!(external_pkg_stream, internal_pkg_stream)?; Ok(()) @@ -496,12 +495,14 @@ fn in_progress_style() -> ProgressStyle { .template( "[{elapsed_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {msg}", ) + .expect("Invalid template") .progress_chars("#>.") } fn completed_progress_style() -> ProgressStyle { ProgressStyle::default_bar() .template("[{elapsed_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {msg:.green}") + .expect("Invalid template") .progress_chars("#>.") }