From 616f20f273b677b9fe64d809bfb2bc1ed48fce85 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sat, 30 Aug 2025 10:51:19 +0000 Subject: [PATCH] Fix unused lifetims. Fix unused pub(crate). Allow implicit hasher. Fix unused self. Signed-off-by: Jason Volk --- src/core/matrix/state_res/event_auth.rs | 2 +- src/core/matrix/state_res/resolve.rs | 2 +- .../state_res/resolve/topological_sort.rs | 1 + src/database/map/get_batch.rs | 2 +- src/database/pool.rs | 26 ++++++++----------- src/service/rooms/alias/mod.rs | 2 +- src/service/rooms/state_cache/update.rs | 2 +- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/core/matrix/state_res/event_auth.rs b/src/core/matrix/state_res/event_auth.rs index 60c7849c..bf79eb2d 100644 --- a/src/core/matrix/state_res/event_auth.rs +++ b/src/core/matrix/state_res/event_auth.rs @@ -455,7 +455,7 @@ where /// Check whether the given event passes the `m.room.power_levels` authorization /// rules. #[tracing::instrument(level = "trace", skip_all)] -fn check_room_power_levels<'a, Creators, Pdu>( +fn check_room_power_levels( room_power_levels_event: &RoomPowerLevelsEvent, current_room_power_levels_event: Option<&RoomPowerLevelsEvent>, rules: &AuthorizationRules, diff --git a/src/core/matrix/state_res/resolve.rs b/src/core/matrix/state_res/resolve.rs index 5810ba67..0fdb2172 100644 --- a/src/core/matrix/state_res/resolve.rs +++ b/src/core/matrix/state_res/resolve.rs @@ -67,7 +67,7 @@ type ConflictVec = Vec; /// /// [state resolution]: https://spec.matrix.org/latest/rooms/v2/#state-resolution #[tracing::instrument(level = "debug", skip_all)] -pub async fn resolve<'a, States, AuthSets, FetchExists, ExistsFut, FetchEvent, EventFut, Pdu>( +pub async fn resolve( rules: &RoomVersionRules, state_maps: States, auth_sets: AuthSets, diff --git a/src/core/matrix/state_res/resolve/topological_sort.rs b/src/core/matrix/state_res/resolve/topological_sort.rs index 6a285904..1599e060 100644 --- a/src/core/matrix/state_res/resolve/topological_sort.rs +++ b/src/core/matrix/state_res/resolve/topological_sort.rs @@ -75,6 +75,7 @@ impl PartialOrd for TieBreaker<'_> { graph = graph.len(), ) )] +#[allow(clippy::implicit_hasher)] pub async fn topological_sort( graph: &HashMap>, query: &Query, diff --git a/src/database/map/get_batch.rs b/src/database/map/get_batch.rs index a06c6e86..836f58e3 100644 --- a/src/database/map/get_batch.rs +++ b/src/database/map/get_batch.rs @@ -64,7 +64,7 @@ where #[implement(super::Map)] #[tracing::instrument(name = "batch_cached", level = "trace", skip_all)] -pub(crate) fn get_batch_cached<'a, I, K>( +pub(crate) fn _get_batch_cached<'a, I, K>( &self, keys: I, ) -> impl Iterator>>> + Send + use<'_, I, K> diff --git a/src/database/pool.rs b/src/database/pool.rs index eb1641ae..f646b36e 100644 --- a/src/database/pool.rs +++ b/src/database/pool.rs @@ -188,7 +188,7 @@ fn spawn_one( let handle = thread::Builder::new() .name(WORKER_NAME.into()) .stack_size(WORKER_STACK_SIZE) - .spawn(move || self.worker(id, recv))?; + .spawn(move || self.worker(id, &recv))?; workers.push(handle); @@ -267,9 +267,9 @@ async fn execute(&self, queue: &Sender, cmd: Cmd) -> Result { tid = ?thread::current().id(), ), )] -fn worker(self: Arc, id: usize, recv: Receiver) { +fn worker(self: Arc, id: usize, recv: &Receiver) { self.worker_init(id); - self.worker_loop(&recv); + self.worker_loop(recv); } #[implement(Pool)] @@ -316,7 +316,7 @@ fn worker_loop(self: &Arc, recv: &Receiver) { self.busy.fetch_add(1, Ordering::Relaxed); while let Ok(cmd) = self.worker_wait(recv) { - self.worker_handle(cmd); + worker_handle(cmd); } } @@ -337,23 +337,21 @@ fn worker_wait(self: &Arc, recv: &Receiver) -> Result }) } -#[implement(Pool)] -fn worker_handle(self: &Arc, cmd: Cmd) { +fn worker_handle(cmd: Cmd) { match cmd { - | Cmd::Get(cmd) if cmd.key.len() == 1 => self.handle_get(cmd), - | Cmd::Get(cmd) => self.handle_batch(cmd), - | Cmd::Iter(cmd) => self.handle_iter(cmd), + | Cmd::Get(cmd) if cmd.key.len() == 1 => handle_get(cmd), + | Cmd::Get(cmd) => handle_batch(cmd), + | Cmd::Iter(cmd) => handle_iter(cmd), } } -#[implement(Pool)] #[tracing::instrument( name = "iter", level = "trace", skip_all, fields(%cmd.map), )] -fn handle_iter(&self, mut cmd: Seek) { +fn handle_iter(mut cmd: Seek) { let chan = cmd.res.take().expect("missing result channel"); if chan.is_canceled() { @@ -372,7 +370,6 @@ fn handle_iter(&self, mut cmd: Seek) { let _chan_sent = chan_result.is_ok(); } -#[implement(Pool)] #[tracing::instrument( name = "batch", level = "trace", @@ -382,7 +379,7 @@ fn handle_iter(&self, mut cmd: Seek) { keys = %cmd.key.len(), ), )] -fn handle_batch(self: &Arc, mut cmd: Get) { +fn handle_batch(mut cmd: Get) { debug_assert!(cmd.key.len() > 1, "should have more than one key"); debug_assert!(!cmd.key.iter().any(SmallVec::is_empty), "querying for empty key"); @@ -401,14 +398,13 @@ fn handle_batch(self: &Arc, mut cmd: Get) { let _chan_sent = chan_result.is_ok(); } -#[implement(Pool)] #[tracing::instrument( name = "get", level = "trace", skip_all, fields(%cmd.map), )] -fn handle_get(&self, mut cmd: Get) { +fn handle_get(mut cmd: Get) { debug_assert!(!cmd.key[0].is_empty(), "querying for empty key"); // Obtain the result channel. diff --git a/src/service/rooms/alias/mod.rs b/src/service/rooms/alias/mod.rs index 014402c6..ebc575d2 100644 --- a/src/service/rooms/alias/mod.rs +++ b/src/service/rooms/alias/mod.rs @@ -173,7 +173,7 @@ impl Service { } #[tracing::instrument(skip(self), level = "debug")] - pub fn all_local_aliases<'a>(&'a self) -> impl Stream + Send + 'a { + pub fn all_local_aliases(&self) -> impl Stream + Send + '_ { self.db .alias_roomid .stream() diff --git a/src/service/rooms/state_cache/update.rs b/src/service/rooms/state_cache/update.rs index cb0d5e83..05ed699c 100644 --- a/src/service/rooms/state_cache/update.rs +++ b/src/service/rooms/state_cache/update.rs @@ -320,7 +320,7 @@ pub(crate) fn mark_as_left(&self, user_id: &UserId, room_id: &RoomId) { /// `update_membership` instead #[implement(super::Service)] #[tracing::instrument(skip(self), level = "debug")] -pub(crate) fn mark_as_knocked( +pub(crate) fn _mark_as_knocked( &self, user_id: &UserId, room_id: &RoomId,