From cc5ad0f27c50f5a41551f3637b5cf9f7e56f1e65 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sat, 19 Sep 2026 17:08:10 +0100 Subject: [PATCH] Fmt --- sync-server/src/app_state/database/mutations.rs | 5 ++++- sync-server/src/app_state/database/queries.rs | 8 +++++++- sync-server/src/server/endpoints/websocket.rs | 6 +++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sync-server/src/app_state/database/mutations.rs b/sync-server/src/app_state/database/mutations.rs index 59383789..09f7a73b 100644 --- a/sync-server/src/app_state/database/mutations.rs +++ b/sync-server/src/app_state/database/mutations.rs @@ -1,4 +1,7 @@ -use super::{Database, Transaction, models::*}; +use super::{ + Database, Transaction, + models::{EventRecord, FileManifest, StoredDocumentVersion, VaultUpdateId}, +}; use anyhow::Result; impl Database { diff --git a/sync-server/src/app_state/database/queries.rs b/sync-server/src/app_state/database/queries.rs index edc77801..f9225ef4 100644 --- a/sync-server/src/app_state/database/queries.rs +++ b/sync-server/src/app_state/database/queries.rs @@ -1,4 +1,10 @@ -use super::{Database, Transaction, models::*}; +use super::{ + Database, Transaction, + models::{ + DocumentId, EventBatch, FileManifest, StoredDocumentVersion, VaultId, VaultSnapshot, + VaultUpdateId, + }, +}; use anyhow::{Result, ensure}; impl Database { diff --git a/sync-server/src/server/endpoints/websocket.rs b/sync-server/src/server/endpoints/websocket.rs index 97257215..2be4b8f2 100644 --- a/sync-server/src/server/endpoints/websocket.rs +++ b/sync-server/src/server/endpoints/websocket.rs @@ -75,7 +75,7 @@ async fn websocket( // notifications are only wakeups, so lag and commit/notify crashes are safe. let result = async { loop { - let batch = state.database.events_after(&vault, after).await.map_err(|error| server_error(error.into()))?; + let batch = state.database.events_after(&vault, after).await.map_err(server_error)?; if !batch.events.is_empty() { let head = batch.head_event_id; @@ -107,12 +107,12 @@ async fn websocket( } } }, - Some(Ok(Message::Ping(_))) | Some(Ok(Message::Pong(_))) => {}, + Some(Ok(Message::Ping(_) | Message::Pong(_))) => {}, _ => break, } } } - + Ok(()) }.await;