Fix nightly tests?

axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr

@@ -15,7 +15,7 @@ error[E0277]: the trait bound `bool: FromRequestParts<()>` is not satisfied
             <Version as FromRequestParts<S>>
             <Extensions as FromRequestParts<S>>
             <ConnectInfo<T> as FromRequestParts<S>>
-          and $N others
+          and 28 others
   = note: required for `bool` to implement `FromRequest<(), axum_core::extract::private::ViaParts>`
 note: required by a bound in `__axum_macros_check_handler_0_from_request_check`
  --> tests/debug_handler/fail/argument_not_extractor.rs:5:24

axum-macros/tests/debug_handler/fail/json_not_deserialize.stderr

@@ -13,7 +13,7 @@ error[E0277]: the trait bound `for<'de> Struct: serde::de::Deserialize<'de>` is
             i32
             i64
             i128
-          and $N others
+          and 131 others
   = note: required for `Struct` to implement `serde::de::DeserializeOwned`
   = note: required for `Json<Struct>` to implement `FromRequest<()>`
   = help: see issue #48214

axum-macros/tests/debug_handler/fail/single_wrong_return_tuple.stderr

@@ -10,10 +10,10 @@ error[E0277]: the trait bound `NotIntoResponse: IntoResponse` is not satisfied
             axum::body::Bytes
             Body
             axum::extract::rejection::FailedToBufferBody
+            bytes::bytes_mut::BytesMut
             axum::extract::rejection::LengthLimitError
             axum::extract::rejection::UnknownBodyError
-            bytes::bytes_mut::BytesMut
-          and $N others
+          and 121 others
 note: required by a bound in `__axum_macros_check_handler_into_response::{closure#0}::check`
  --> tests/debug_handler/fail/single_wrong_return_tuple.rs:6:23
   |

axum-macros/tests/debug_handler/fail/wrong_return_tuple.stderr

@@ -19,6 +19,6 @@ error[E0277]: the trait bound `CustomIntoResponse: IntoResponseParts` is not sat
              [(K, V); N]
              ()
              (T1,)
-           and $N others
+           and 15 others
    = help: see issue #48214
    = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable

axum-macros/tests/debug_handler/fail/wrong_return_type.stderr

@@ -10,10 +10,10 @@ error[E0277]: the trait bound `bool: IntoResponse` is not satisfied
             axum::body::Bytes
             Body
             axum::extract::rejection::FailedToBufferBody
+            bytes::bytes_mut::BytesMut
             axum::extract::rejection::LengthLimitError
             axum::extract::rejection::UnknownBodyError
-            bytes::bytes_mut::BytesMut
-          and $N others
+          and 121 others
 note: required by a bound in `__axum_macros_check_handler_into_response::{closure#0}::check`
  --> tests/debug_handler/fail/wrong_return_type.rs:4:23
   |

axum-macros/tests/from_request/fail/generic_without_via.stderr

@@ -5,23 +5,23 @@ error: #[derive(FromRequest)] only supports generics when used with #[from_reque
   |                  ^
 
 error[E0277]: the trait bound `fn(Extractor<()>) -> impl Future<Output = ()> {foo}: Handler<_, _>` is not satisfied
-  --> tests/from_request/fail/generic_without_via.rs:11:44
-   |
-11 |     _ = Router::<()>::new().route("/", get(foo));
-   |                                        --- ^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(Extractor<()>) -> impl Future<Output = ()> {foo}`
-   |                                        |
-   |                                        required by a bound introduced by this call
-   |
-   = note: Consider using `#[axum::debug_handler]` to improve the error message
-   = help: the following other types implement trait `Handler<T, S>`:
-             <Layered<L, H, T, S> as Handler<T, S>>
-             <MethodRouter<S> as Handler<(), S>>
+   --> tests/from_request/fail/generic_without_via.rs:11:44
+    |
+11  |     _ = Router::<()>::new().route("/", get(foo));
+    |                                        --- ^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(Extractor<()>) -> impl Future<Output = ()> {foo}`
+    |                                        |
+    |                                        required by a bound introduced by this call
+    |
+    = note: Consider using `#[axum::debug_handler]` to improve the error message
+    = help: the following other types implement trait `Handler<T, S>`:
+              <Layered<L, H, T, S> as Handler<T, S>>
+              <MethodRouter<S> as Handler<(), S>>
 note: required by a bound in `axum::routing::get`
-  --> $WORKSPACE/axum/src/routing/method_routing.rs
-   |
-   | top_level_handler_fn!(get, GET);
-   | ^^^^^^^^^^^^^^^^^^^^^^---^^^^^^
-   | |                     |
-   | |                     required by a bound in this function
-   | required by this bound in `get`
-   = note: this error originates in the macro `top_level_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
+   --> $WORKSPACE/axum/src/routing/method_routing.rs
+    |
+    | top_level_handler_fn!(get, GET);
+    | ^^^^^^^^^^^^^^^^^^^^^^---^^^^^^
+    | |                     |
+    | |                     required by a bound in this function
+    | required by this bound in `get`
+    = note: this error originates in the macro `top_level_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)

