From 1f3a9a40e5ab537119beaf27a2c644e212aa0b46 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 19 May 2024 10:56:59 +0000 Subject: [PATCH] lint clippy::collapsible_match (nightly) Signed-off-by: Jason Volk --- src/service/pdu.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/service/pdu.rs b/src/service/pdu.rs index 4912f1c4..f608200b 100644 --- a/src/service/pdu.rs +++ b/src/service/pdu.rs @@ -328,20 +328,17 @@ impl PduEvent { unsigned.remove("transaction_id"); } + // room v3 and above removed the "event_id" field from remote PDU format if let Some(room_id) = pdu_json .get("room_id") .and_then(|val| RoomId::parse(val.as_str()?).ok()) { - if let Ok(room_version_id) = services().rooms.state.get_room_version(&room_id) { - // room v3 and above removed the "event_id" field from remote PDU format - match room_version_id { + match services().rooms.state.get_room_version(&room_id) { + Ok(room_version_id) => match room_version_id { RoomVersionId::V1 | RoomVersionId::V2 => {}, - _ => { - pdu_json.remove("event_id"); - }, - }; - } else { - pdu_json.remove("event_id"); + _ => _ = pdu_json.remove("event_id"), + }, + Err(_) => _ = pdu_json.remove("event_id"), } } else { pdu_json.remove("event_id");