Additional new nightly lint fixes.

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

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()

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