axum-macros/tests/from_request/fail/generic_without_via_rejection.stderr

@@ -5,23 +5,23 @@ error: #[derive(FromRequest)] only supports generics when used with #[from_reque
   |                  ^
 
 error[E0277]: the trait bound `fn(Extractor<()>) -> impl Future<Output = ()> {foo}: Handler<_, _>` is not satisfied
-  --> tests/from_request/fail/generic_without_via_rejection.rs:12:44
-   |
-12 |     _ = Router::<()>::new().route("/", get(foo));
-   |                                        --- ^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(Extractor<()>) -> impl Future<Output = ()> {foo}`
-   |                                        |
-   |                                        required by a bound introduced by this call
-   |
-   = note: Consider using `#[axum::debug_handler]` to improve the error message
-   = help: the following other types implement trait `Handler<T, S>`:
-             <Layered<L, H, T, S> as Handler<T, S>>
-             <MethodRouter<S> as Handler<(), S>>
+   --> tests/from_request/fail/generic_without_via_rejection.rs:12:44
+    |
+12  |     _ = Router::<()>::new().route("/", get(foo));
+    |                                        --- ^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(Extractor<()>) -> impl Future<Output = ()> {foo}`
+    |                                        |
+    |                                        required by a bound introduced by this call
+    |
+    = note: Consider using `#[axum::debug_handler]` to improve the error message
+    = help: the following other types implement trait `Handler<T, S>`:
+              <Layered<L, H, T, S> as Handler<T, S>>
+              <MethodRouter<S> as Handler<(), S>>
 note: required by a bound in `axum::routing::get`
-  --> $WORKSPACE/axum/src/routing/method_routing.rs
-   |
-   | top_level_handler_fn!(get, GET);
-   | ^^^^^^^^^^^^^^^^^^^^^^---^^^^^^
-   | |                     |
-   | |                     required by a bound in this function
-   | required by this bound in `get`
-   = note: this error originates in the macro `top_level_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
+   --> $WORKSPACE/axum/src/routing/method_routing.rs
+    |
+    | top_level_handler_fn!(get, GET);
+    | ^^^^^^^^^^^^^^^^^^^^^^---^^^^^^
+    | |                     |
+    | |                     required by a bound in this function
+    | required by this bound in `get`
+    = note: this error originates in the macro `top_level_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)

axum-macros/tests/from_request/fail/override_rejection_on_enum_without_via.stderr

@@ -5,45 +5,45 @@ error: cannot use `rejection` without `via`
    |                ^^^^^^^^^
 
 error[E0277]: the trait bound `fn(MyExtractor) -> impl Future<Output = ()> {handler}: Handler<_, _>` is not satisfied
-  --> tests/from_request/fail/override_rejection_on_enum_without_via.rs:11:50
-   |
-11 |     let _: Router = Router::new().route("/", get(handler).post(handler_result));
-   |                                              --- ^^^^^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(MyExtractor) -> impl Future<Output = ()> {handler}`
-   |                                              |
-   |                                              required by a bound introduced by this call
-   |
-   = note: Consider using `#[axum::debug_handler]` to improve the error message
-   = help: the following other types implement trait `Handler<T, S>`:
-             <Layered<L, H, T, S> as Handler<T, S>>
-             <MethodRouter<S> as Handler<(), S>>
+   --> tests/from_request/fail/override_rejection_on_enum_without_via.rs:11:50
+    |
+11  |     let _: Router = Router::new().route("/", get(handler).post(handler_result));
+    |                                              --- ^^^^^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(MyExtractor) -> impl Future<Output = ()> {handler}`
+    |                                              |
+    |                                              required by a bound introduced by this call
+    |
+    = note: Consider using `#[axum::debug_handler]` to improve the error message
+    = help: the following other types implement trait `Handler<T, S>`:
+              <Layered<L, H, T, S> as Handler<T, S>>
+              <MethodRouter<S> as Handler<(), S>>
 note: required by a bound in `axum::routing::get`
