From 9b51bbb5aac1f5dc27d6666f724f3f74be1c13e8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 20 May 2021 11:54:09 +0200 Subject: Update dependency: indicatif 0.15 -> 0.16.1 0.16.1 has been published which fixes the bug introduced by 0.16.0, hence update this dependency. This reverts commit ddbd9629b3188c9f08d023829683c40ab9e1448b. Signed-off-by: Matthias Beyer --- src/commands/endpoint.rs | 6 +++--- src/commands/source.rs | 14 +++++++------- src/commands/util.rs | 2 +- src/endpoint/scheduler.rs | 8 ++++---- src/orchestrator/orchestrator.rs | 14 +++++++------- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/commands/endpoint.rs b/src/commands/endpoint.rs index e69dc56..4de51d2 100644 --- a/src/commands/endpoint.rs +++ b/src/commands/endpoint.rs @@ -75,7 +75,7 @@ async fn ping(endpoint_names: Vec, .map(|endpoint| { let bar = multibar.add(progress_generator.bar()); bar.set_length(n_pings); - bar.set_message(&format!("Pinging {}", endpoint.name())); + bar.set_message(format!("Pinging {}", endpoint.name())); async move { for i in 1..(n_pings + 1) { @@ -83,14 +83,14 @@ async fn ping(endpoint_names: Vec, let r = endpoint.ping().await; bar.inc(1); if let Err(e) = r { - bar.finish_with_message(&format!("Pinging {} failed", endpoint.name())); + bar.finish_with_message(format!("Pinging {} failed", endpoint.name())); return Err(e) } tokio::time::sleep(tokio::time::Duration::from_secs(sleep)).await; } - bar.finish_with_message(&format!("Pinging {} successful", endpoint.name())); + bar.finish_with_message(format!("Pinging {} successful", endpoint.name())); Ok(()) } }) diff --git a/src/commands/source.rs b/src/commands/source.rs index 2e4ee2b..cd33921 100644 --- a/src/commands/source.rs +++ b/src/commands/source.rs @@ -245,7 +245,7 @@ pub async fn download( .map(|p| { sc.sources_for(p).into_iter().map(|source| { let bar = multi.add(progressbars.spinner()); - bar.set_message(&format!("Downloading {}", source.url())); + bar.set_message(format!("Downloading {}", source.url())); async move { let source_path_exists = source.path().exists(); if !source_path_exists && source.download_manually() { @@ -273,7 +273,7 @@ pub async fn download( let response = match reqwest::get(source.url().as_ref()).await { Ok(resp) => resp, Err(e) => { - bar.finish_with_message(&format!("Failed: {}", source.url())); + bar.finish_with_message(format!("Failed: {}", source.url())); return Err(e).with_context(|| anyhow!("Downloading '{}'", source.url())) } }; @@ -291,9 +291,9 @@ pub async fn download( bar.inc(bytes.len() as u64); if let Some(len) = response.content_length() { - bar.set_message(&format!("Downloading {} ({}/{} bytes)", source.url(), bytes_written, len)); + bar.set_message(format!("Downloading {} ({}/{} bytes)", source.url(), bytes_written, len)); } else { - bar.set_message(&format!("Downloading {} ({} bytes)", source.url(), bytes_written)); + bar.set_message(format!("Downloading {} ({} bytes)", source.url(), bytes_written)); } } @@ -305,17 +305,17 @@ pub async fn download( if source_path_exists /* && force is implied by 'if' above*/ { if let Err(e) = source.remove_file().await { - bar.finish_with_message(&format!("Failed to remove existing file: {}", source.path().display())); + bar.finish_with_message(format!("Failed to remove existing file: {}", source.path().display())); return Err(e) } } if let Err(e) = perform_download(&source, &bar).await { - bar.finish_with_message(&format!("Failed: {}", source.url())); + bar.finish_with_message(format!("Failed: {}", source.url())); Err(e) } else { - bar.finish_with_message(&format!("Finished: {}", source.url())); + bar.finish_with_message(format!("Finished: {}", source.url())); Ok(()) } } diff --git a/src/commands/util.rs b/src/commands/util.rs index 95efda2..e892875 100644 --- a/src/commands/util.rs +++ b/src/commands/util.rs @@ -108,7 +108,7 @@ where bar.finish_with_message("Linting errored"); return Err(anyhow!("Linting was not successful")); } else { - bar.finish_with_message(&format!( + bar.finish_with_message(format!( "Finished linting {} package scripts", lint_results.len() )); diff --git a/src/endpoint/scheduler.rs b/src/endpoint/scheduler.rs index 64aa3a7..5a00c99 100644 --- a/src/endpoint/scheduler.rs +++ b/src/endpoint/scheduler.rs @@ -378,14 +378,14 @@ impl<'a> LogReceiver<'a> { } LogItem::CurrentPhase(ref phasename) => { trace!("Setting bar phase to {}", phasename); - self.bar.set_message(&format!( + self.bar.set_message(format!( "[{}/{} {} {} {}]: Phase: {}", self.endpoint_name, self.container_id_chrs, self.job_id, self.package_name, self.package_version, phasename )); } LogItem::State(Ok(())) => { trace!("Setting bar state to Ok"); - self.bar.set_message(&format!( + self.bar.set_message(format!( "[{}/{} {} {} {}]: State Ok", self.endpoint_name, self.container_id_chrs, self.job_id, self.package_name, self.package_version )); @@ -393,7 +393,7 @@ impl<'a> LogReceiver<'a> { } LogItem::State(Err(ref e)) => { trace!("Setting bar state to Err: {}", e); - self.bar.set_message(&format!( + self.bar.set_message(format!( "[{}/{} {} {} {}]: State Err: {}", self.endpoint_name, self.container_id_chrs, self.job_id, self.package_name, self.package_version, e )); @@ -418,7 +418,7 @@ impl<'a> LogReceiver<'a> { self.endpoint_name, self.container_id_chrs, self.job_id, self.package_name, self.package_version ), }; - self.bar.finish_with_message(&finish_msg); + self.bar.finish_with_message(finish_msg); if let Some(mut lf) = logfile { let _ = lf.flush().await?; diff --git a/src/orchestrator/orchestrator.rs b/src/orchestrator/orchestrator.rs index ff46a00..b118ed1 100644 --- a/src/orchestrator/orchestrator.rs +++ b/src/orchestrator/orchestrator.rs @@ -459,7 +459,7 @@ struct JobTask<'a> { impl<'a> Drop for JobTask<'a> { fn drop(&mut self) { if !self.bar.is_finished() { - self.bar.finish_with_message(&format!("[{} {} {}] Stopped, error on other task", + self.bar.finish_with_message(format!("[{} {} {}] Stopped, error on other task", self.jobdef.job.uuid(), self.jobdef.job.package().name(), self.jobdef.job.package().version())); @@ -470,7 +470,7 @@ impl<'a> Drop for JobTask<'a> { impl<'a> JobTask<'a> { fn new(receiver: Receiver, prep: TaskPreparation<'a>, sender: Vec>) -> Self { let bar = prep.bar.clone(); - bar.set_message(&format!("[{} {} {}]: Booting", + bar.set_message(format!("[{} {} {}]: Booting", prep.jobdef.job.uuid(), prep.jobdef.job.package().name(), prep.jobdef.job.package().version() @@ -522,7 +522,7 @@ impl<'a> JobTask<'a> { while !all_dependencies_are_in(&self.jobdef.dependencies, &received_dependencies) { // Update the status bar message self.bar.set_message({ - &format!("[{} {} {}]: Waiting ({}/{})...", + format!("[{} {} {}]: Waiting ({}/{})...", self.jobdef.job.uuid(), self.jobdef.job.package().name(), self.jobdef.job.package().version(), @@ -545,7 +545,7 @@ impl<'a> JobTask<'a> { self.sender[0].send(Err(received_errors)).await; // ... and stop operation, because the whole tree will fail anyways. - self.bar.finish_with_message(&format!("[{} {} {}] Stopping, errors from child received", + self.bar.finish_with_message(format!("[{} {} {}] Stopping, errors from child received", self.jobdef.job.uuid(), self.jobdef.job.package().name(), self.jobdef.job.package().version())); @@ -645,7 +645,7 @@ impl<'a> JobTask<'a> { self.jobdef.job.package().version()) })?; } - self.bar.finish_with_message(&format!("[{} {} {}] Reusing artifact", + self.bar.finish_with_message(format!("[{} {} {}] Reusing artifact", self.jobdef.job.uuid(), self.jobdef.job.package().name(), self.jobdef.job.package().version())); @@ -664,7 +664,7 @@ impl<'a> JobTask<'a> { .cloned() .collect::>(); trace!("[{}]: Dependency artifacts = {:?}", self.jobdef.job.uuid(), dependency_artifacts); - self.bar.set_message(&format!("[{} {} {}]: Preparing...", + self.bar.set_message(format!("[{} {} {}]: Preparing...", self.jobdef.job.uuid(), self.jobdef.job.package().name(), self.jobdef.job.package().version() @@ -679,7 +679,7 @@ impl<'a> JobTask<'a> { self.git_commit_env, dependency_artifacts)?; - self.bar.set_message(&format!("[{} {} {}]: Scheduling...", + self.bar.set_message(format!("[{} {} {}]: Scheduling...", self.jobdef.job.uuid(), self.jobdef.job.package().name(), self.jobdef.job.package().version() -- cgit v1.2.3