cargo fmt

Author: tonkku107

crates/data-model/src/oauth2/authorization_grant.rs

@@ -210,9 +210,9 @@ impl AuthorizationGrant {
                 }
 
                 LoginHint::MXID(mxid)
-            },
+            }
             // Unknown hint type, treat as none
-            _ => LoginHint::None
+            _ => LoginHint::None,
         }
     }
 
@@ -279,16 +279,16 @@ impl AuthorizationGrant {
             response_type_id_token: false,
             created_at: now,
             requires_consent: false,
-            login_hint: Some(String::from("mxid:@example-user:example.com"))
+            login_hint: Some(String::from("mxid:@example-user:example.com")),
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use mas_matrix::MockHomeserverConnection;
     use rand::thread_rng;
-    use super::*;
 
     fn get_homeserver() -> BoxHomeserverConnection {
         Box::new(MockHomeserverConnection::new("example.com"))

crates/data-model/src/oauth2/mod.rs

@@ -10,7 +10,9 @@ mod device_code_grant;
 mod session;
 
 pub use self::{
-    authorization_grant::{AuthorizationCode, AuthorizationGrant, AuthorizationGrantStage, Pkce, LoginHint},
+    authorization_grant::{
+        AuthorizationCode, AuthorizationGrant, AuthorizationGrantStage, LoginHint, Pkce,
+    },
     client::{Client, InvalidRedirectUriError, JwksOrJwksUri},
     device_code_grant::{DeviceCodeGrant, DeviceCodeGrantState},
     session::{Session, SessionState},

crates/handlers/src/views/login.rs

@@ -15,7 +15,7 @@ use mas_axum_utils::{
     csrf::{CsrfExt, CsrfToken, ProtectedForm},
     FancyError, SessionInfoExt,
 };
-use mas_data_model::{BrowserSession, UserAgent, oauth2::LoginHint};
+use mas_data_model::{oauth2::LoginHint, BrowserSession, UserAgent};
 use mas_i18n::DataLocale;
 use mas_matrix::BoxHomeserverConnection;
 use mas_router::{UpstreamOAuth2Authorize, UrlBuilder};
@@ -25,7 +25,8 @@ use mas_storage::{
     BoxClock, BoxRepository, BoxRng, Clock, RepositoryAccess,
 };
 use mas_templates::{
-    FieldError, FormError, LoginContext, LoginFormField, PostAuthContext, PostAuthContextInner, TemplateContext, Templates, ToFormState
+    FieldError, FormError, LoginContext, LoginFormField, PostAuthContext, PostAuthContextInner,
+    TemplateContext, Templates, ToFormState,
 };
 use rand::{CryptoRng, Rng};
 use serde::{Deserialize, Serialize};
@@ -292,11 +293,17 @@ async fn login(
     Ok(user_session)
 }
 
-fn handle_login_hint(ctx: &mut LoginContext, next: &PostAuthContext, homeserver: BoxHomeserverConnection) {
+fn handle_login_hint(
+    ctx: &mut LoginContext,
+    next: &PostAuthContext,
+    homeserver: BoxHomeserverConnection,
+) {
     let form_state = ctx.form_state_mut();
 
     // Do not override username if coming from a failed login attempt
-    if form_state.has_value(LoginFormField::Username) { return; }
+    if form_state.has_value(LoginFormField::Username) {
+        return;
+    }
 
     if let PostAuthContextInner::ContinueAuthorizationGrant { ref grant } = next.ctx {
         let value = match grant.parse_login_hint(homeserver) {

crates/templates/src/forms.rs

@@ -173,7 +173,10 @@ impl<K: FormField> FormState<K> {
 
     /// Checks if a field contains a value
     pub fn has_value(&self, field: K) -> bool {
-        self.fields.get(&field).map(|f| f.value.is_some()).unwrap_or(false)
+        self.fields
+            .get(&field)
+            .map(|f| f.value.is_some())
+            .unwrap_or(false)
     }
 
     /// Returns `true` if the form has no error attached to it