chore: update to Rust edition 2024 (#90)

Author: DanielleHuisman

Cargo.lock

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Rust For Web <info@rustforweb.org>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/RustForWeb/shield"
 version = "0.0.4"

Cargo.toml

@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use leptos_meta::{provide_meta_context, MetaTags, Title};
+use leptos_meta::{MetaTags, Title, provide_meta_context};
 use leptos_router::{
     components::{Route, Router, Routes},
     path,

examples/leptos-actix/src/app.rs

@@ -4,13 +4,13 @@ async fn main() -> std::io::Result<()> {
     use std::sync::Arc;
 
     use actix_files::Files;
-    use actix_session::{storage::CookieSessionStore, SessionMiddleware};
-    use actix_web::{cookie::Key, web::Data, App, HttpServer};
+    use actix_session::{SessionMiddleware, storage::CookieSessionStore};
+    use actix_web::{App, HttpServer, cookie::Key, web::Data};
     use leptos::config::get_configuration;
-    use leptos_actix::{generate_route_list, LeptosRoutes};
+    use leptos_actix::{LeptosRoutes, generate_route_list};
     use shield::{Shield, ShieldOptions};
     use shield_examples_leptos_actix::app::*;
-    use shield_leptos_actix::{provide_actix_integration, ShieldMiddleware};
+    use shield_leptos_actix::{ShieldMiddleware, provide_actix_integration};
     use shield_memory::{MemoryStorage, User};
     use shield_oidc::{Keycloak, OidcProvider};
     use tracing::{info, level_filters::LevelFilter};

examples/leptos-actix/src/main.rs

@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use leptos_meta::{provide_meta_context, MetaTags, Title};
+use leptos_meta::{MetaTags, Title, provide_meta_context};
 use leptos_router::{
     components::{Route, Router, Routes},
     path,

examples/leptos-axum/src/app.rs

@@ -3,12 +3,12 @@
 async fn main() {
     use std::sync::Arc;
 
-    use axum::{middleware::from_fn, routing::get, Router};
-    use leptos::config::{get_configuration, LeptosOptions};
-    use leptos_axum::{generate_route_list, LeptosRoutes};
+    use axum::{Router, middleware::from_fn, routing::get};
+    use leptos::config::{LeptosOptions, get_configuration};
+    use leptos_axum::{LeptosRoutes, generate_route_list};
     use shield::{Shield, ShieldOptions};
     use shield_examples_leptos_axum::app::*;
-    use shield_leptos_axum::{auth_required, provide_axum_integration, AuthRoutes, ShieldLayer};
+    use shield_leptos_axum::{AuthRoutes, ShieldLayer, auth_required, provide_axum_integration};
     use shield_memory::{MemoryStorage, User};
     use shield_oidc::{Keycloak, OidcProvider};
     use time::Duration;
@@ -65,7 +65,7 @@ async fn main() {
 
     // Initialize router
     let router = Router::new()
-        .route("/api/protected", get(|| async { "Protected" }))
+        .route("/api/protected", get(async || "Protected"))
         .route_layer(from_fn(auth_required::<User>))
         .nest("/api/auth", AuthRoutes::router::<User, LeptosOptions>())
         .merge(SwaggerUi::new("/api-docs").url("/api/openapi.json", Docs::openapi()))

examples/leptos-axum/src/main.rs

@@ -1,6 +1,6 @@
 use sea_orm::{Database, DbErr};
 use sea_orm_migration::migrator::MigratorTrait;
-use shield_sea_orm::{migrations::Migrator, SeaOrmStorage};
+use shield_sea_orm::{SeaOrmStorage, migrations::Migrator};
 
 pub async fn initialize() -> Result<SeaOrmStorage, DbErr> {
     let database = Database::connect("sqlite::memory:").await?;

examples/sea-orm/src/lib.rs

@@ -71,11 +71,11 @@ pub(crate) mod tests {
     use async_trait::async_trait;
 
     use crate::{
+        ShieldOptions,
         error::ShieldError,
         request::{SignInCallbackRequest, SignInRequest, SignOutRequest},
         response::Response,
         session::Session,
-        ShieldOptions,
     };
 
     use super::{Provider, Subprovider};

packages/core/shield/src/provider.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use async_trait::async_trait;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de::DeserializeOwned};
 
 use crate::error::SessionError;
 

packages/core/shield/src/session.rs

@@ -178,7 +178,7 @@ impl<U: User> Shield<U> {
             let provider = match self.providers.get(&authenticated.provider_id) {
                 Some(provider) => provider,
                 None => {
-                    return Err(ProviderError::ProviderNotFound(authenticated.provider_id).into())
+                    return Err(ProviderError::ProviderNotFound(authenticated.provider_id).into());
                 }
             };
 
@@ -243,9 +243,9 @@ mod tests {
     use std::sync::Arc;
 
     use crate::{
-        provider::tests::{TestProvider, TEST_PROVIDER_ID},
-        storage::tests::{TestStorage, TEST_STORAGE_ID},
         ShieldOptions,
+        provider::tests::{TEST_PROVIDER_ID, TestProvider},
+        storage::tests::{TEST_STORAGE_ID, TestStorage},
     };
 
     use super::Shield;