diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2021-05-17 13:58:10 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2021-05-17 13:59:44 +0200 |
commit | ddbd9629b3188c9f08d023829683c40ab9e1448b (patch) | |
tree | 8ebcf47cb5d54b1f2e843bf760a8f9f260a8fb26 /src/orchestrator/orchestrator.rs | |
parent | f9a2d04b50c566ff762b3f450b444cf6c6757715 (diff) |
Revert "Update dependency: indicatif 0.15 -> 0.16"
This reverts the dependency update because indicatif 0.16 introduced a
reachable `unreachable!()` statement in their sourcecode that we
actually hit if we `--hide-bars`.
This reverts commit 6ceccb679d9c2d19389c6c6eef792d8db9086f31.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/orchestrator/orchestrator.rs')
-rw-r--r-- | src/orchestrator/orchestrator.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/orchestrator/orchestrator.rs b/src/orchestrator/orchestrator.rs index b118ed1..ff46a00 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<JobResult>, prep: TaskPreparation<'a>, sender: Vec<Sender<JobResult>>) -> 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::<Vec<ArtifactPath>>(); 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() |