From c51e87ec9ad3a13a5c287e79ccba2b0ab2755cd1 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 14 May 2024 17:14:43 -0700
Subject: [PATCH] enable `items_after_statements` lint

---
 Cargo.toml                    |  1 +
 src/service/rooms/timeline.rs | 31 ++++++++++++++++---------------
 src/utils/error.rs            | 11 ++++++-----
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3ee99811..d206ef29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,6 +41,7 @@ ignored_unit_patterns = "warn"
 impl_trait_in_params = "warn"
 implicit_clone = "warn"
 inconsistent_struct_constructor = "warn"
+items_after_statements = "warn"
 let_underscore_must_use = "warn"
 lossy_float_literal = "warn"
 mem_forget = "warn"
diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs
index 6947eabb..e03dec8e 100644
--- a/src/service/rooms/timeline.rs
+++ b/src/service/rooms/timeline.rs
@@ -504,21 +504,6 @@ impl Service {
         }
 
         // Update Relationships
-        #[derive(Deserialize)]
-        struct ExtractRelatesTo {
-            #[serde(rename = "m.relates_to")]
-            relates_to: Relation,
-        }
-
-        #[derive(Clone, Debug, Deserialize)]
-        struct ExtractEventId {
-            event_id: OwnedEventId,
-        }
-        #[derive(Clone, Debug, Deserialize)]
-        struct ExtractRelatesToEventId {
-            #[serde(rename = "m.relates_to")]
-            relates_to: ExtractEventId,
-        }
 
         if let Ok(content) = serde_json::from_str::<ExtractRelatesToEventId>(pdu.content.get()) {
             if let Some(related_pducount) = services()
@@ -1250,6 +1235,22 @@ impl Service {
     }
 }
 
+#[derive(Deserialize)]
+struct ExtractRelatesTo {
+    #[serde(rename = "m.relates_to")]
+    relates_to: Relation,
+}
+
+#[derive(Clone, Debug, Deserialize)]
+struct ExtractEventId {
+    event_id: OwnedEventId,
+}
+#[derive(Clone, Debug, Deserialize)]
+struct ExtractRelatesToEventId {
+    #[serde(rename = "m.relates_to")]
+    relates_to: ExtractEventId,
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/utils/error.rs b/src/utils/error.rs
index ab534c18..4554bd53 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -89,6 +89,12 @@ impl Error {
     }
 
     pub(crate) fn to_response(&self) -> RumaResponse<UiaaResponse> {
+        use ErrorKind::{
+            Forbidden, GuestAccessForbidden, LimitExceeded, MissingToken, NotFound,
+            ThreepidAuthFailed, ThreepidDenied, TooLarge, Unauthorized, Unknown, UnknownToken,
+            Unrecognized, UserDeactivated, WrongRoomKeysVersion,
+        };
+
         if let Self::Uiaa(uiaainfo) = self {
             return RumaResponse(UiaaResponse::AuthResponse(uiaainfo.clone()));
         }
@@ -104,11 +110,6 @@ impl Error {
 
         let message = format!("{self}");
 
-        use ErrorKind::{
-            Forbidden, GuestAccessForbidden, LimitExceeded, MissingToken, NotFound,
-            ThreepidAuthFailed, ThreepidDenied, TooLarge, Unauthorized, Unknown, UnknownToken,
-            Unrecognized, UserDeactivated, WrongRoomKeysVersion,
-        };
         let (kind, status_code) = match self {
             Self::BadRequest(kind, _) => (
                 kind.clone(),