feat: upgrade axum to 0.8.1 and related dependencies

Signed-off-by: JmPotato <github@ipotato.me>

Author: JmPotato

Cargo.toml

@@ -4,9 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = "0.7.5"
+async-trait = "0.1.87"
+axum = "0.8.1"
 axum-extra = "0.9.3"
-axum-login = "0.16.0"
+axum-login = { version = "0.17.0" }
 chrono = { version = "0.4.38", features = ["serde"] }
 comrak = { version = "0.28.0", features = ["syntect"] }
 minijinja = { version = "2.2.0", features = ["loader"] }
@@ -24,7 +25,7 @@ thiserror = "1.0.63"
 tokio = { version = "1.40.0", features = ["full"] }
 toml = "0.8.19"
 tower-http = { version = "0.5.2", features = ["fs", "trace"] }
-tower-sessions = { version = "0.13.0", default-features = false, features = [
+tower-sessions = { version = "0.14.0", default-features = false, features = [
     "signed",
 ] }
 tracing = "0.1.40"

src/app.rs

@@ -215,14 +215,14 @@ impl App {
             .route("/change_password", post(handler_change_pw_post))
             .route("/edit/article/new", get(handler_edit_article_get))
             .route("/edit/article/new", post(handler_edit_post::<Article>))
-            .route("/edit/article/:id", get(handler_edit_article_get))
-            .route("/edit/article/:id", post(handler_edit_post::<Article>))
-            .route("/delete/article/:id", get(handler_delete_post::<Article>))
+            .route("/edit/article/{id}", get(handler_edit_article_get))
+            .route("/edit/article/{id}", post(handler_edit_post::<Article>))
+            .route("/delete/article/{id}", get(handler_delete_post::<Article>))
             .route("/edit/page/new", get(handler_edit_page_get))
             .route("/edit/page/new", post(handler_edit_post::<Page>))
-            .route("/edit/page/:id", get(handler_edit_page_get))
-            .route("/edit/page/:id", post(handler_edit_post::<Page>))
-            .route("/delete/page/:id", get(handler_delete_post::<Page>))
+            .route("/edit/page/{id}", get(handler_edit_page_get))
+            .route("/edit/page/{id}", post(handler_edit_post::<Page>))
+            .route("/delete/page/{id}", get(handler_delete_post::<Page>))
             .route_layer(login_required!(AppState, login_url = "/login"));
 
         let app = Router::new()
@@ -231,14 +231,14 @@ impl App {
             .nest_service("/static", ServeDir::new(STATIC_DIR))
             // serve the page handlers
             .route("/", get(handler_home))
-            .route("/page/:num", get(handler_page))
-            .route("/article/:id_or_slug", get(handler_article))
+            .route("/page/{num}", get(handler_page))
+            .route("/article/{id_or_slug}", get(handler_article))
             .route("/articles", get(handler_articles))
-            .route("/tag/:tag", get(handler_tag))
+            .route("/tag/{tag}", get(handler_tag))
             .route("/tags", get(handler_tags))
             .route("/feed", get(handler_feed))
             .route("/ping", get(handler_ping))
-            .route("/:page", get(handler_custom_page))
+            .route("/{page}", get(handler_custom_page))
             .route("/login", get(handler_login_get))
             .route("/login", post(handler_login_post))
             .route("/logout", get(handler_logout))

src/auth.rs

@@ -1,4 +1,4 @@
-use axum::async_trait;
+use async_trait::async_trait;
 use axum_login::{AuthUser, AuthnBackend, UserId};
 use serde::Deserialize;
 use tokio::task;
@@ -36,7 +36,7 @@ impl AuthnBackend for AppState {
     ) -> Result<Option<Self::User>, Self::Error> {
         let user = User::get_by_username(&self.db, &creds.username).await;
         // Verifying the password is blocking and potentially slow, so we'll do so via
-        // `spawn_blocking`.
+        // `spawn_blocking` so it can be yielded to the runtime.
         task::spawn_blocking(|| {
             // We're using password-based authentication--this works by comparing our form
             // input with an argon2 password hash.

src/models/articles.rs

@@ -1,6 +1,5 @@
 use std::fmt::{self, Display};
 
-use axum::async_trait;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use sqlx::prelude::FromRow;
@@ -110,7 +109,6 @@ impl Display for Article {
     }
 }
 
-#[async_trait]
 impl Editable for Article {
     fn get_redirect_url(&self) -> String {
         if !self.slug.is_empty() {

src/models/pages.rs

@@ -1,6 +1,5 @@
 use std::fmt::{self, Display};
 
-use axum::async_trait;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use sqlx::prelude::FromRow;
@@ -78,7 +77,6 @@ impl Display for Page {
     }
 }
 
-#[async_trait]
 impl Editable for Page {
     fn get_redirect_url(&self) -> String {
         format!("/{}", self.title.to_lowercase())

src/utils.rs

@@ -1,7 +1,6 @@
 use std::{collections::HashSet, fmt::Display, sync::Arc};
 
 use axum::{
-    async_trait,
     extract::{rejection::PathRejection, FromRef, FromRequest, FromRequestParts, Request},
     http::request::Parts,
     response::Html,
@@ -27,7 +26,6 @@ macro_rules! render_template_with_context {
 // A wrapper for `axum::extract::Path` that can render a 404 page if the path is rejected.
 pub struct Path<T>(pub T);
 
-#[async_trait]
 impl<S, T> FromRequestParts<S> for Path<T>
 where
     Arc<AppState>: FromRef<S>,
@@ -73,7 +71,6 @@ pub struct EditorForm {
     pub content: Option<String>,
 }
 
-#[async_trait]
 pub trait Editable: DeserializeOwned + Display {
     fn get_redirect_url(&self) -> String;
     async fn update(&self, db: &sqlx::MySqlPool) -> Result<Self, Error>;
@@ -86,7 +83,6 @@ pub struct Entity<T> {
     pub is_new: bool,
 }
 
-#[async_trait]
 impl<S, T> FromRequest<S> for Entity<T>
 where
     Arc<AppState>: FromRef<S>,