From 6ac27e3b349108a7f382a71123ee2af96d783ce8 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Tue, 22 Sep 2026 21:24:10 +0100 Subject: [PATCH] Clippy --- sync-server/Cargo.toml | 2 +- sync-server/src/app_state/database/tests.rs | 21 +++++++++++++++---- .../src/app_state/websocket/broadcasts.rs | 5 +---- sync-server/src/app_state/websocket/utils.rs | 2 +- sync-server/src/server/history.rs | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml index 155099e8..7c2c1ab5 100644 --- a/sync-server/Cargo.toml +++ b/sync-server/Cargo.toml @@ -54,7 +54,7 @@ missing_debug_implementations = "warn" [lints.clippy] await_holding_lock = "warn" dbg_macro = "warn" -empty_enum = "warn" +empty_enums = "warn" enum_glob_use = "warn" exit = "warn" filter_map_next = "warn" diff --git a/sync-server/src/app_state/database/tests.rs b/sync-server/src/app_state/database/tests.rs index 32ee3a73..25de0e5f 100644 --- a/sync-server/src/app_state/database/tests.rs +++ b/sync-server/src/app_state/database/tests.rs @@ -116,7 +116,12 @@ async fn migrations_can_be_reapplied_without_losing_requests_or_content() { b"only copy" ); assert_eq!( - reopened.events_after(&vault, 0, DEFAULT_EVENTS_PAGE_SIZE).await.unwrap().events.len(), + reopened + .events_after(&vault, 0, DEFAULT_EVENTS_PAGE_SIZE) + .await + .unwrap() + .events + .len(), 1 ); } @@ -173,7 +178,10 @@ async fn replay_pages_are_bounded_and_cover_every_event_in_order() { } let mut after = 0; while after < 150 { - let batch = database.events_after(&vault, after, DEFAULT_EVENTS_PAGE_SIZE).await.unwrap(); + let batch = database + .events_after(&vault, after, DEFAULT_EVENTS_PAGE_SIZE) + .await + .unwrap(); assert!(batch.events.len() <= 64, "catchup must bound each page"); assert!(!batch.events.is_empty()); assert_eq!(batch.head_event_id, 150); @@ -242,7 +250,9 @@ async fn manifest_existence_checks_are_independent_of_payload_decoding() { .await .unwrap(); assert_eq!( - Database::get_missing_document(&mut tx, &[id]).await.unwrap(), + Database::get_missing_document(&mut tx, &[id]) + .await + .unwrap(), None ); let missing = uuid::Uuid::new_v4(); @@ -288,7 +298,10 @@ async fn replay_byte_budget_prevents_accumulating_large_historical_manifests() { .unwrap(); } tx.commit().await.unwrap(); - let batch = database.events_after(&vault, 0, DEFAULT_EVENTS_PAGE_SIZE).await.unwrap(); + let batch = database + .events_after(&vault, 0, DEFAULT_EVENTS_PAGE_SIZE) + .await + .unwrap(); assert!(!batch.events.is_empty()); assert!(batch.events.len() < 8); assert!(serde_json::to_vec(&batch).unwrap().len() < MAX_EVENTS_PAGE_BYTES + 1024); diff --git a/sync-server/src/app_state/websocket/broadcasts.rs b/sync-server/src/app_state/websocket/broadcasts.rs index 09b27405..f97370f3 100644 --- a/sync-server/src/app_state/websocket/broadcasts.rs +++ b/sync-server/src/app_state/websocket/broadcasts.rs @@ -1,9 +1,6 @@ use super::models::CursorPositionFromServer; use crate::{ - app_state::{ - database::models::VaultId, - weak_slots::get_or_create, - }, + app_state::{database::models::VaultId, weak_slots::get_or_create}, config::server_config::ServerConfig, }; use std::{collections::HashMap, sync::Arc}; diff --git a/sync-server/src/app_state/websocket/utils.rs b/sync-server/src/app_state/websocket/utils.rs index 770f34e2..adfab14a 100644 --- a/sync-server/src/app_state/websocket/utils.rs +++ b/sync-server/src/app_state/websocket/utils.rs @@ -3,13 +3,13 @@ use axum::extract::ws::{Message, WebSocket}; use futures::{sink::SinkExt, stream::SplitSink}; use super::models::{WebSocketClientMessage, WebSocketHandshake, WebSocketServerMessage}; +use crate::consts::WEBSOCKET_SEND_TIMEOUT; use crate::{ app_state::{AppState, database::models::VaultId}, config::user_config::User, errors::{SyncServerError, server_error, unauthenticated_error}, server::auth::auth, }; -use crate::consts::WEBSOCKET_SEND_TIMEOUT; pub struct AuthenticatedWebSocketHandshake { pub handshake: WebSocketHandshake, diff --git a/sync-server/src/server/history.rs b/sync-server/src/server/history.rs index 167c5f1f..943a2d83 100644 --- a/sync-server/src/server/history.rs +++ b/sync-server/src/server/history.rs @@ -59,4 +59,4 @@ pub async fn history_middleware( ); } Ok(response) -} \ No newline at end of file +}