From cc5977b4e4d1ae3ab2b6c72072c78e3106964cd7 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 12 May 2024 18:43:00 -0700
Subject: [PATCH] enable `same_name_method` lint

---
 Cargo.toml                               |  1 +
 src/api/client_server/message.rs         |  4 ++--
 src/api/client_server/relations.rs       | 12 ++++++------
 src/api/client_server/sync.rs            |  2 +-
 src/database/key_value/rooms/timeline.rs |  2 +-
 src/service/rooms/timeline.rs            | 10 +++-------
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e00eb260..692fd60f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,6 +47,7 @@ redundant_feature_names = "warn"
 redundant_type_annotations = "warn"
 ref_patterns = "warn"
 rest_pat_in_fully_bound_structs = "warn"
+same_name_method = "warn"
 semicolon_inside_block = "warn"
 str_to_string = "warn"
 string_lit_chars_any = "warn"
diff --git a/src/api/client_server/message.rs b/src/api/client_server/message.rs
index 77a1d81d..1d86cf2b 100644
--- a/src/api/client_server/message.rs
+++ b/src/api/client_server/message.rs
@@ -121,8 +121,8 @@ pub(crate) async fn get_message_events_route(
     let from = match body.from.clone() {
         Some(from) => PduCount::try_from_string(&from)?,
         None => match body.dir {
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
+            ruma::api::Direction::Forward => PduCount::MIN,
+            ruma::api::Direction::Backward => PduCount::MAX,
         },
     };
 
diff --git a/src/api/client_server/relations.rs b/src/api/client_server/relations.rs
index 2bdad29c..bb85641b 100644
--- a/src/api/client_server/relations.rs
+++ b/src/api/client_server/relations.rs
@@ -18,8 +18,8 @@ pub(crate) async fn get_relating_events_with_rel_type_and_event_type_route(
         Some(from) => PduCount::try_from_string(&from)?,
         None => match ruma::api::Direction::Backward {
             // TODO: fix ruma so `body.dir` exists
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
+            ruma::api::Direction::Forward => PduCount::MIN,
+            ruma::api::Direction::Backward => PduCount::MAX,
         },
     };
 
@@ -69,8 +69,8 @@ pub(crate) async fn get_relating_events_with_rel_type_route(
         Some(from) => PduCount::try_from_string(&from)?,
         None => match ruma::api::Direction::Backward {
             // TODO: fix ruma so `body.dir` exists
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
+            ruma::api::Direction::Forward => PduCount::MIN,
+            ruma::api::Direction::Backward => PduCount::MAX,
         },
     };
 
@@ -118,8 +118,8 @@ pub(crate) async fn get_relating_events_route(
         Some(from) => PduCount::try_from_string(&from)?,
         None => match ruma::api::Direction::Backward {
             // TODO: fix ruma so `body.dir` exists
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
+            ruma::api::Direction::Forward => PduCount::MIN,
+            ruma::api::Direction::Backward => PduCount::MAX,
         },
     };
 
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index b430379f..f174e98b 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -1120,7 +1120,7 @@ fn load_timeline(
         let mut non_timeline_pdus = services()
             .rooms
             .timeline
-            .pdus_until(sender_user, room_id, PduCount::max())?
+            .pdus_until(sender_user, room_id, PduCount::MAX)?
             .filter_map(|r| {
                 // Filter out buggy events
                 if r.is_err() {
diff --git a/src/database/key_value/rooms/timeline.rs b/src/database/key_value/rooms/timeline.rs
index 0331a624..438e57e6 100644
--- a/src/database/key_value/rooms/timeline.rs
+++ b/src/database/key_value/rooms/timeline.rs
@@ -19,7 +19,7 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
         {
             hash_map::Entry::Vacant(v) => {
                 if let Some(last_count) = self
-                    .pdus_until(sender_user, room_id, PduCount::max())?
+                    .pdus_until(sender_user, room_id, PduCount::MAX)?
                     .find_map(|r| {
                         // Filter out buggy events
                         if r.is_err() {
diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs
index 307b5f97..bafcec29 100644
--- a/src/service/rooms/timeline.rs
+++ b/src/service/rooms/timeline.rs
@@ -48,12 +48,8 @@ pub(crate) enum PduCount {
 }
 
 impl PduCount {
-    pub(crate) fn min() -> Self {
-        Self::Backfilled(u64::MAX)
-    }
-    pub(crate) fn max() -> Self {
-        Self::Normal(u64::MAX)
-    }
+    pub(crate) const MIN: Self = Self::Backfilled(u64::MAX);
+    pub(crate) const MAX: Self = Self::Normal(u64::MAX);
 
     pub(crate) fn try_from_string(token: &str) -> Result<Self> {
         if let Some(stripped) = token.strip_prefix('-') {
@@ -1052,7 +1048,7 @@ impl Service {
         user_id: &UserId,
         room_id: &RoomId,
     ) -> Result<impl Iterator<Item = Result<(PduCount, PduEvent)>> + 'a> {
-        self.pdus_after(user_id, room_id, PduCount::min())
+        self.pdus_after(user_id, room_id, PduCount::MIN)
     }
 
     /// Returns an iterator over all events and their tokens in a room that happened before the