From da0e5f737390e2692ff3a6f2de5972f6bdec7fe0 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Wed, 18 Dec 2024 21:33:30 +0000 Subject: [PATCH] Enable more lints --- backend/reconcile/src/lib.rs | 2 ++ backend/sync_lib/src/lib.rs | 2 ++ backend/sync_server/src/config.rs | 2 +- backend/sync_server/src/config/database_config.rs | 2 +- backend/sync_server/src/config/server_config.rs | 2 +- backend/sync_server/src/config/user_config.rs | 4 ++-- backend/sync_server/src/database.rs | 2 +- backend/sync_server/src/database/models.rs | 2 +- backend/sync_server/src/errors.rs | 2 +- backend/sync_server/src/main.rs | 2 ++ backend/sync_server/src/server.rs | 4 ++-- backend/sync_server/src/server/ping.rs | 3 +-- 12 files changed, 17 insertions(+), 12 deletions(-) diff --git a/backend/reconcile/src/lib.rs b/backend/reconcile/src/lib.rs index 5ffc76c..2677f0b 100644 --- a/backend/reconcile/src/lib.rs +++ b/backend/reconcile/src/lib.rs @@ -1,3 +1,5 @@ +#![warn(clippy::all, clippy::restriction, clippy::pedantic, clippy::cargo)] + mod diffs; mod operation_transformation; mod tokenizer; diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs index ff374ac..63a160d 100644 --- a/backend/sync_lib/src/lib.rs +++ b/backend/sync_lib/src/lib.rs @@ -1,3 +1,5 @@ +#![warn(clippy::all, clippy::restriction, clippy::pedantic, clippy::cargo)] + use core::str; use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine as _}; diff --git a/backend/sync_server/src/config.rs b/backend/sync_server/src/config.rs index 0aa7ae9..a6b7258 100644 --- a/backend/sync_server/src/config.rs +++ b/backend/sync_server/src/config.rs @@ -31,7 +31,7 @@ impl Config { ); Self::load_from_file(path).await } else { - let config = Config::default(); + let config = Self::default(); config.write(path).await?; warn!( "Configuration file not found, wrote default configuration to {:?}", diff --git a/backend/sync_server/src/config/database_config.rs b/backend/sync_server/src/config/database_config.rs index 3c31402..effcfde 100644 --- a/backend/sync_server/src/config/database_config.rs +++ b/backend/sync_server/src/config/database_config.rs @@ -14,7 +14,7 @@ pub struct DatabaseConfig { fn default_sqlite_url() -> String { debug!("Using default sqlite url: {}", DEFAULT_SQLITE_URL); - DEFAULT_SQLITE_URL.to_string() + DEFAULT_SQLITE_URL.to_owned() } fn default_max_connections() -> u32 { diff --git a/backend/sync_server/src/config/server_config.rs b/backend/sync_server/src/config/server_config.rs index dd0b06d..88b1f48 100644 --- a/backend/sync_server/src/config/server_config.rs +++ b/backend/sync_server/src/config/server_config.rs @@ -16,7 +16,7 @@ pub struct ServerConfig { fn default_host() -> String { debug!("Using default server host: {}", DEFAULT_HOST); - DEFAULT_HOST.to_string() + DEFAULT_HOST.to_owned() } fn default_port() -> u16 { diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs index 41ccec8..bf82d9b 100644 --- a/backend/sync_server/src/config/user_config.rs +++ b/backend/sync_server/src/config/user_config.rs @@ -21,7 +21,7 @@ pub struct User { impl Default for UserConfig { fn default() -> Self { - UserConfig { + Self { user_tokens: default_users(), } } @@ -29,7 +29,7 @@ impl Default for UserConfig { fn default_users() -> Vec { vec![User { - name: "admin".to_string(), + name: "admin".to_owned(), token: get_random_token(), }] } diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs index fb1ec1c..77c3c0f 100644 --- a/backend/sync_server/src/database.rs +++ b/backend/sync_server/src/database.rs @@ -1,4 +1,4 @@ -use std::{str::FromStr, time::Duration}; +use core::{str::FromStr, time::Duration}; use anyhow::{Context, Result}; use models::{ diff --git a/backend/sync_server/src/database/models.rs b/backend/sync_server/src/database/models.rs index ba9d05f..d8f743a 100644 --- a/backend/sync_server/src/database/models.rs +++ b/backend/sync_server/src/database/models.rs @@ -19,7 +19,7 @@ pub struct StoredDocumentVersion { pub is_deleted: bool, } -impl PartialEq for StoredDocumentVersion { +impl PartialEq for StoredDocumentVersion { fn eq(&self, other: &Self) -> bool { self.vault_id == other.vault_id && self.vault_update_id == other.vault_update_id } diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs index 20cb1ea..586300b 100644 --- a/backend/sync_server/src/errors.rs +++ b/backend/sync_server/src/errors.rs @@ -82,7 +82,7 @@ impl OperationOutput for SyncServerError { type Inner = Self; } -pub fn init_error(error: anyhow::Error) -> SyncServerError { SyncServerError::InitError(error) } +pub const fn init_error(error: anyhow::Error) -> SyncServerError { SyncServerError::InitError(error) } pub fn server_error(error: anyhow::Error) -> SyncServerError { warn!("Server error: {:?}", error); diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs index f27ef5d..8c861c4 100644 --- a/backend/sync_server/src/main.rs +++ b/backend/sync_server/src/main.rs @@ -1,3 +1,5 @@ +#![warn(clippy::all, clippy::restriction, clippy::pedantic, clippy::cargo)] + mod app_state; mod config; mod consts; diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs index 501b4cb..ecc7d4b 100644 --- a/backend/sync_server/src/server.rs +++ b/backend/sync_server/src/server.rs @@ -35,7 +35,7 @@ pub async fn create_server(app_state: AppState) -> Result<()> { let mut api = OpenApi { info: Info { - description: Some("an example API".to_string()), + description: Some("an example API".to_owned()), ..Info::default() }, ..OpenApi::default() @@ -82,7 +82,7 @@ pub async fn create_server(app_state: AppState) -> Result<()> { let listener = tokio::net::TcpListener::bind(address.clone()) .await - .with_context(|| format!("Failed to bind to address: {}", address))?; + .with_context(|| format!("Failed to bind to address: {address}"))?; info!( "Listening on http://{}", diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs index 5d60829..4ed4e64 100644 --- a/backend/sync_server/src/server/ping.rs +++ b/backend/sync_server/src/server/ping.rs @@ -13,8 +13,7 @@ pub async fn ping( State(state): State, ) -> Result, SyncServerError> { let is_authenticated = maybe_auth_header - .map(|auth_header| auth(&state, auth_header.token()).is_ok()) - .unwrap_or(false); + .is_some_and(|auth_header| auth(&state, auth_header.token()).is_ok()); Ok(Json(PingResponse { server_version: env!("CARGO_PKG_VERSION").to_string(),