Fix some of axum-macro's tests

tokio-rs · Jul 11, 2022 · 2117c97 · 2117c97
1 parent 61bb214
commit 2117c97
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 67 deletions.
diff --git a/axum-macros/src/debug_handler.rs b/axum-macros/src/debug_handler.rs
@@ -196,7 +196,7 @@ fn check_inputs_impls_from_request(item_fn: &ItemFn, body_ty: &Type) -> TokenStr
                 #[allow(warnings)]
                 fn #name()
                 where
-                    #ty: ::axum::extract::FromRequest<#body_ty> + Send,
+                    #ty: ::axum::extract::FromRequest<(), #body_ty> + Send,
                 {}
             }
         })

diff --git a/axum-macros/src/from_request.rs b/axum-macros/src/from_request.rs
@@ -106,16 +106,17 @@ fn impl_struct_by_extracting_each_field(
     Ok(quote! {
         #[::axum::async_trait]
         #[automatically_derived]
-        impl<B> ::axum::extract::FromRequest<B> for #ident
+        impl<S, B> ::axum::extract::FromRequest<S, B> for #ident
         where
             B: ::axum::body::HttpBody + ::std::marker::Send + 'static,
             B::Data: ::std::marker::Send,
             B::Error: ::std::convert::Into<::axum::BoxError>,
+            S: Send,
         {
             type Rejection = #rejection_ident;
 
             async fn from_request(
-                req: &mut ::axum::extract::RequestParts<B>,
+                req: &mut ::axum::extract::RequestParts<S, B>,
             ) -> ::std::result::Result<Self, Self::Rejection> {
                 ::std::result::Result::Ok(Self {
                     #(#extract_fields)*
@@ -301,7 +302,7 @@ fn extract_each_field_rejection(
 
             Ok(quote_spanned! {ty_span=>
                 #[allow(non_camel_case_types)]
-                #variant_name(<#extractor_ty as ::axum::extract::FromRequest<::axum::body::Body>>::Rejection),
+                #variant_name(<#extractor_ty as ::axum::extract::FromRequest<S, ::axum::body::Body>>::Rejection),
             })
         })
         .collect::<syn::Result<Vec<_>>>()?;
@@ -485,18 +486,19 @@ fn impl_struct_by_extracting_all_at_once(
     Ok(quote_spanned! {path_span=>
         #[::axum::async_trait]
         #[automatically_derived]
-        impl<B> ::axum::extract::FromRequest<B> for #ident
+        impl<S, B> ::axum::extract::FromRequest<S, B> for #ident
         where
             B: ::axum::body::HttpBody + ::std::marker::Send + 'static,
             B::Data: ::std::marker::Send,
             B::Error: ::std::convert::Into<::axum::BoxError>,
+            S: Send,
         {
-            type Rejection = <#path<Self> as ::axum::extract::FromRequest<B>>::Rejection;
+            type Rejection = <#path<Self> as ::axum::extract::FromRequest<S, B>>::Rejection;
 
             async fn from_request(
-                req: &mut ::axum::extract::RequestParts<B>,
+                req: &mut ::axum::extract::RequestParts<S, B>,
             ) -> ::std::result::Result<Self, Self::Rejection> {
-                ::axum::extract::FromRequest::<B>::from_request(req)
+                ::axum::extract::FromRequest::<S, B>::from_request(req)
                     .await
                     .map(|#path(inner)| inner)
             }
@@ -540,18 +542,19 @@ fn impl_enum_by_extracting_all_at_once(
     Ok(quote_spanned! {path_span=>
         #[::axum::async_trait]
         #[automatically_derived]
-        impl<B> ::axum::extract::FromRequest<B> for #ident
+        impl<S, B> ::axum::extract::FromRequest<S, B> for #ident
         where
             B: ::axum::body::HttpBody + ::std::marker::Send + 'static,
             B::Data: ::std::marker::Send,
             B::Error: ::std::convert::Into<::axum::BoxError>,
+            S: Send,
         {
-            type Rejection = <#path<Self> as ::axum::extract::FromRequest<B>>::Rejection;
+            type Rejection = <#path<Self> as ::axum::extract::FromRequest<S, B>>::Rejection;
 
             async fn from_request(
-                req: &mut ::axum::extract::RequestParts<B>,
+                req: &mut ::axum::extract::RequestParts<S, B>,
             ) -> ::std::result::Result<Self, Self::Rejection> {
-                ::axum::extract::FromRequest::<B>::from_request(req)
+                ::axum::extract::FromRequest::<S, B>::from_request(req)
                     .await
                     .map(|#path(inner)| inner)
             }

diff --git a/axum-macros/src/typed_path.rs b/axum-macros/src/typed_path.rs
@@ -127,13 +127,14 @@ fn expand_named_fields(
     let from_request_impl = quote! {
         #[::axum::async_trait]
         #[automatically_derived]
-        impl<B> ::axum::extract::FromRequest<B> for #ident
+        impl<S, B> ::axum::extract::FromRequest<S, B> for #ident
         where
             B: Send,
+            S: Send,
         {
             type Rejection = #rejection_assoc_type;
 
-            async fn from_request(req: &mut ::axum::extract::RequestParts<B>) -> ::std::result::Result<Self, Self::Rejection> {
+            async fn from_request(req: &mut ::axum::extract::RequestParts<S, B>) -> ::std::result::Result<Self, Self::Rejection> {
                 ::axum::extract::Path::from_request(req)
                     .await
                     .map(|path| path.0)
@@ -229,13 +230,14 @@ fn expand_unnamed_fields(
     let from_request_impl = quote! {
         #[::axum::async_trait]
         #[automatically_derived]
-        impl<B> ::axum::extract::FromRequest<B> for #ident
+        impl<S, B> ::axum::extract::FromRequest<S, B> for #ident
         where
             B: Send,
+            S: Send,
         {
             type Rejection = #rejection_assoc_type;
 
-            async fn from_request(req: &mut ::axum::extract::RequestParts<B>) -> ::std::result::Result<Self, Self::Rejection> {
+            async fn from_request(req: &mut ::axum::extract::RequestParts<S, B>) -> ::std::result::Result<Self, Self::Rejection> {
                 ::axum::extract::Path::from_request(req)
                     .await
                     .map(|path| path.0)
@@ -310,13 +312,14 @@ fn expand_unit_fields(
     let from_request_impl = quote! {
         #[::axum::async_trait]
         #[automatically_derived]
-        impl<B> ::axum::extract::FromRequest<B> for #ident
+        impl<S, B> ::axum::extract::FromRequest<S, B> for #ident
         where
             B: Send,
+            S: Send,
         {
             type Rejection = #rejection_assoc_type;
 
-            async fn from_request(req: &mut ::axum::extract::RequestParts<B>) -> ::std::result::Result<Self, Self::Rejection> {
+            async fn from_request(req: &mut ::axum::extract::RequestParts<S, B>) -> ::std::result::Result<Self, Self::Rejection> {
                 if req.uri().path() == <Self as ::axum_extra::routing::TypedPath>::PATH {
                     Ok(Self)
                 } else {
@@ -387,7 +390,7 @@ enum Segment {
 
 fn path_rejection() -> TokenStream {
     quote! {
-        <::axum::extract::Path<Self> as ::axum::extract::FromRequest<B>>::Rejection
+        <::axum::extract::Path<Self> as ::axum::extract::FromRequest<S, B>>::Rejection
     }
 }
 

diff --git a/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr b/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr
@@ -1,17 +1,17 @@
-error[E0277]: the trait bound `bool: FromRequest<Body>` is not satisfied
+error[E0277]: the trait bound `bool: FromRequest<(), Body>` is not satisfied
  --> tests/debug_handler/fail/argument_not_extractor.rs:4:23
   |
 4 | async fn handler(foo: bool) {}
-  |                       ^^^^ the trait `FromRequest<Body>` is not implemented for `bool`
+  |                       ^^^^ the trait `FromRequest<(), Body>` is not implemented for `bool`
   |
-  = help: the following other types implement trait `FromRequest<B>`:
-            ()
-            (T1, T2)
-            (T1, T2, T3)
-            (T1, T2, T3, T4)
-            (T1, T2, T3, T4, T5)
-            (T1, T2, T3, T4, T5, T6)
-            (T1, T2, T3, T4, T5, T6, T7)
-            (T1, T2, T3, T4, T5, T6, T7, T8)
-          and 33 others
+  = help: the following other types implement trait `FromRequest<S, B>`:
+            <() as FromRequest<S, B>>
+            <(T1, T2) as FromRequest<S, B>>
+            <(T1, T2, T3) as FromRequest<S, B>>
+            <(T1, T2, T3, T4) as FromRequest<S, B>>
+            <(T1, T2, T3, T4, T5) as FromRequest<S, B>>
+            <(T1, T2, T3, T4, T5, T6) as FromRequest<S, B>>
+            <(T1, T2, T3, T4, T5, T6, T7) as FromRequest<S, B>>
+            <(T1, T2, T3, T4, T5, T6, T7, T8) as FromRequest<S, B>>
+          and 34 others
   = help: see issue #48214
diff --git a/axum-macros/tests/debug_handler/fail/extract_self_mut.rs b/axum-macros/tests/debug_handler/fail/extract_self_mut.rs
@@ -7,13 +7,14 @@ use axum_macros::debug_handler;
 struct A;
 
 #[async_trait]
-impl<B> FromRequest<B> for A
+impl<S, B> FromRequest<S, B> for A
 where
-    B: Send + 'static,
+    B: Send,
+    S: Send,
 {
     type Rejection = ();
 
-    async fn from_request(_req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
+    async fn from_request(_req: &mut RequestParts<S, B>) -> Result<Self, Self::Rejection> {
         unimplemented!()
     }
 }

diff --git a/axum-macros/tests/debug_handler/fail/extract_self_mut.stderr b/axum-macros/tests/debug_handler/fail/extract_self_mut.stderr
@@ -1,5 +1,5 @@
 error: Handlers must only take owned values
-  --> tests/debug_handler/fail/extract_self_mut.rs:23:22
+  --> tests/debug_handler/fail/extract_self_mut.rs:24:22
    |
-23 |     async fn handler(&mut self) {}
+24 |     async fn handler(&mut self) {}
    |                      ^^^^^^^^^
diff --git a/axum-macros/tests/debug_handler/fail/extract_self_ref.rs b/axum-macros/tests/debug_handler/fail/extract_self_ref.rs
@@ -7,13 +7,14 @@ use axum_macros::debug_handler;
 struct A;
 
 #[async_trait]
-impl<B> FromRequest<B> for A
+impl<S, B> FromRequest<S, B> for A
 where
-    B: Send + 'static,
+    B: Send,
+    S: Send,
 {
     type Rejection = ();
 
-    async fn from_request(_req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
+    async fn from_request(_req: &mut RequestParts<S, B>) -> Result<Self, Self::Rejection> {
         unimplemented!()
     }
 }

diff --git a/axum-macros/tests/debug_handler/fail/extract_self_ref.stderr b/axum-macros/tests/debug_handler/fail/extract_self_ref.stderr
@@ -1,5 +1,5 @@
 error: Handlers must only take owned values
-  --> tests/debug_handler/fail/extract_self_ref.rs:23:22
+  --> tests/debug_handler/fail/extract_self_ref.rs:24:22
    |
-23 |     async fn handler(&self) {}
+24 |     async fn handler(&self) {}
    |                      ^^^^^
diff --git a/axum-macros/tests/debug_handler/pass/result_impl_into_response.rs b/axum-macros/tests/debug_handler/pass/result_impl_into_response.rs
@@ -120,13 +120,14 @@ impl A {
 }
 
 #[async_trait]
-impl<B> FromRequest<B> for A
+impl<S, B> FromRequest<S, B> for A
 where
-    B: Send + 'static,
+    B: Send,
+    S: Send,
 {
     type Rejection = ();
 
-    async fn from_request(_req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
+    async fn from_request(_req: &mut RequestParts<S, B>) -> Result<Self, Self::Rejection> {
         unimplemented!()
     }
 }
diff --git a/axum-macros/tests/debug_handler/pass/self_receiver.rs b/axum-macros/tests/debug_handler/pass/self_receiver.rs
@@ -7,13 +7,14 @@ use axum_macros::debug_handler;
 struct A;
 
 #[async_trait]
-impl<B> FromRequest<B> for A
+impl<S, B> FromRequest<S, B> for A
 where
-    B: Send + 'static,
+    B: Send,
+    S: Send,
 {
     type Rejection = ();
 
-    async fn from_request(_req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
+    async fn from_request(_req: &mut RequestParts<S, B>) -> Result<Self, Self::Rejection> {
         unimplemented!()
     }
 }

diff --git a/axum-macros/tests/from_request/pass/container.rs b/axum-macros/tests/from_request/pass/container.rs
@@ -15,7 +15,7 @@ struct Extractor {
 
 fn assert_from_request()
 where
-    Extractor: FromRequest<Body, Rejection = JsonRejection>,
+    Extractor: FromRequest<(), Body, Rejection = JsonRejection>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/derive_opt_out.rs b/axum-macros/tests/from_request/pass/derive_opt_out.rs
@@ -14,13 +14,14 @@ struct Extractor {
 struct OtherExtractor;
 
 #[async_trait]
-impl<B> FromRequest<B> for OtherExtractor
+impl<S, B> FromRequest<S, B> for OtherExtractor
 where
-    B: Send + 'static,
+    B: Send,
+    S: Send,
 {
     type Rejection = OtherExtractorRejection;
 
-    async fn from_request(_req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
+    async fn from_request(_req: &mut RequestParts<(), B>) -> Result<Self, Self::Rejection> {
         unimplemented!()
     }
 }

diff --git a/axum-macros/tests/from_request/pass/empty_named.rs b/axum-macros/tests/from_request/pass/empty_named.rs
@@ -5,7 +5,7 @@ struct Extractor {}
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body, Rejection = std::convert::Infallible>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body, Rejection = std::convert::Infallible>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/empty_tuple.rs b/axum-macros/tests/from_request/pass/empty_tuple.rs
@@ -5,7 +5,7 @@ struct Extractor();
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body, Rejection = std::convert::Infallible>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body, Rejection = std::convert::Infallible>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/named.rs b/axum-macros/tests/from_request/pass/named.rs
@@ -18,7 +18,7 @@ struct Extractor {
 
 fn assert_from_request()
 where
-    Extractor: FromRequest<Body, Rejection = ExtractorRejection>,
+    Extractor: FromRequest<(), Body, Rejection = ExtractorRejection>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/named_via.rs b/axum-macros/tests/from_request/pass/named_via.rs
@@ -25,7 +25,7 @@ struct Extractor {
 
 fn assert_from_request()
 where
-    Extractor: FromRequest<Body, Rejection = ExtractorRejection>,
+    Extractor: FromRequest<(), Body, Rejection = ExtractorRejection>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/tuple.rs b/axum-macros/tests/from_request/pass/tuple.rs
@@ -5,7 +5,7 @@ struct Extractor(axum::http::HeaderMap, String);
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/tuple_same_type_twice.rs b/axum-macros/tests/from_request/pass/tuple_same_type_twice.rs
@@ -13,7 +13,7 @@ struct Payload {}
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/tuple_same_type_twice_via.rs b/axum-macros/tests/from_request/pass/tuple_same_type_twice_via.rs
@@ -27,7 +27,7 @@ struct Payload {}
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/tuple_via.rs b/axum-macros/tests/from_request/pass/tuple_via.rs
@@ -9,7 +9,7 @@ struct State;
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body>,
 {
 }
 

diff --git a/axum-macros/tests/from_request/pass/unit.rs b/axum-macros/tests/from_request/pass/unit.rs
@@ -5,7 +5,7 @@ struct Extractor;
 
 fn assert_from_request()
 where
-    Extractor: axum::extract::FromRequest<axum::body::Body, Rejection = std::convert::Infallible>,
+    Extractor: axum::extract::FromRequest<(), axum::body::Body, Rejection = std::convert::Infallible>,
 {
 }
 

diff --git a/axum-macros/tests/typed_path/fail/not_deserialize.stderr b/axum-macros/tests/typed_path/fail/not_deserialize.stderr
@@ -15,5 +15,5 @@ error[E0277]: the trait bound `for<'de> MyPath: serde::de::Deserialize<'de>` is
             (T0, T1, T2, T3)
           and 138 others
   = note: required because of the requirements on the impl of `serde::de::DeserializeOwned` for `MyPath`
-  = note: required because of the requirements on the impl of `FromRequest<B>` for `axum::extract::Path<MyPath>`
+  = note: required because of the requirements on the impl of `FromRequest<S, B>` for `axum::extract::Path<MyPath>`
   = note: this error originates in the derive macro `TypedPath` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/axum-macros/tests/typed_path/pass/customize_rejection.rs b/axum-macros/tests/typed_path/pass/customize_rejection.rs
@@ -40,7 +40,7 @@ impl Default for MyRejection {
 }
 
 fn main() {
-    axum::Router::<axum::body::Body>::new()
+    axum::Router::<(), axum::body::Body>::new()
         .typed_get(|_: Result<MyPathNamed, MyRejection>| async {})
         .typed_post(|_: Result<MyPathUnnamed, MyRejection>| async {})
         .typed_put(|_: Result<MyPathUnit, MyRejection>| async {});

diff --git a/axum-macros/tests/typed_path/pass/named_fields_struct.rs b/axum-macros/tests/typed_path/pass/named_fields_struct.rs
@@ -9,7 +9,7 @@ struct MyPath {
 }
 
 fn main() {
-    axum::Router::<axum::body::Body>::new().route("/", axum::routing::get(|_: MyPath| async {}));
+    axum::Router::<(), axum::body::Body>::new().route("/", axum::routing::get(|_: MyPath| async {}));
 
     assert_eq!(MyPath::PATH, "/users/:user_id/teams/:team_id");
     assert_eq!(