From 064f5d11ecd1c945f7c95916a4ec35e52edab3e0 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 21 Oct 2023 18:47:06 +0200 Subject: [PATCH] Run cargo fmt --- src/server/recurring/repo.rs | 8 ++++++-- src/server/workers.rs | 8 ++++++-- src/worker.rs | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/server/recurring/repo.rs b/src/server/recurring/repo.rs index 60558a4..47945a1 100644 --- a/src/server/recurring/repo.rs +++ b/src/server/recurring/repo.rs @@ -175,7 +175,9 @@ async fn update_refs(conn: &mut SqliteConnection, refs: Vec) -> someh // Add new refs and update existing refs for reference in refs { let name = reference.name.to_string(); - let Some(hash) = reference.peeled else { continue; }; + let Some(hash) = reference.peeled else { + continue; + }; let hash = hash.to_string(); sqlx::query!( @@ -195,7 +197,9 @@ async fn update_refs(conn: &mut SqliteConnection, refs: Vec) -> someh } async fn track_main_branch(conn: &mut SqliteConnection, repo: &Repository) -> somehow::Result<()> { - let Some(head) = repo.head_ref()? else { return Ok(()); }; + let Some(head) = repo.head_ref()? else { + return Ok(()); + }; let name = head.inner.name.to_string(); sqlx::query!("UPDATE refs SET tracked = true WHERE name = ?", name) .execute(conn) diff --git a/src/server/workers.rs b/src/server/workers.rs index 39a1db9..432c739 100644 --- a/src/server/workers.rs +++ b/src/server/workers.rs @@ -103,8 +103,12 @@ impl Workers { pub fn should_abort_work(&self, name: &str, queue: &[String]) -> bool { // A worker should abort work if... - let Some(info) = self.workers.get(name) else { return false; }; - let WorkerStatus::Working (run) = &info.status else { return false; }; + let Some(info) = self.workers.get(name) else { + return false; + }; + let WorkerStatus::Working(run) = &info.status else { + return false; + }; // The commit isn't in the queue if !queue.contains(&run.hash) { diff --git a/src/worker.rs b/src/worker.rs index 2b2b4b2..71c576d 100644 --- a/src/worker.rs +++ b/src/worker.rs @@ -86,13 +86,17 @@ impl Worker { async fn perform_run(&self, server: &Server) -> bool { // Request run let guard = server.status_lock.lock().await; - let Some(run) = self.request_run(server).await else { return false; }; + let Some(run) = self.request_run(server).await else { + return false; + }; let run = RunInProgress::new(server.name.clone(), server.server_config, run); *server.current_run.lock().unwrap() = Some(run.clone()); drop(guard); // Perform run - let Some(run) = run.perform(server).await else { return false; }; + let Some(run) = run.perform(server).await else { + return false; + }; // Submit run let guard = server.status_lock.lock().await;