fix some more pedantic clippy lints

Signed-off-by: strawberry <strawberry@puppygock.gay>

src/api/client_server/alias.rs

@@ -144,9 +144,8 @@ pub(crate) async fn get_alias_helper(room_alias: OwnedRoomAliasId) -> Result<get
 		},
 	};
 
-	let room_id = match room_id {
-		Some(room_id) => room_id,
-		None => return Err(Error::BadRequest(ErrorKind::NotFound, "Room with alias not found.")),
+	let Some(room_id) = room_id else {
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Room with alias not found."));
 	};
 
 	let mut servers: Vec<OwnedServerName> = Vec::new();

src/api/client_server/context.rs

@@ -143,22 +143,18 @@ pub async fn get_context_route(body: Ruma<get_context::v3::Request>) -> Result<g
 		let (event_type, state_key) = services().rooms.short.get_statekey_from_short(shortstatekey)?;
 
 		if event_type != StateEventType::RoomMember {
-			let pdu = match services().rooms.timeline.get_pdu(&id)? {
-				Some(pdu) => pdu,
-				None => {
-					error!("Pdu in state not found: {}", id);
-					continue;
-				},
+			let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
+				error!("Pdu in state not found: {}", id);
+				continue;
 			};
+
 			state.push(pdu.to_state_event());
 		} else if !lazy_load_enabled || lazy_loaded.contains(&state_key) {
-			let pdu = match services().rooms.timeline.get_pdu(&id)? {
-				Some(pdu) => pdu,
-				None => {
-					error!("Pdu in state not found: {}", id);
-					continue;
-				},
+			let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
+				error!("Pdu in state not found: {}", id);
+				continue;
 			};
+
 			state.push(pdu.to_state_event());
 		}
 	}

src/api/client_server/keys.rs

@@ -151,7 +151,6 @@ pub async fn upload_signatures_route(
 				.as_object()
 				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid signature."))?
 				.clone()
-				.into_iter()
 			{
 				// Signature validation?
 				let signature = (

src/api/client_server/media.rs

@@ -634,9 +634,8 @@ async fn download_html(client: &reqwest::Client, url: &str) -> Result<UrlPreview
 		}
 	}
 	let body = String::from_utf8_lossy(&bytes);
-	let html = match HTML::from_string(body.to_string(), Some(url.to_owned())) {
-		Ok(html) => html,
-		Err(_) => return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to parse HTML")),
+	let Ok(html) = HTML::from_string(body.to_string(), Some(url.to_owned())) else {
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to parse HTML"));
 	};
 
 	let mut data = match html.opengraph.images.first() {
@@ -653,7 +652,7 @@ async fn download_html(client: &reqwest::Client, url: &str) -> Result<UrlPreview
 	Ok(data)
 }
 
-fn url_request_allowed(addr: &IpAddr) -> bool {
+pub(crate) fn url_request_allowed(addr: &IpAddr) -> bool {
 	// TODO: make this check ip_range_denylist
 
 	// could be implemented with reqwest when it supports IP filtering:

src/api/client_server/membership.rs

@@ -1264,12 +1264,12 @@ pub async fn leave_all_rooms(user_id: &UserId) -> Result<()> {
 		.collect::<Vec<_>>();
 
 	for room_id in all_rooms {
-		let room_id = match room_id {
-			Ok(room_id) => room_id,
-			Err(_) => continue,
+		let Ok(room_id) = room_id else {
+			continue;
 		};
 
-		let _ = leave_room(user_id, &room_id, None).await;
+		// ignore errors
+		_ = leave_room(user_id, &room_id, None).await;
 	}
 
 	Ok(())

src/api/client_server/profile.rs

@@ -68,7 +68,7 @@ pub async fn set_displayname_route(
 			Arc::clone(services().globals.roomid_mutex_state.write().await.entry(room_id.clone()).or_default());
 		let state_lock = mutex_state.lock().await;
 
-		let _ = services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await;
+		_ = services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await;
 	}
 
 	if services().globals.allow_local_presence() {
@@ -179,7 +179,7 @@ pub async fn set_avatar_url_route(body: Ruma<set_avatar_url::v3::Request>) -> Re
 			Arc::clone(services().globals.roomid_mutex_state.write().await.entry(room_id.clone()).or_default());
 		let state_lock = mutex_state.lock().await;
 
-		let _ = services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await;
+		_ = services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await;
 	}
 
 	if services().globals.allow_local_presence() {

src/api/client_server/room.rs

@@ -513,7 +513,7 @@ pub async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<c
 	// 8. Events implied by invite (and TODO: invite_3pid)
 	drop(state_lock);
 	for user_id in &body.invite {
-		let _ = invite_helper(sender_user, user_id, &room_id, None, body.is_direct).await;
+		_ = invite_helper(sender_user, user_id, &room_id, None, body.is_direct).await;
 	}
 
 	// Homeserver specific stuff
@@ -819,7 +819,7 @@ pub async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) -> Result
 
 	// Modify the power levels in the old room to prevent sending of events and
 	// inviting new users
-	let _ = services()
+	_ = services()
 		.rooms
 		.timeline
 		.build_and_append_pdu(

src/api/client_server/sync.rs

@@ -146,7 +146,7 @@ async fn sync_helper_wrapper(
 		}
 	}
 
-	let _ = tx.send(Some(r.map(|(r, _)| r)));
+	_ = tx.send(Some(r.map(|(r, _)| r)));
 }
 
 async fn sync_helper(
@@ -300,12 +300,9 @@ async fn sync_helper(
                     // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
                     || *sender_user == state_key
 				{
-					let pdu = match services().rooms.timeline.get_pdu(&id)? {
-						Some(pdu) => pdu,
-						None => {
-							error!("Pdu in state not found: {}", id);
-							continue;
-						},
+					let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
+						error!("Pdu in state not found: {}", id);
+						continue;
 					};
 
 					left_state_events.push(pdu.to_sync_state_event());
@@ -431,7 +428,7 @@ async fn sync_helper(
 		device_unused_fallback_key_types: None,
 	};
 
-	// TODO: Retry the endpoint instead of returning (waiting for #118)
+	// TODO: Retry the endpoint instead of returning
 	if !full_state
 		&& response.rooms.is_empty()
 		&& response.presence.is_empty()
@@ -445,7 +442,7 @@ async fn sync_helper(
 		if duration.as_secs() > 30 {
 			duration = Duration::from_secs(30);
 		}
-		let _ = tokio::time::timeout(duration, watcher).await;
+		_ = tokio::time::timeout(duration, watcher).await;
 		Ok((response, false))
 	} else {
 		Ok((response, since != next_batch)) // Only cache if we made progress
@@ -1382,7 +1379,7 @@ pub async fn sync_events_v4_route(
 		if duration.as_secs() > 30 {
 			duration = Duration::from_secs(30);
 		}
-		let _ = tokio::time::timeout(duration, watcher).await;
+		_ = tokio::time::timeout(duration, watcher).await;
 	}
 
 	Ok(sync_events::v4::Response {