From ad1d272e2ab2bb284e3ea915ee833ed60ba45b7e Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Tue, 16 Jan 2024 20:26:42 -0500
Subject: [PATCH] fix blocks_in_conditions clippy lint

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 Cargo.toml                             |  4 ++--
 src/service/rooms/event_handler/mod.rs | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8425c131..7021a6d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -200,7 +200,7 @@ unused_extern_crates = "warn"
 unused_import_braces = "warn"
 # unused_lifetimes = "warn"
 unused_qualifications = "warn"
-unused_tuple_struct_fields = "warn"
+dead_code = "warn"
 
 [workspace.lints.clippy]
 suspicious = "warn" # assume deny in practice
@@ -212,7 +212,7 @@ expl_impl_clone_on_copy = "warn"
 unnecessary_cast = "warn"
 cast_lossless = "warn"
 ptr_as_ptr = "warn"
-ref_to_mut = "warn"
+mut_mut = "warn"
 char_lit_as_u8 = "warn"
 dbg_macro = "warn"
 empty_structs_with_brackets = "warn"
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index f11b59cb..d34424be 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -631,7 +631,7 @@ impl Service {
                     state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
                         let res = services().rooms.timeline.get_pdu(id);
                         if let Err(e) = &res {
-                            error!("LOOK AT ME Failed to fetch event: {}", e);
+                            error!("Failed to fetch event: {}", e);
                         }
                         res.ok().flatten()
                     });
@@ -975,13 +975,16 @@ impl Service {
         debug!("Resolving state");
 
         let lock = services().globals.stateres_mutex.lock();
-        let state = match state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
-            let res = services().rooms.timeline.get_pdu(id);
-            if let Err(e) = &res {
-                error!("LOOK AT ME Failed to fetch event: {}", e);
-            }
-            res.ok().flatten()
-        }) {
+        let state_resolve =
+            state_res::resolve(room_version_id, &fork_states, auth_chain_sets, |id| {
+                let res = services().rooms.timeline.get_pdu(id);
+                if let Err(e) = &res {
+                    error!("Failed to fetch event: {}", e);
+                }
+                res.ok().flatten()
+            });
+
+        let state = match state_resolve {
             Ok(new_state) => new_state,
             Err(e) => {
                 error!("State resolution failed: {}", e);