diff --git a/src/admin/federation/commands.rs b/src/admin/federation/commands.rs index 8178311d..770eee43 100644 --- a/src/admin/federation/commands.rs +++ b/src/admin/federation/commands.rs @@ -96,6 +96,6 @@ pub(super) async fn remote_user_in_rooms(&self, user_id: OwnedUserId) -> Result .collect::>() .join("\n"); - self.write_str(&format!("Rooms {user_id} shares with us ({num}):\n```\n{body}\n```",)) + self.write_str(&format!("Rooms {user_id} shares with us ({num}):\n```\n{body}\n```")) .await } diff --git a/src/admin/media/commands.rs b/src/admin/media/commands.rs index 4eea9880..92350e71 100644 --- a/src/admin/media/commands.rs +++ b/src/admin/media/commands.rs @@ -190,7 +190,7 @@ pub(super) async fn delete_past_remote_media( ) .await?; - self.write_str(&format!("Deleted {deleted_count} total files.",)) + self.write_str(&format!("Deleted {deleted_count} total files.")) .await } @@ -204,7 +204,7 @@ pub(super) async fn delete_all_from_user(&self, username: String) -> Result { .delete_from_user(&user_id) .await?; - self.write_str(&format!("Deleted {deleted_count} total files.",)) + self.write_str(&format!("Deleted {deleted_count} total files.")) .await } @@ -257,7 +257,7 @@ pub(super) async fn delete_all_from_server( } } - self.write_str(&format!("Deleted {deleted_count} total files.",)) + self.write_str(&format!("Deleted {deleted_count} total files.")) .await } diff --git a/src/admin/room/commands.rs b/src/admin/room/commands.rs index 96744891..ded6870d 100644 --- a/src/admin/room/commands.rs +++ b/src/admin/room/commands.rs @@ -55,7 +55,7 @@ pub(super) async fn room_list( .collect::>() .join("\n"); - self.write_str(&format!("Rooms ({}):\n```\n{body}\n```", rooms.len(),)) + self.write_str(&format!("Rooms ({}):\n```\n{body}\n```", rooms.len())) .await } diff --git a/src/admin/room/directory.rs b/src/admin/room/directory.rs index fcf74b44..655c4059 100644 --- a/src/admin/room/directory.rs +++ b/src/admin/room/directory.rs @@ -70,7 +70,7 @@ pub(super) async fn process(command: RoomDirectoryCommand, context: &Context<'_> .join("\n"); context - .write_str(&format!("Rooms (page {page}):\n```\n{body}\n```",)) + .write_str(&format!("Rooms (page {page}):\n```\n{body}\n```")) .await }, } diff --git a/src/admin/room/info.rs b/src/admin/room/info.rs index 09a1a19a..afdbddba 100644 --- a/src/admin/room/info.rs +++ b/src/admin/room/info.rs @@ -65,7 +65,7 @@ async fn list_joined_members(&self, room_id: OwnedRoomId, local_only: bool) -> R .collect::>() .join("\n"); - self.write_str(&format!("{num} Members in Room \"{room_name}\":\n```\n{body}\n```",)) + self.write_str(&format!("{num} Members in Room \"{room_name}\":\n```\n{body}\n```")) .await } diff --git a/src/admin/room/moderation.rs b/src/admin/room/moderation.rs index 60952ba2..d016f3b3 100644 --- a/src/admin/room/moderation.rs +++ b/src/admin/room/moderation.rs @@ -233,6 +233,6 @@ async fn list_banned_rooms(&self, no_details: bool) -> Result { .collect::>() .join("\n"); - self.write_str(&format!("Rooms Banned ({num}):\n```\n{body}\n```",)) + self.write_str(&format!("Rooms Banned ({num}):\n```\n{body}\n```")) .await } diff --git a/src/admin/token/commands.rs b/src/admin/token/commands.rs index 0ab29a58..b5b0e055 100644 --- a/src/admin/token/commands.rs +++ b/src/admin/token/commands.rs @@ -26,7 +26,7 @@ pub(super) async fn issue( .issue_token(expires) .await?; - self.write_str(&format!("New registration token issued: `{token}` - {info}",)) + self.write_str(&format!("New registration token issued: `{token}` - {info}")) .await } diff --git a/src/admin/user/commands.rs b/src/admin/user/commands.rs index a01434ba..f18453a6 100644 --- a/src/admin/user/commands.rs +++ b/src/admin/user/commands.rs @@ -265,7 +265,7 @@ pub(super) async fn list_joined_rooms(&self, user_id: String) -> Result { .collect::>() .join("\n"); - self.write_str(&format!("Rooms {user_id} Joined ({}):\n```\n{body}\n```", rooms.len(),)) + self.write_str(&format!("Rooms {user_id} Joined ({}):\n```\n{body}\n```", rooms.len())) .await } @@ -520,7 +520,7 @@ pub(super) async fn force_join_room(&self, user_id: String, room: OwnedRoomOrAli drop(state_lock); - self.write_str(&format!("{user_id} has been joined to {room_id}.",)) + self.write_str(&format!("{user_id} has been joined to {room_id}.")) .await } @@ -561,7 +561,7 @@ pub(super) async fn force_leave_room( drop(state_lock); - self.write_str(&format!("{user_id} has left {room_id}.",)) + self.write_str(&format!("{user_id} has left {room_id}.")) .await } @@ -728,7 +728,7 @@ pub(super) async fn make_user_admin(&self, user_id: String) -> Result { .boxed() .await?; - self.write_str(&format!("{user_id} has been granted admin privileges.",)) + self.write_str(&format!("{user_id} has been granted admin privileges.")) .await } diff --git a/src/api/client/profile.rs b/src/api/client/profile.rs index 52c6bc50..4525fba6 100644 --- a/src/api/client/profile.rs +++ b/src/api/client/profile.rs @@ -280,7 +280,7 @@ pub(crate) async fn get_profile_route( .into_iter() .filter_map(|(key, val)| val.map(|val| (key, val))) .map(|(key, val)| (key.to_owned(), val.into())) - .chain(response.custom_profile_fields.into_iter()); + .chain(response.custom_profile_fields); return Ok(response.collect::()); } diff --git a/src/api/client/session/sso.rs b/src/api/client/session/sso.rs index cce15996..b615aa7f 100644 --- a/src/api/client/session/sso.rs +++ b/src/api/client/session/sso.rs @@ -506,7 +506,7 @@ async fn register_user( // log in conduit admin channel if a non-guest user registered let notice = - format!("New user \"{user_id}\" registered on this server via {idp_name} ({idp_id})",); + format!("New user \"{user_id}\" registered on this server via {idp_name} ({idp_id})"); info!("{notice}"); if services.server.config.admin_room_notices { diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs index da2cccec..4c6cab97 100644 --- a/src/service/pusher/mod.rs +++ b/src/service/pusher/mod.rs @@ -159,8 +159,8 @@ pub async fn get_device_pushkeys(&self, sender: &UserId, device_id: &DeviceId) - self.get_pusher_device(&pushkey) .await .ok() - .filter(|pusher_device| pusher_device == device_id) - .is_some() + .as_ref() + .is_some_and(|pusher_device| pusher_device == device_id) .then_some(pushkey) }) .collect() diff --git a/src/service/rooms/event_handler/handle_outlier_pdu.rs b/src/service/rooms/event_handler/handle_outlier_pdu.rs index 5a4d42b0..ebad12ac 100644 --- a/src/service/rooms/event_handler/handle_outlier_pdu.rs +++ b/src/service/rooms/event_handler/handle_outlier_pdu.rs @@ -103,7 +103,7 @@ pub(super) async fn handle_outlier_pdu( let auth_events: Vec<_> = event .auth_events() - .chain(hydra_create_id.as_deref().into_iter()) + .chain(hydra_create_id.as_deref()) .stream() .filter_map(|auth_event_id| { self.event_fetch(auth_event_id) diff --git a/src/service/server_keys/acquire.rs b/src/service/server_keys/acquire.rs index cf673085..46c65470 100644 --- a/src/service/server_keys/acquire.rs +++ b/src/service/server_keys/acquire.rs @@ -251,7 +251,7 @@ async fn acquire_notary_result(&self, missing: &mut Batch, server_keys: ServerSi fn keys_count(batch: &Batch) -> usize { batch - .iter() - .flat_map(|(_, key_ids)| key_ids.iter()) + .values() + .flat_map(|key_ids| key_ids.iter()) .count() } diff --git a/src/service/server_keys/mod.rs b/src/service/server_keys/mod.rs index 28affe4a..79f86dd5 100644 --- a/src/service/server_keys/mod.rs +++ b/src/service/server_keys/mod.rs @@ -165,7 +165,7 @@ pub async fn verify_keys_for(&self, origin: &ServerName) -> VerifyKeys { .unwrap_or(BTreeMap::new()); if self.services.globals.server_is_ours(origin) { - keys.extend(self.verify_keys.clone().into_iter()); + keys.extend(self.verify_keys.clone()); } keys diff --git a/src/service/server_keys/request.rs b/src/service/server_keys/request.rs index a3757d32..c815dc50 100644 --- a/src/service/server_keys/request.rs +++ b/src/service/server_keys/request.rs @@ -41,8 +41,8 @@ where }); let total_keys = server_keys - .iter() - .flat_map(|(_, ids)| ids.iter()) + .values() + .flat_map(|ids| ids.iter()) .count(); debug_assert!(total_keys > 0, "empty batch request to notary"); @@ -64,7 +64,7 @@ where .rev() .step_by(batch_max.saturating_sub(1)) .skip(1) - .chain(server_keys.keys().next().into_iter()) + .chain(server_keys.keys().next()) .cloned() .collect();