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/orchestrator/orchestrator.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/orchestrator/orchestrator.rs') 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