From 7b9287ca5296fb1fc0e7c5b151a9d0ce6e29028d Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sat, 28 Mar 2026 10:59:51 +0000 Subject: [PATCH] Fix Rust compile --- sync-server/src/app_state/websocket/models.rs | 1 - sync-server/src/config/logging_config.rs | 4 ++-- sync-server/src/config/server_config.rs | 8 ++++---- sync-server/src/consts.rs | 2 ++ sync-server/src/server/update_document.rs | 5 ++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sync-server/src/app_state/websocket/models.rs b/sync-server/src/app_state/websocket/models.rs index fb1d24b9..116c2b84 100644 --- a/sync-server/src/app_state/websocket/models.rs +++ b/sync-server/src/app_state/websocket/models.rs @@ -70,7 +70,6 @@ pub struct WebSocketVaultUpdate { pub enum WebSocketClientMessage { Handshake(WebSocketHandshake), CursorPositions(CursorPositionFromClient), - Ping {}, } #[derive(TS, Serialize, Clone, Debug)] diff --git a/sync-server/src/config/logging_config.rs b/sync-server/src/config/logging_config.rs index e716518d..016dbc46 100644 --- a/sync-server/src/config/logging_config.rs +++ b/sync-server/src/config/logging_config.rs @@ -5,7 +5,7 @@ use log::debug; use serde::{Deserialize, Serialize}; use crate::{ - consts::{DEFAULT_LOG_DIRECTORY, DEFAULT_LOG_LEVEL, DEFAULT_LOG_ROTATION_INTERVAL}, + consts::{DEFAULT_LOG_DIRECTORY, DEFAULT_LOG_LEVEL, DEFAULT_LOG_ROTATION_INTERVAL, DURATION_ZERO}, utils::log_level::LogLevel, }; @@ -27,7 +27,7 @@ impl LoggingConfig { !self.log_directory.is_empty(), "log_directory must not be an empty string" ); - ensure!(self.log_rotation > 0, "log_rotation must be greater than 0"); + ensure!(self.log_rotation > DURATION_ZERO, "log_rotation must be greater than 0"); Ok(()) } } diff --git a/sync-server/src/config/server_config.rs b/sync-server/src/config/server_config.rs index 4132d336..715d216c 100644 --- a/sync-server/src/config/server_config.rs +++ b/sync-server/src/config/server_config.rs @@ -7,7 +7,7 @@ use crate::consts::{ DEFAULT_ALLOWED_ORIGINS, DEFAULT_BROADCAST_CHANNEL_CAPACITY, DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_MAX_CLIENTS_PER_VAULT, DEFAULT_MAX_PENDING_WS_CONNECTIONS, DEFAULT_MERGEABLE_FILE_EXTENSIONS, DEFAULT_PORT, DEFAULT_RATE_LIMIT_PER_USER_PER_SECOND, - DEFAULT_RESPONSE_TIMEOUT_SECONDS, + DEFAULT_RESPONSE_TIMEOUT_SECONDS, DURATION_ZERO, }; #[derive(Debug, Deserialize, Serialize, Clone, Default)] @@ -35,7 +35,7 @@ pub struct ServerConfig { /// Per-user maximum requests per second (keyed by bearer token). /// `None` disables rate limiting. - #[serde(default = "DEFAULT_RATE_LIMIT_PER_USER_PER_SECOND")] + #[serde(default = "default_rate_limit_per_user_per_second")] pub rate_limit_per_user_per_second: Option, /// Allowed CORS origins. Default: `["*"]` (allow all). @@ -52,7 +52,7 @@ pub struct ServerConfig { impl ServerConfig { pub fn validate(&self) -> Result<()> { ensure!( - self.response_timeout > 0, + self.response_timeout > DURATION_ZERO, "response_timeout must be greater than 0" ); ensure!( @@ -114,7 +114,7 @@ fn default_mergeable_file_extensions() -> Vec { .collect() } -fn DEFAULT_RATE_LIMIT_PER_USER_PER_SECOND() -> Option { +fn default_rate_limit_per_user_per_second() -> Option { debug!("Using default rate limit per second: {DEFAULT_RATE_LIMIT_PER_USER_PER_SECOND:?}"); DEFAULT_RATE_LIMIT_PER_USER_PER_SECOND } diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs index 715763d9..e03b848f 100644 --- a/sync-server/src/consts.rs +++ b/sync-server/src/consts.rs @@ -2,6 +2,8 @@ use std::time::Duration; use crate::utils::log_level::LogLevel; +pub const DURATION_ZERO: Duration = Duration::from_secs(0); + pub const DEFAULT_CONFIG_PATH: &str = "config.yml"; pub const DEFAULT_DATABASES_DIRECTORY_PATH: &str = "databases"; diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs index a12ec993..bd6c6586 100644 --- a/sync-server/src/server/update_document.rs +++ b/sync-server/src/server/update_document.rs @@ -5,7 +5,6 @@ use axum::{ }; use axum_extra::TypedHeader; use axum_typed_multipart::TypedMultipart; -use futures::io::Write; use log::{debug, info}; use reconcile_text::{BuiltinTokenizer, EditedText, reconcile}; use serde::Deserialize; @@ -56,7 +55,7 @@ pub async fn update_binary( get_parent_document(&state, &vault_id, &document_id, request.parent_version_id).await?; let content = request.content.contents.to_vec(); - let mut transaction = state + let transaction = state .database .create_write_transaction(&vault_id) .await @@ -102,7 +101,7 @@ pub async fn update_text( let content = edited_text.apply().text().into_bytes(); - let mut transaction = state + let transaction = state .database .create_write_transaction(&vault_id) .await