From b903ee4b422640e924f632149e51047b17c19ff0 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Fri, 5 Apr 2024 16:05:20 +0200 Subject: [PATCH] room(style): remove one level of indent with an early let/else statement Classic Benji. --- crates/matrix-sdk/src/room/mod.rs | 36 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/crates/matrix-sdk/src/room/mod.rs b/crates/matrix-sdk/src/room/mod.rs index af4d4e178..b660c6281 100644 --- a/crates/matrix-sdk/src/room/mod.rs +++ b/crates/matrix-sdk/src/room/mod.rs @@ -1103,29 +1103,27 @@ impl Room { use ruma::events::room::encrypted::EncryptedEventScheme; let machine = self.client.olm_machine().await; - if let Some(machine) = machine.as_ref() { - let mut event = - match machine.decrypt_room_event(event.cast_ref(), self.inner.room_id()).await { - Ok(event) => event, - Err(e) => { - let event = event.deserialize()?; - if let EncryptedEventScheme::MegolmV1AesSha2(c) = event.content.scheme { - self.client - .encryption() - .backups() - .maybe_download_room_key(self.room_id().to_owned(), c.session_id); - } + let machine = machine.as_ref().ok_or(Error::NoOlmMachine)?; - return Err(e.into()); + let mut event = + match machine.decrypt_room_event(event.cast_ref(), self.inner.room_id()).await { + Ok(event) => event, + Err(e) => { + let event = event.deserialize()?; + if let EncryptedEventScheme::MegolmV1AesSha2(c) = event.content.scheme { + self.client + .encryption() + .backups() + .maybe_download_room_key(self.room_id().to_owned(), c.session_id); } - }; - event.push_actions = self.event_push_actions(&event.event).await?; + return Err(e.into()); + } + }; - Ok(event) - } else { - Err(Error::NoOlmMachine) - } + event.push_actions = self.event_push_actions(&event.event).await?; + + Ok(event) } /// Forces the currently active room key, which is used to encrypt messages,