-  --> $WORKSPACE/axum/src/routing/method_routing.rs
-   |
-   | top_level_handler_fn!(get, GET);
-   | ^^^^^^^^^^^^^^^^^^^^^^---^^^^^^
-   | |                     |
-   | |                     required by a bound in this function
-   | required by this bound in `get`
-   = note: this error originates in the macro `top_level_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
+   --> $WORKSPACE/axum/src/routing/method_routing.rs
+    |
+    | top_level_handler_fn!(get, GET);
+    | ^^^^^^^^^^^^^^^^^^^^^^---^^^^^^
+    | |                     |
+    | |                     required by a bound in this function
+    | required by this bound in `get`
+    = note: this error originates in the macro `top_level_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `fn(Result<MyExtractor, MyRejection>) -> impl Future<Output = ()> {handler_result}: Handler<_, _>` is not satisfied
-  --> tests/from_request/fail/override_rejection_on_enum_without_via.rs:11:64
-   |
-11 |     let _: Router = Router::new().route("/", get(handler).post(handler_result));
-   |                                                           ---- ^^^^^^^^^^^^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(Result<MyExtractor, MyRejection>) -> impl Future<Output = ()> {handler_result}`
-   |                                                           |
-   |                                                           required by a bound introduced by this call
-   |
-   = note: Consider using `#[axum::debug_handler]` to improve the error message
-   = help: the following other types implement trait `Handler<T, S>`:
-             <Layered<L, H, T, S> as Handler<T, S>>
-             <MethodRouter<S> as Handler<(), S>>
+   --> tests/from_request/fail/override_rejection_on_enum_without_via.rs:11:64
+    |
+11  |     let _: Router = Router::new().route("/", get(handler).post(handler_result));
+    |                                                           ---- ^^^^^^^^^^^^^^ the trait `Handler<_, _>` is not implemented for fn item `fn(Result<MyExtractor, MyRejection>) -> impl Future<Output = ()> {handler_result}`
+    |                                                           |
+    |                                                           required by a bound introduced by this call
+    |
+    = note: Consider using `#[axum::debug_handler]` to improve the error message
+    = help: the following other types implement trait `Handler<T, S>`:
+              <Layered<L, H, T, S> as Handler<T, S>>
+              <MethodRouter<S> as Handler<(), S>>
 note: required by a bound in `MethodRouter::<S>::post`
-  --> $WORKSPACE/axum/src/routing/method_routing.rs
-   |
-   |     chained_handler_fn!(post, POST);
-   |     ^^^^^^^^^^^^^^^^^^^^----^^^^^^^
-   |     |                   |
-   |     |                   required by a bound in this associated function
-   |     required by this bound in `MethodRouter::<S>::post`
-   = note: this error originates in the macro `chained_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
+   --> $WORKSPACE/axum/src/routing/method_routing.rs
+    |
+    |     chained_handler_fn!(post, POST);
+    |     ^^^^^^^^^^^^^^^^^^^^----^^^^^^^
+    |     |                   |
+    |     |                   required by a bound in this associated function
+    |     required by this bound in `MethodRouter::<S>::post`
+    = note: this error originates in the macro `chained_handler_fn` (in Nightly builds, run with -Z macro-backtrace for more info)

axum-macros/tests/from_request/fail/parts_extracting_body.stderr

@@ -15,4 +15,4 @@ error[E0277]: the trait bound `String: FromRequestParts<S>` is not satisfied
             <Uri as FromRequestParts<S>>
             <Version as FromRequestParts<S>>
             <Extensions as FromRequestParts<S>>
-          and $N others
+          and 29 others

axum-macros/tests/typed_path/fail/not_deserialize.stderr

@@ -13,7 +13,27 @@ error[E0277]: the trait bound `for<'de> MyPath: serde::de::Deserialize<'de>` is
             i32
             i64
             i128
-          and $N others
+          and 131 others
+  = note: required for `MyPath` to implement `serde::de::DeserializeOwned`
+  = note: required for `axum::extract::Path<MyPath>` to implement `FromRequestParts<S>`
+  = note: this error originates in the derive macro `TypedPath` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `for<'de> MyPath: serde::de::Deserialize<'de>` is not satisfied
+ --> tests/typed_path/fail/not_deserialize.rs:3:10
+  |
+3 | #[derive(TypedPath)]
+  |          ^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `MyPath`
+  |
+  = help: the following other types implement trait `serde::de::Deserialize<'de>`:
+            bool
+            char
+            isize
+            i8
+            i16
+            i32
+            i64
+            i128
+          and 131 others
   = note: required for `MyPath` to implement `serde::de::DeserializeOwned`
   = note: required for `axum::extract::Path<MyPath>` to implement `FromRequestParts<S>`
   = note: this error originates in the derive macro `TypedPath` (in Nightly builds, run with -Z macro-backtrace for more info)

axum-macros/tests/typed_path/pass/option_result.rs

@@ -1,5 +1,5 @@
-use axum_extra::routing::{TypedPath, RouterExt};
 use axum::{extract::rejection::PathRejection, http::StatusCode};
+use axum_extra::routing::{RouterExt, TypedPath};
 use serde::Deserialize;
 
 #[derive(TypedPath, Deserialize)]
@@ -8,8 +8,6 @@ struct UsersShow {
     id: String,
 }
 
-async fn option_handler(_: Option<UsersShow>) {}
-
 async fn result_handler(_: Result<UsersShow, PathRejection>) {}
 
 #[derive(TypedPath, Deserialize)]
@@ -20,7 +18,6 @@ async fn result_handler_unit_struct(_: Result<UsersIndex, StatusCode>) {}
 
 fn main() {
     _ = axum::Router::<()>::new()
-        .typed_get(option_handler)
         .typed_post(result_handler)
         .typed_post(result_handler_unit_struct);
 }