fix and enable collapsible_if lint

Signed-off-by: June Strawberry <june@vern.cc>

src/core/config/check.rs

@@ -269,13 +269,13 @@ pub fn check(config: &Config) -> Result {
 		);
 	}
 
-	if let Some(Either::Right(_)) = config.url_preview_bound_interface.as_ref() {
-		if !matches!(OS, "android" | "fuchsia" | "linux") {
-			return Err!(Config(
-				"url_preview_bound_interface",
-				"Not a valid IP address. Interface names not supported on {OS}."
-			));
-		}
+	if let Some(Either::Right(_)) = config.url_preview_bound_interface.as_ref()
+		&& !matches!(OS, "android" | "fuchsia" | "linux")
+	{
+		return Err!(Config(
+			"url_preview_bound_interface",
+			"Not a valid IP address. Interface names not supported on {OS}."
+		));
 	}
 
 	if !Server::available_room_versions()

src/core/info/rustc.rs

@@ -53,13 +53,13 @@ fn append_features(features: &mut Vec<&'static str>, flags: &[&'static str]) {
 	for flag in flags {
 		let is_cfg = *flag == "--cfg";
 		let is_feature = flag.starts_with("feature=");
-		if replace(&mut next_is_cfg, is_cfg) && is_feature {
-			if let Some(feature) = flag
+		if replace(&mut next_is_cfg, is_cfg)
+			&& is_feature
+			&& let Some(feature) = flag
 				.split_once('=')
 				.map(|(_, feature)| feature.trim_matches('"'))
-			{
-				features.push(feature);
-			}
+		{
+			features.push(feature);
 		}
 	}
 }

src/core/matrix/event/filter.rs

@@ -65,10 +65,10 @@ fn matches_user_id(user_id: &UserId, filter: &Filter) -> bool {
 		return false;
 	}
 
-	if let Some(senders) = filter.senders.as_ref() {
-		if !senders.iter().any(is_equal_to!(user_id)) {
-			return false;
-		}
+	if let Some(senders) = filter.senders.as_ref()
+		&& !senders.iter().any(is_equal_to!(user_id))
+	{
+		return false;
 	}
 
 	true
@@ -79,10 +79,10 @@ fn matches_room_id(room_id: &RoomId, filter: &RoomFilter) -> bool {
 		return false;
 	}
 
-	if let Some(rooms) = filter.rooms.as_ref() {
-		if !rooms.iter().any(is_equal_to!(room_id)) {
-			return false;
-		}
+	if let Some(rooms) = filter.rooms.as_ref()
+		&& !rooms.iter().any(is_equal_to!(room_id))
+	{
+		return false;
 	}
 
 	true
@@ -97,10 +97,10 @@ fn matches_room<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
 		return false;
 	}
 
-	if let Some(rooms) = filter.rooms.as_ref() {
-		if !rooms.iter().any(is_equal_to!(event.room_id())) {
-			return false;
-		}
+	if let Some(rooms) = filter.rooms.as_ref()
+		&& !rooms.iter().any(is_equal_to!(event.room_id()))
+	{
+		return false;
 	}
 
 	true
@@ -115,10 +115,10 @@ fn matches_sender<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
 		return false;
 	}
 
-	if let Some(senders) = filter.senders.as_ref() {
-		if !senders.iter().any(is_equal_to!(event.sender())) {
-			return false;
-		}
+	if let Some(senders) = filter.senders.as_ref()
+		&& !senders.iter().any(is_equal_to!(event.sender()))
+	{
+		return false;
 	}
 
 	true
@@ -131,10 +131,10 @@ fn matches_type<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
 		return false;
 	}
 
-	if let Some(types) = filter.types.as_ref() {
-		if !types.iter().any(is_equal_to!(&kind)) {
-			return false;
-		}
+	if let Some(types) = filter.types.as_ref()
+		&& !types.iter().any(is_equal_to!(&kind))
+	{
+		return false;
 	}
 
 	true

src/core/matrix/pdu/format.rs

@@ -32,14 +32,12 @@ pub fn into_outgoing_federation(
 	if !room_rules
 		.event_format
 		.require_room_create_room_id
-	{
-		if pdu_json
+		&& pdu_json
 			.get("type")
 			.and_then(CanonicalJsonValue::as_str)
 			.is_some_and(is_equal_to!("m.room.create"))
-		{
-			pdu_json.remove("room_id");
-		}
+	{
+		pdu_json.remove("room_id");
 	}
 
 	if matches!(room_rules.events_reference_format, EventsReferenceFormatVersion::V1) {

src/core/matrix/state_res/resolve/power_sort.rs

@@ -201,15 +201,14 @@ where
 	let mut room_create_event = None;
 	let mut room_power_levels_event = None;
 	let event = fetch(event_id.to_owned()).await;
-	if let Ok(event) = &event {
-		if rules
+	if let Ok(event) = &event
+		&& rules
 			.authorization
 			.room_create_event_id_as_room_id
-		{
-			let create_id = event.room_id().as_event_id()?;
-			let fetched = fetch(create_id).await?;
-			room_create_event = Some(RoomCreateEvent::new(fetched));
-		}
+	{
+		let create_id = event.room_id().as_event_id()?;
+		let fetched = fetch(create_id).await?;
+		room_create_event = Some(RoomCreateEvent::new(fetched));
 	}
 
 	for auth_event_id in event