diff --git a/crates/graphql/src/model/compat_sessions.rs b/crates/graphql/src/model/compat_sessions.rs index f021cf1f..f52d315c 100644 --- a/crates/graphql/src/model/compat_sessions.rs +++ b/crates/graphql/src/model/compat_sessions.rs @@ -101,7 +101,9 @@ impl CompatSsoLogin { &self, ctx: &Context<'_>, ) -> Result, async_graphql::Error> { - let Some(session_id) = self.0.session_id() else { return Ok(None) }; + let Some(session_id) = self.0.session_id() else { + return Ok(None); + }; let state = ctx.state(); let mut repo = state.repository().await?; diff --git a/crates/graphql/src/query/mod.rs b/crates/graphql/src/query/mod.rs index a58f9454..8f903212 100644 --- a/crates/graphql/src/query/mod.rs +++ b/crates/graphql/src/query/mod.rs @@ -82,7 +82,9 @@ impl BaseQuery { let id = NodeType::User.extract_ulid(&id)?; let requester = ctx.requester(); - let Some(current_user) = requester.user() else { return Ok(None) }; + let Some(current_user) = requester.user() else { + return Ok(None); + }; if current_user.id == id { Ok(Some(User(current_user.clone()))) @@ -101,7 +103,9 @@ impl BaseQuery { let id = NodeType::BrowserSession.extract_ulid(&id)?; let requester = ctx.requester(); - let Some(current_user) = requester.user() else { return Ok(None) }; + let Some(current_user) = requester.user() else { + return Ok(None); + }; let mut repo = state.repository().await?; let browser_session = repo.browser_session().lookup(id).await?; @@ -129,7 +133,9 @@ impl BaseQuery { let id = NodeType::UserEmail.extract_ulid(&id)?; let requester = ctx.requester(); - let Some(current_user) = requester.user() else { return Ok(None) }; + let Some(current_user) = requester.user() else { + return Ok(None); + }; let mut repo = state.repository().await?; let user_email = repo diff --git a/crates/graphql/src/query/upstream_oauth.rs b/crates/graphql/src/query/upstream_oauth.rs index f845ecb1..ed9c5dd0 100644 --- a/crates/graphql/src/query/upstream_oauth.rs +++ b/crates/graphql/src/query/upstream_oauth.rs @@ -38,7 +38,9 @@ impl UpstreamOAuthQuery { let id = NodeType::UpstreamOAuth2Link.extract_ulid(&id)?; let requester = ctx.requester(); - let Some(current_user) = requester.user() else { return Ok(None) }; + let Some(current_user) = requester.user() else { + return Ok(None); + }; let mut repo = state.repository().await?; let link = repo.upstream_oauth_link().lookup(id).await?; diff --git a/crates/handlers/src/upstream_oauth2/cookie.rs b/crates/handlers/src/upstream_oauth2/cookie.rs index 64deab31..99e666f3 100644 --- a/crates/handlers/src/upstream_oauth2/cookie.rs +++ b/crates/handlers/src/upstream_oauth2/cookie.rs @@ -41,8 +41,12 @@ pub struct Payload { impl Payload { fn expired(&self, now: DateTime) -> bool { - let Ok(ts) = self.session.timestamp_ms().try_into() else { return true }; - let Some(when) = NaiveDateTime::from_timestamp_millis(ts) else { return true }; + let Ok(ts) = self.session.timestamp_ms().try_into() else { + return true; + }; + let Some(when) = NaiveDateTime::from_timestamp_millis(ts) else { + return true; + }; let when = DateTime::from_utc(when, Utc); let max_age = Duration::seconds(SESSION_MAX_TIME_SECS); now - when > max_age diff --git a/crates/handlers/src/views/shared.rs b/crates/handlers/src/views/shared.rs index 69fdf901..e2caeb29 100644 --- a/crates/handlers/src/views/shared.rs +++ b/crates/handlers/src/views/shared.rs @@ -44,7 +44,9 @@ impl OptionalPostAuthAction { &'a self, repo: &'a mut impl RepositoryAccess, ) -> anyhow::Result> { - let Some(action) = self.post_auth_action.clone() else { return Ok(None) }; + let Some(action) = self.post_auth_action.clone() else { + return Ok(None); + }; let ctx = match action { PostAuthAction::ContinueAuthorizationGrant { id } => { let grant = repo diff --git a/crates/jose/src/jwt/signed.rs b/crates/jose/src/jwt/signed.rs index 76d50aac..e10dff7d 100644 --- a/crates/jose/src/jwt/signed.rs +++ b/crates/jose/src/jwt/signed.rs @@ -238,7 +238,9 @@ impl<'a, T> Jwt<'a, T> { let Ok(key) = crate::jwa::AsymmetricVerifyingKey::from_jwk_and_alg( candidate.params(), self.header().alg(), - ) else { continue }; + ) else { + continue; + }; if self.verify(&key).is_ok() { return Ok(()); diff --git a/crates/listener/src/proxy_protocol/v1.rs b/crates/listener/src/proxy_protocol/v1.rs index 391228bf..cad91e37 100644 --- a/crates/listener/src/proxy_protocol/v1.rs +++ b/crates/listener/src/proxy_protocol/v1.rs @@ -78,7 +78,8 @@ impl ProxyProtocolV1Info { .as_ref() .windows(2) .take(108) - .position(|needle| needle == [0x0D, 0x0A]) else { + .position(|needle| needle == [0x0D, 0x0A]) + else { // If not, it might be because we don't have enough bytes return if buf.remaining() < 108 { Err(E::NotEnoughBytes) diff --git a/crates/oidc-client/src/utils/mod.rs b/crates/oidc-client/src/utils/mod.rs index 414785f1..6d28d6e1 100644 --- a/crates/oidc-client/src/utils/mod.rs +++ b/crates/oidc-client/src/utils/mod.rs @@ -28,8 +28,12 @@ where } pub fn http_all_error_status_codes() -> impl RangeBounds { - let Ok(client_errors_start_code) = StatusCode::from_u16(400) else { unreachable!() }; - let Ok(server_errors_end_code) = StatusCode::from_u16(599) else { unreachable!() }; + let Ok(client_errors_start_code) = StatusCode::from_u16(400) else { + unreachable!() + }; + let Ok(server_errors_end_code) = StatusCode::from_u16(599) else { + unreachable!() + }; client_errors_start_code..=server_errors_end_code } diff --git a/crates/storage-pg/src/user/email.rs b/crates/storage-pg/src/user/email.rs index 147542d9..3b5a9b2f 100644 --- a/crates/storage-pg/src/user/email.rs +++ b/crates/storage-pg/src/user/email.rs @@ -126,7 +126,9 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { .await .to_option()?; - let Some(user_email) = res else { return Ok(None) }; + let Some(user_email) = res else { + return Ok(None); + }; Ok(Some(user_email.into())) } @@ -162,7 +164,9 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { .await .to_option()?; - let Some(user_email) = res else { return Ok(None) }; + let Some(user_email) = res else { + return Ok(None); + }; Ok(Some(user_email.into())) } @@ -177,7 +181,9 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { err, )] async fn get_primary(&mut self, user: &User) -> Result, Self::Error> { - let Some(id) = user.primary_user_email_id else { return Ok(None) }; + let Some(id) = user.primary_user_email_id else { + return Ok(None); + }; let user_email = self.lookup(id).await?.ok_or_else(|| { DatabaseInconsistencyError::on("users") diff --git a/crates/storage/src/oauth2/client.rs b/crates/storage/src/oauth2/client.rs index 275ad05e..0ac7e38c 100644 --- a/crates/storage/src/oauth2/client.rs +++ b/crates/storage/src/oauth2/client.rs @@ -47,7 +47,9 @@ pub trait OAuth2ClientRepository: Send + Sync { /// Find an OAuth2 client by its client ID async fn find_by_client_id(&mut self, client_id: &str) -> Result, Self::Error> { - let Ok(id) = client_id.parse() else { return Ok(None) }; + let Ok(id) = client_id.parse() else { + return Ok(None); + }; self.lookup(id).await }