Merge pull request #17 from wasdacraic/upgrade-axum

Upgrade `axum` to 0.6

Author: connec

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axum-sqlx-tx"
 description = "Request-scoped SQLx transactions for axum"
-version = "0.4.1"
+version = "0.5.0"
 license = "MIT"
 repository = "https://github.com/wasdacraic/axum-sqlx-tx/"
 edition = "2021"
@@ -27,20 +27,20 @@ runtime-tokio-rustls = ["sqlx/runtime-tokio-rustls"]
 features = ["all-databases", "runtime-tokio-rustls"]
 
 [dependencies]
-axum-core = "0.2.1"
-bytes = "1.1.0"
-futures-core = "0.3.21"
-http = "0.2.6"
-http-body = "0.4.4"
-parking_lot = "0.12.0"
+axum-core = "0.3"
+bytes = "1"
+futures-core = "0.3"
+http = "0.2"
+http-body = "0.4"
+parking_lot = "0.12"
 sqlx = { version = "0.6", default-features = false }
-thiserror = "1.0.30"
-tower-layer = "0.3.1"
-tower-service = "0.3.1"
+thiserror = "1"
+tower-layer = "0.3"
+tower-service = "0.3"
 
 [dev-dependencies]
 axum-sqlx-tx = { path = ".", features = ["runtime-tokio-rustls", "sqlite"] }
-axum = "0.5.1"
+axum = "0.6.4"
 hyper = "0.14.17"
 tempfile = "3.3.0"
 tokio = { version = "1.17.0", features = ["macros"] }

src/layer.rs

@@ -53,6 +53,15 @@ impl<DB: sqlx::Database> Layer<DB> {
     }
 }
 
+impl<DB: sqlx::Database, E> Clone for Layer<DB, E> {
+    fn clone(&self) -> Self {
+        Self {
+            pool: self.pool.clone(),
+            _error: self._error,
+        }
+    }
+}
+
 impl<DB: sqlx::Database, S, E> tower_layer::Layer<S> for Layer<DB, E> {
     type Service = Service<DB, S, E>;
 

src/tx.rs

@@ -2,10 +2,8 @@
 
 use std::marker::PhantomData;
 
-use axum_core::{
-    extract::{FromRequest, RequestParts},
-    response::IntoResponse,
-};
+use axum_core::{extract::FromRequestParts, response::IntoResponse};
+use http::request::Parts;
 use sqlx::Transaction;
 
 use crate::{
@@ -114,25 +112,23 @@ impl<DB: sqlx::Database, E> std::ops::DerefMut for Tx<DB, E> {
     }
 }
 
-impl<DB: sqlx::Database, B, E> FromRequest<B> for Tx<DB, E>
+impl<DB: sqlx::Database, S, E> FromRequestParts<S> for Tx<DB, E>
 where
-    B: Send,
     E: From<Error> + IntoResponse,
 {
     type Rejection = E;
 
-    fn from_request<'req, 'ctx>(
-        req: &'req mut RequestParts<B>,
+    fn from_request_parts<'req, 'state, 'ctx>(
+        parts: &'req mut Parts,
+        _state: &'state S,
     ) -> futures_core::future::BoxFuture<'ctx, Result<Self, Self::Rejection>>
     where
-        'req: 'ctx,
         Self: 'ctx,
+        'req: 'ctx,
+        'state: 'ctx,
     {
         Box::pin(async move {
-            let ext: &mut Lazy<DB> = req
-                .extensions_mut()
-                .get_mut()
-                .ok_or(Error::MissingExtension)?;
+            let ext: &mut Lazy<DB> = parts.extensions.get_mut().ok_or(Error::MissingExtension)?;
 
             let tx = ext.get_or_begin().await?;
 

tests/lib.rs

@@ -188,7 +188,7 @@ struct Response {
 
 async fn build_app<H, T>(handler: H) -> (NamedTempFile, sqlx::SqlitePool, Response)
 where
-    H: axum::handler::Handler<T, axum::body::Body>,
+    H: axum::handler::Handler<T, (), axum::body::Body>,
     T: 'static,
 {
     let db = NamedTempFile::new().unwrap();