From b09e2faaaa4ce02e09ee793efe26111ee2d4110e Mon Sep 17 00:00:00 2001
From: Tonkku <contact@tonkku.me>
Date: Tue, 8 Oct 2024 09:52:46 +0300
Subject: [PATCH] =?UTF-8?q?clippy=20=F0=9F=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-model/src/oauth2/authorization_grant.rs  | 15 ++++++++-------
 crates/handlers/src/views/login.rs                |  6 +++---
 crates/templates/src/forms.rs                     |  3 +--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crates/data-model/src/oauth2/authorization_grant.rs b/crates/data-model/src/oauth2/authorization_grant.rs
index a978210ca..a60fe6ae9 100644
--- a/crates/data-model/src/oauth2/authorization_grant.rs
+++ b/crates/data-model/src/oauth2/authorization_grant.rs
@@ -187,13 +187,14 @@ impl AuthorizationGrant {
         self.created_at - max_age
     }
 
-    pub fn parse_login_hint(&self, homeserver: BoxHomeserverConnection) -> LoginHint {
+    #[must_use]
+    pub fn parse_login_hint(&self, homeserver: &BoxHomeserverConnection) -> LoginHint {
         let Some(login_hint) = &self.login_hint else {
             return LoginHint::None;
         };
 
         // Return none if the format is incorrect
-        let Some((prefix, value)) = login_hint.split_once(":") else {
+        let Some((prefix, value)) = login_hint.split_once(':') else {
             return LoginHint::None;
         };
 
@@ -304,7 +305,7 @@ mod tests {
             ..AuthorizationGrant::sample(Utc::now(), &mut rng)
         };
 
-        let hint = grant.parse_login_hint(get_homeserver());
+        let hint = grant.parse_login_hint(&get_homeserver());
 
         assert!(matches!(hint, LoginHint::None));
     }
@@ -319,7 +320,7 @@ mod tests {
             ..AuthorizationGrant::sample(Utc::now(), &mut rng)
         };
 
-        let hint = grant.parse_login_hint(get_homeserver());
+        let hint = grant.parse_login_hint(&get_homeserver());
 
         assert!(matches!(hint, LoginHint::MXID(mxid) if mxid.localpart() == "example-user"));
     }
@@ -334,7 +335,7 @@ mod tests {
             ..AuthorizationGrant::sample(Utc::now(), &mut rng)
         };
 
-        let hint = grant.parse_login_hint(get_homeserver());
+        let hint = grant.parse_login_hint(&get_homeserver());
 
         assert!(matches!(hint, LoginHint::None));
     }
@@ -349,7 +350,7 @@ mod tests {
             ..AuthorizationGrant::sample(Utc::now(), &mut rng)
         };
 
-        let hint = grant.parse_login_hint(get_homeserver());
+        let hint = grant.parse_login_hint(&get_homeserver());
 
         assert!(matches!(hint, LoginHint::None));
     }
@@ -364,7 +365,7 @@ mod tests {
             ..AuthorizationGrant::sample(Utc::now(), &mut rng)
         };
 
-        let hint = grant.parse_login_hint(get_homeserver());
+        let hint = grant.parse_login_hint(&get_homeserver());
 
         assert!(matches!(hint, LoginHint::None));
     }
diff --git a/crates/handlers/src/views/login.rs b/crates/handlers/src/views/login.rs
index d1a2c782e..7d2be0df6 100644
--- a/crates/handlers/src/views/login.rs
+++ b/crates/handlers/src/views/login.rs
@@ -296,7 +296,7 @@ async fn login(
 fn handle_login_hint(
     ctx: &mut LoginContext,
     next: &PostAuthContext,
-    homeserver: BoxHomeserverConnection,
+    homeserver: &BoxHomeserverConnection,
 ) {
     let form_state = ctx.form_state_mut();
 
@@ -307,7 +307,7 @@ fn handle_login_hint(
 
     if let PostAuthContextInner::ContinueAuthorizationGrant { ref grant } = next.ctx {
         let value = match grant.parse_login_hint(homeserver) {
-            LoginHint::MXID(mxid) => Some(mxid.localpart().to_string()),
+            LoginHint::MXID(mxid) => Some(mxid.localpart().to_owned()),
             LoginHint::None => None,
         };
         form_state.set_value(LoginFormField::Username, value);
@@ -325,7 +325,7 @@ async fn render(
 ) -> Result<String, FancyError> {
     let next = action.load_context(repo).await?;
     let ctx = if let Some(next) = next {
-        handle_login_hint(&mut ctx, &next, homeserver);
+        handle_login_hint(&mut ctx, &next, &homeserver);
 
         ctx.with_post_action(next)
     } else {
diff --git a/crates/templates/src/forms.rs b/crates/templates/src/forms.rs
index ecb5ea4ab..410e6e775 100644
--- a/crates/templates/src/forms.rs
+++ b/crates/templates/src/forms.rs
@@ -175,8 +175,7 @@ impl<K: FormField> FormState<K> {
     pub fn has_value(&self, field: K) -> bool {
         self.fields
             .get(&field)
-            .map(|f| f.value.is_some())
-            .unwrap_or(false)
+            .is_some_and(|f| f.value.is_some())
     }
 
     /// Returns `true` if the form has no error attached to it