From 3f83989c833e865fc3b85d7613162c1068ffdf2d Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Wed, 20 May 2026 14:12:21 -0700 Subject: [PATCH] fix: Pre-Commit Lint Compliance Maneuver --- src/core/config/mod.rs | 27 +++++++++++++++++++-------- src/core/utils/hash/sha256.rs | 3 +++ src/router/request.rs | 2 +- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index 382dcc1dc..d9fce46e3 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -2487,14 +2487,13 @@ fn default_servernameevent_data_cache_capacity() -> u32 { parallelism_scaled_u32(100_000).saturating_add(100_000) } -fn default_stateinfo_cache_capacity() -> u32 { +fn default_stateinfo_cache_capacity() -> u32 { parallelism_scaled_u32(500).clamp(100, 12000) } + +fn default_roomid_spacehierarchy_cache_capacity() -> u32 { parallelism_scaled_u32(500).clamp(100, 12000) } -fn default_roomid_spacehierarchy_cache_capacity() -> u32 { - parallelism_scaled_u32(500).clamp(100, 12000) } - -fn default_dns_cache_entries() -> u32 { 327680 } +fn default_dns_cache_entries() -> u32 { 327_680 } fn default_dns_min_ttl() -> u64 { 60 * 180 } @@ -2702,14 +2701,26 @@ fn default_admin_log_capture() -> String { fn default_admin_room_tag() -> String { "m.server_notice".to_owned() } +#[must_use] #[allow(clippy::as_conversions, clippy::cast_precision_loss)] pub fn parallelism_scaled_f64(val: f64) -> f64 { val * (sys::available_parallelism() as f64) } -pub fn parallelism_scaled_u32(val: u32) -> u32 { val.saturating_mul(sys::available_parallelism() as u32) } +#[must_use] +#[allow(clippy::as_conversions, clippy::cast_possible_truncation)] +pub fn parallelism_scaled_u32(val: u32) -> u32 { + val.saturating_mul(sys::available_parallelism() as u32) +} -pub fn parallelism_scaled_i32(val: i32) -> i32 { val.saturating_mul(sys::available_parallelism() as i32) } +#[must_use] +#[allow(clippy::as_conversions, clippy::cast_possible_truncation, clippy::cast_possible_wrap)] +pub fn parallelism_scaled_i32(val: i32) -> i32 { + val.saturating_mul(sys::available_parallelism() as i32) +} -pub fn parallelism_scaled(val: usize) -> usize { val.saturating_mul(sys::available_parallelism()) } +#[must_use] +pub fn parallelism_scaled(val: usize) -> usize { + val.saturating_mul(sys::available_parallelism()) +} fn default_trusted_server_batch_size() -> usize { 256 } diff --git a/src/core/utils/hash/sha256.rs b/src/core/utils/hash/sha256.rs index 0db09a7e8..a98cd5b27 100644 --- a/src/core/utils/hash/sha256.rs +++ b/src/core/utils/hash/sha256.rs @@ -5,6 +5,7 @@ pub type DigestOut = [u8; 256 / 8]; /// Sha256 hash (input gather joined by 0xFF bytes) #[must_use] #[tracing::instrument(skip(inputs), level = "trace")] +#[allow(clippy::unnecessary_fallible_conversions)] pub fn delimited<'a, T, I>(mut inputs: I) -> DigestOut where I: Iterator + 'a, @@ -25,6 +26,7 @@ where /// Sha256 hash (input gather) #[must_use] #[tracing::instrument(skip(inputs), level = "trace")] +#[allow(clippy::unnecessary_fallible_conversions)] pub fn concat<'a, T, I>(inputs: I) -> DigestOut where I: Iterator + 'a, @@ -43,6 +45,7 @@ where #[inline] #[must_use] #[tracing::instrument(skip(input), level = "trace")] +#[allow(clippy::unnecessary_fallible_conversions)] pub fn hash(input: T) -> DigestOut where T: AsRef<[u8]>, diff --git a/src/router/request.rs b/src/router/request.rs index bc8e164d4..295a0e4e6 100644 --- a/src/router/request.rs +++ b/src/router/request.rs @@ -8,7 +8,7 @@ use axum::{ extract::State, response::{IntoResponse, Response}, }; -use conduwuit::{Result, debug_warn, err, error, trace, info}; +use conduwuit::{Result, debug_warn, err, error, info, trace}; use conduwuit_service::Services; use futures::FutureExt; use http::{Method, StatusCode, Uri};