Merge pull request #134 from H1rono/renovate/axum-0.x

Update Rust crate axum to 0.8
H1rono · Jan 6, 2025 · cce34a1 · cce34a1
2 parents ac795d6 + 020f418
commit cce34a1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/app/bot/src/lib.rs b/app/bot/src/lib.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use http::Request;
+use tower::util::BoxCloneSyncService;
 use traq_bot_http::RequestParser;
 
 use domain::Infra;
@@ -37,7 +38,7 @@ impl<I: Infra> Bot<I> for BotImpl {
     fn build_service<B>(
         self,
         infra: Arc<I>,
-    ) -> tower::util::BoxCloneService<http::Request<B>, http::Response<String>, domain::Error>
+    ) -> BoxCloneSyncService<http::Request<B>, http::Response<String>, domain::Error>
     where
         B: http_body::Body + Send + 'static,
         B::Data: Send + 'static,
@@ -57,7 +58,7 @@ impl<I: Infra> Bot<I> for BotImpl {
             .map_request(|r: Request<B>| r)
             .map_err(Error::TraqBot)
             .map_err(domain::Error::from);
-        handler.boxed_clone()
+        BoxCloneSyncService::new(handler)
     }
 }
 

diff --git a/router/Cargo.toml b/router/Cargo.toml
@@ -13,7 +13,7 @@ serde_json.workspace = true
 tracing.workspace = true
 async-trait = "0.1"
 http.workspace = true
-axum.version = "0.7"
+axum.version = "0.8"
 axum.default-features = false
 axum.features = ["tokio", "http1", "matched-path", "tower-log", "tracing", "json"]
 

diff --git a/router/src/lib.rs b/router/src/lib.rs
@@ -90,17 +90,20 @@ where
     });
     Router::new()
         .route("/bot", bot_service)
-        .route("/wh/:id", get(get_wh::<AppStateImpl<I, A::WebhookHandler>>))
         .route(
-            "/wh/:id/github",
+            "/wh/{id}",
+            get(get_wh::<AppStateImpl<I, A::WebhookHandler>>),
+        )
+        .route(
+            "/wh/{id}/github",
             post(wh_github::<AppStateImpl<I, A::WebhookHandler>>),
         )
         .route(
-            "/wh/:id/gitea",
+            "/wh/{id}/gitea",
             post(wh_gitea::<AppStateImpl<I, A::WebhookHandler>>),
         )
         .route(
-            "/wh/:id/clickup",
+            "/wh/{id}/clickup",
             post(wh_clickup::<AppStateImpl<I, A::WebhookHandler>>),
         )
         .with_state(state)

diff --git a/router/src/webhook.rs b/router/src/webhook.rs
@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use axum::{
     extract::{FromRequestParts, Path, State},
     response::IntoResponse,
@@ -37,7 +36,6 @@ impl IntoResponse for WhRejection {
     }
 }
 
-#[async_trait]
 impl<S> FromRequestParts<S> for Wh
 where
     S: AppState,

diff --git a/usecases/src/bot.rs b/usecases/src/bot.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use http::{Request, Response};
 use http_body::Body;
-use tower::util::BoxCloneService;
+use tower::util::BoxCloneSyncService;
 
 use domain::Infra;
 
@@ -11,7 +11,7 @@ pub trait Bot<I: Infra> {
     fn build_service<B>(
         self,
         infra: Arc<I>,
-    ) -> BoxCloneService<Request<B>, Response<String>, domain::Error>
+    ) -> BoxCloneSyncService<Request<B>, Response<String>, domain::Error>
     where
         B: Body + Send + 'static,
         B::Data: Send + 'static,