Merge pull request #7 from Foundation-Devices/renovate/axum-0.x

fix(deps): update rust crate axum to 0.6.20

Author: nickmonad

Cargo.toml

@@ -20,7 +20,7 @@ name = "demo"
 name = "echo"
 
 [dependencies]
-axum = { version = "0.6.0-rc.1", features = ["json"] }
+axum = { version = "0.6.20", features = ["json"] }
 clap = { version = "4", features = ["derive", "env"] }
 once_cell = "1.18"
 prometheus = "0.13"

examples/demo/main.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use servus::axum::{
-    extract::{self, Extension},
+    extract::{self, State},
     http::StatusCode,
     response::IntoResponse,
     routing::{get, post},
@@ -76,7 +76,7 @@ struct Message {
 }
 
 async fn post_message(
-    Extension(state): Extension<Arc<AppState>>,
+    State(state): State<Arc<AppState>>,
     extract::Json(payload): extract::Json<Message>,
 ) -> StatusCode {
     info!(
@@ -100,7 +100,7 @@ async fn post_message(
     StatusCode::OK
 }
 
-async fn get_messages(Extension(state): Extension<Arc<AppState>>) -> impl IntoResponse {
+async fn get_messages(State(state): State<Arc<AppState>>) -> impl IntoResponse {
     info!(message = "got get messages request!");
 
     let q = sqlx::query!("select * from guestbook")

src/http/mod.rs

@@ -8,7 +8,7 @@
 
 pub mod metrics;
 
-use axum::{extract::Extension, http::StatusCode, middleware, routing, Router, Server};
+use axum::{http::StatusCode, middleware, routing, Router, Server};
 use std::net::SocketAddr;
 use tower_http::trace::{DefaultMakeSpan, TraceLayer};
 use tracing::{error, Level};
@@ -35,15 +35,15 @@ use tracing::{error, Level};
 pub async fn serve<S>(
     http_address: SocketAddr,
     metrics_address: Option<SocketAddr>,
-    router: Router,
+    router: Router<S>,
     state: S,
 ) where
     S: Send + Sync + Clone + 'static,
 {
     // create primary application router and server
     // applying handler state if we have it, and default metrics/tracing middleware
     let r = router
-        .layer(Extension(state))
+        .with_state(state)
         .route_layer(middleware::from_fn(metrics::middleware)) // only record matched routes
         .layer(
             TraceLayer::new_for_http().make_span_with(