chore: make clippy happy

Author: ctron

src/oidc.rs

@@ -86,10 +86,10 @@ pub async fn fetch_token(config: &Client, http: &HttpOptions) -> anyhow::Result<
 pub async fn get_token(config: &Client, http: &HttpOptions) -> anyhow::Result<TokenResult> {
     if let Some(state) = &config.state {
         log::debug!("Token expires: {}", OrNone(&state.expires));
-        if let Some(expires) = state.expires {
-            if expires > OffsetDateTime::now_utc() {
-                return Ok(TokenResult::Existing(state.clone()));
-            }
+        if let Some(expires) = state.expires
+            && expires > OffsetDateTime::now_utc()
+        {
+            return Ok(TokenResult::Existing(state.clone()));
         }
     }
 
@@ -124,10 +124,9 @@ pub fn check_refresh_token_expiration(refresh_token: &str) -> anyhow::Result<()>
         if let Some(exp) = token
             .exp
             .and_then(|exp| OffsetDateTime::from_unix_timestamp(exp).ok())
+            && exp < OffsetDateTime::now_utc()
         {
-            if exp < OffsetDateTime::now_utc() {
-                bail!("Refresh token expired. You need to re-login.");
-            }
+            bail!("Refresh token expired. You need to re-login.");
         }
     }
 

src/server.rs

@@ -114,11 +114,11 @@ impl Server {
         let tx = Arc::new(Mutex::new(Some(tx)));
 
         tokio::spawn(async move {
-            if let Err(err) = run_http(acceptor, web::Data::new(State { tx: tx.clone() })).await {
-                if let Some(tx) = tx.lock().await.take() {
-                    // we still have a sender, we respond with our error
-                    let _ = tx.send(Err(err));
-                }
+            if let Err(err) = run_http(acceptor, web::Data::new(State { tx: tx.clone() })).await
+                && let Some(tx) = tx.lock().await.take()
+            {
+                // we still have a sender, we respond with our error
+                let _ = tx.send(Err(err));
             }
         });