Upgrade Rust to 1.86.0 (#4355)

Author: sandhose

.github/workflows/ci.yaml

@@ -210,7 +210,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.85.0
+        uses: dtolnay/rust-toolchain@1.86.0
         with:
           components: clippy
 

Dockerfile

@@ -8,7 +8,7 @@
 # The Debian version and version name must be in sync
 ARG DEBIAN_VERSION=12
 ARG DEBIAN_VERSION_NAME=bookworm
-ARG RUSTC_VERSION=1.85.0
+ARG RUSTC_VERSION=1.86.0
 ARG NODEJS_VERSION=20.15.0
 ARG OPA_VERSION=1.1.0
 ARG CARGO_AUDITABLE_VERSION=0.6.6

crates/axum-utils/src/client_authorization.rs

@@ -171,7 +171,7 @@ impl Credentials {
             (_, _) => {
                 return Err(CredentialsVerificationError::AuthenticationMethodMismatch);
             }
-        };
+        }
         Ok(())
     }
 }

crates/cli/src/commands/manage.rs

@@ -386,7 +386,7 @@ impl Options {
                     0 => info!("No active compatibility sessions to end"),
                     1 => info!("Ended 1 active OAuth 2.0 session"),
                     _ => info!("Ended {affected} active OAuth 2.0 sessions"),
-                };
+                }
 
                 let filter = BrowserSessionFilter::new().for_user(&user).active_only();
                 let affected = if dry_run {

crates/cli/src/commands/syn2mas.rs

@@ -130,7 +130,7 @@ impl Options {
             .await
             .context("could not run migrations")?;
 
-        if matches!(&self.subcommand, Subcommand::Migrate { .. }) {
+        if matches!(&self.subcommand, Subcommand::Migrate) {
             // First perform a config sync
             // This is crucial to ensure we register upstream OAuth providers
             // in the MAS database

crates/email/src/transport.rs

@@ -144,7 +144,7 @@ impl AsyncTransport for Transport {
             TransportInner::Sendmail(t) => {
                 t.send_raw(envelope, email).await?;
             }
-        };
+        }
 
         Ok(())
     }

crates/handlers/src/admin/response.rs

@@ -63,20 +63,20 @@ fn url_with_pagination(base: &str, pagination: Pagination) -> String {
     let mut query = query.to_owned();
 
     if let Some(before) = pagination.before {
-        query += &format!("&page[before]={before}");
+        query = format!("{query}&page[before]={before}");
     }
 
     if let Some(after) = pagination.after {
-        query += &format!("&page[after]={after}");
+        query = format!("{query}&page[after]={after}");
     }
 
     let count = pagination.count;
     match pagination.direction {
         mas_storage::pagination::PaginationDirection::Forward => {
-            query += &format!("&page[first]={count}");
+            query = format!("{query}&page[first]={count}");
         }
         mas_storage::pagination::PaginationDirection::Backward => {
-            query += &format!("&page[last]={count}");
+            query = format!("{query}&page[last]={count}");
         }
     }
 

crates/handlers/src/oauth2/device/link.rs

@@ -58,7 +58,7 @@ pub(crate) async fn get(
 
         // The code isn't valid, set an error on the form
         form_state = form_state.with_error_on_field(DeviceLinkFormField::Code, FieldError::Invalid);
-    };
+    }
 
     // Rendre the form
     let ctx = DeviceLinkContext::new()

crates/handlers/src/oauth2/token.rs

@@ -426,7 +426,7 @@ async fn authorization_code_grant(
         (Some(pkce), Some(verifier)) => {
             pkce.verify(verifier)?;
         }
-    };
+    }
 
     let Some(user_session_id) = session.user_session_id else {
         tracing::warn!("No user session associated with this OAuth2 session");

crates/handlers/src/passwords.rs

@@ -345,7 +345,7 @@ impl Algorithm {
 
                 Pbkdf2.verify_password(password.as_ref(), &hashed_password)?;
             }
-        };
+        }
 
         Ok(())
     }