Additional new nightly lint fixes.

Signed-off-by: Jason Volk <jason@zemos.net>

src/admin/federation/commands.rs

@@ -96,6 +96,6 @@ pub(super) async fn remote_user_in_rooms(&self, user_id: OwnedUserId) -> Result
 		.collect::<Vec<_>>()
 		.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
 }

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
 }
 

src/admin/room/commands.rs

@@ -55,7 +55,7 @@ pub(super) async fn room_list(
 		.collect::<Vec<_>>()
 		.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
 }
 

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
 		},
 	}

src/admin/room/info.rs

@@ -65,7 +65,7 @@ async fn list_joined_members(&self, room_id: OwnedRoomId, local_only: bool) -> R
 		.collect::<Vec<_>>()
 		.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
 }
 

src/admin/room/moderation.rs

@@ -233,6 +233,6 @@ async fn list_banned_rooms(&self, no_details: bool) -> Result {
 		.collect::<Vec<_>>()
 		.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
 }

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
 }
 

src/admin/user/commands.rs

@@ -265,7 +265,7 @@ pub(super) async fn list_joined_rooms(&self, user_id: String) -> Result {
 		.collect::<Vec<_>>()
 		.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
 }
 

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::<get_profile::v3::Response>());
 		}

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 {

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)
+				.as_ref()
-				.is_some()
+				.is_some_and(|pusher_device| pusher_device == device_id)
 				.then_some(pushkey)
 		})
 		.collect()

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)

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()
+		.values()
-		.flat_map(|(_, key_ids)| key_ids.iter())
+		.flat_map(|key_ids| key_ids.iter())
 		.count()
 }

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

src/service/server_keys/request.rs

@@ -41,8 +41,8 @@ where
 	});
 
 	let total_keys = server_keys
-		.iter()
+		.values()
-		.flat_map(|(_, ids)| ids.iter())
+		.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();