tokio-rs · jplatte · Sep 11, 2024 · Jun 22, 2024
diff --git a/axum-macros/rust-toolchain b/axum-macros/rust-toolchain
@@ -1 +1 @@
-nightly-2024-03-13
+nightly-2024-06-22
diff --git a/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr b/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr
@@ -6,15 +6,15 @@ error[E0277]: the trait bound `bool: FromRequest<(), axum_core::extract::private
   |
   = note: Function argument is not a valid axum extractor.
           See `https://docs.rs/axum/0.7/axum/extract/index.html` for details
-  = help: the following other types implement trait `FromRequest<S, M>`:
-            axum::body::Bytes
-            Body
-            Form<T>
-            Json<T>
-            axum::http::Request<Body>
-            RawForm
-            String
-            Option<T>
+  = help: the following other types implement trait `FromRequestParts<S>`:
+            `()` implements `FromRequestParts<S>`
+            `(T1, T2)` implements `FromRequestParts<S>`
+            `(T1, T2, T3)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5, T6)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5, T6, T7)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5, T6, T7, T8)` implements `FromRequestParts<S>`
           and $N 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`

diff --git a/axum-macros/tests/debug_handler/fail/extension_not_clone.stderr b/axum-macros/tests/debug_handler/fail/extension_not_clone.stderr
@@ -5,14 +5,14 @@ error[E0277]: the trait bound `NonCloneType: Clone` is not satisfied
   |                                      ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `NonCloneType`, which is required by `Extension<NonCloneType>: FromRequest<(), _>`
   |
   = help: the following other types implement trait `FromRequest<S, M>`:
-            axum::body::Bytes
-            Body
-            Form<T>
-            Json<T>
-            axum::http::Request<Body>
-            RawForm
-            String
-            Option<T>
+            (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)
+            (T1, T2, T3, T4, T5, T6, T7, T8, T9)
           and $N others
   = note: required for `Extension<NonCloneType>` to implement `FromRequestParts<()>`
   = note: required for `Extension<NonCloneType>` to implement `FromRequest<(), axum_core::extract::private::ViaParts>`

diff --git a/axum-macros/tests/debug_handler/fail/json_not_deserialize.stderr b/axum-macros/tests/debug_handler/fail/json_not_deserialize.stderr
@@ -7,19 +7,22 @@ error[E0277]: the trait bound `for<'de> Struct: serde::de::Deserialize<'de>` is
   = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `Struct` type
   = note: for types from other crates check whether the crate offers a `serde` feature flag
   = help: the following other types implement trait `serde::de::Deserialize<'de>`:
-            bool
-            char
-            isize
-            i8
-            i16
-            i32
-            i64
-            i128
+            &'a [u8]
+            &'a serde_json::raw::RawValue
+            &'a std::path::Path
+            &'a str
+            ()
+            (T,)
+            (T0, T1)
+            (T0, T1, T2)
           and $N others
   = note: required for `Struct` to implement `serde::de::DeserializeOwned`
   = note: required for `Json<Struct>` to implement `FromRequest<()>`
   = help: see issue #48214
-  = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+  |
+1 + #![feature(trivial_bounds)]
+  |
 
 error[E0277]: the trait bound `for<'de> Struct: serde::de::Deserialize<'de>` is not satisfied
  --> tests/debug_handler/fail/json_not_deserialize.rs:7:24
@@ -30,14 +33,14 @@ error[E0277]: the trait bound `for<'de> Struct: serde::de::Deserialize<'de>` is
   = note: for local types consider adding `#[derive(serde::Deserialize)]` to your `Struct` type
   = note: for types from other crates check whether the crate offers a `serde` feature flag
   = help: the following other types implement trait `serde::de::Deserialize<'de>`:
-            bool
-            char
-            isize
-            i8
-            i16
-            i32
-            i64
-            i128
+            &'a [u8]
+            &'a serde_json::raw::RawValue
+            &'a std::path::Path
+            &'a str
+            ()
+            (T,)
+            (T0, T1)
+            (T0, T1, T2)
           and $N others
   = note: required for `Struct` to implement `serde::de::DeserializeOwned`
   = note: required for `Json<Struct>` to implement `FromRequest<()>`

diff --git a/axum-macros/tests/debug_handler/fail/single_wrong_return_tuple.stderr b/axum-macros/tests/debug_handler/fail/single_wrong_return_tuple.stderr
@@ -5,14 +5,14 @@ error[E0277]: the trait bound `NotIntoResponse: IntoResponse` is not satisfied
   |                       ^^^^^^^^^^^^^^^^^ the trait `IntoResponse` is not implemented for `NotIntoResponse`
   |
   = help: the following other types implement trait `IntoResponse`:
-            Box<str>
-            Box<[u8]>
-            axum::body::Bytes
-            Body
-            axum::extract::rejection::FailedToBufferBody
-            axum::extract::rejection::LengthLimitError
-            axum::extract::rejection::UnknownBodyError
-            axum::extract::rejection::InvalidUtf8
+            &'static [u8; N]
+            &'static [u8]
+            &'static str
+            ()
+            (R,)
+            (Response<()>, R)
+            (Response<()>, T1, R)
+            (Response<()>, T1, T2, R)
           and $N 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

diff --git a/axum-macros/tests/debug_handler/fail/wrong_return_tuple.stderr b/axum-macros/tests/debug_handler/fail/wrong_return_tuple.stderr
@@ -11,17 +11,20 @@ error[E0277]: the trait bound `CustomIntoResponse: IntoResponseParts` is not sat
    |     ^^^^^^^^^^^^^^^^^^ the trait `IntoResponseParts` is not implemented for `CustomIntoResponse`
    |
    = help: the following other types implement trait `IntoResponseParts`:
-             AppendHeaders<I>
-             HeaderMap
-             Extension<T>
-             Extensions
-             Option<T>
-             [(K, V); N]
              ()
-             (T1,)
+             (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 $N others
    = help: see issue #48214
-   = help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
+   |
+3  + #![feature(trivial_bounds)]
+   |
 
 error[E0277]: the trait bound `CustomIntoResponse: IntoResponseParts` is not satisfied
   --> tests/debug_handler/fail/wrong_return_tuple.rs:24:5
@@ -30,14 +33,14 @@ error[E0277]: the trait bound `CustomIntoResponse: IntoResponseParts` is not sat
    |     ^^^^^^^^^^^^^^^^^^ the trait `IntoResponseParts` is not implemented for `CustomIntoResponse`
    |
    = help: the following other types implement trait `IntoResponseParts`:
-             AppendHeaders<I>
-             HeaderMap
-             Extension<T>
-             Extensions
-             Option<T>
-             [(K, V); N]
              ()
-             (T1,)
+             (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 $N others
 note: required by a bound in `__axum_macros_check_custom_type_into_response_parts_1_check`
   --> tests/debug_handler/fail/wrong_return_tuple.rs:24:5

diff --git a/axum-macros/tests/debug_handler/fail/wrong_return_type.stderr b/axum-macros/tests/debug_handler/fail/wrong_return_type.stderr
@@ -5,14 +5,14 @@ error[E0277]: the trait bound `bool: IntoResponse` is not satisfied
   |                       ^^^^ the trait `IntoResponse` is not implemented for `bool`
   |
   = help: the following other types implement trait `IntoResponse`:
-            Box<str>
-            Box<[u8]>
-            axum::body::Bytes
-            Body
-            axum::extract::rejection::FailedToBufferBody
-            axum::extract::rejection::LengthLimitError
-            axum::extract::rejection::UnknownBodyError
-            axum::extract::rejection::InvalidUtf8
+            &'static [u8; N]
+            &'static [u8]
+            &'static str
+            ()
+            (R,)
+            (Response<()>, R)
+            (Response<()>, T1, R)
+            (Response<()>, T1, T2, R)
           and $N 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

diff --git a/axum-macros/tests/from_request/fail/generic_without_via.stderr b/axum-macros/tests/from_request/fail/generic_without_via.stderr
@@ -14,8 +14,8 @@ error[E0277]: the trait bound `fn(Extractor<()>) -> impl Future<Output = ()> {fo
    |
    = 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>>
+             `Layered<L, H, T, S>` implements `Handler<T, S>`
+             `MethodRouter<S>` implements `Handler<(), S>`
 note: required by a bound in `axum::routing::get`
   --> $WORKSPACE/axum/src/routing/method_routing.rs
    |

diff --git a/axum-macros/tests/from_request/fail/generic_without_via_rejection.stderr b/axum-macros/tests/from_request/fail/generic_without_via_rejection.stderr
@@ -14,8 +14,8 @@ error[E0277]: the trait bound `fn(Extractor<()>) -> impl Future<Output = ()> {fo
    |
    = 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>>
+             `Layered<L, H, T, S>` implements `Handler<T, S>`
+             `MethodRouter<S>` implements `Handler<(), S>`
 note: required by a bound in `axum::routing::get`
   --> $WORKSPACE/axum/src/routing/method_routing.rs
    |

diff --git a/axum-macros/tests/from_request/fail/override_rejection_on_enum_without_via.stderr b/axum-macros/tests/from_request/fail/override_rejection_on_enum_without_via.stderr
@@ -14,8 +14,8 @@ error[E0277]: the trait bound `fn(MyExtractor) -> impl Future<Output = ()> {hand
    |
    = 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>>
+             `Layered<L, H, T, S>` implements `Handler<T, S>`
+             `MethodRouter<S>` implements `Handler<(), S>`
 note: required by a bound in `axum::routing::get`
   --> $WORKSPACE/axum/src/routing/method_routing.rs
    |
@@ -36,8 +36,8 @@ error[E0277]: the trait bound `fn(Result<MyExtractor, MyRejection>) -> impl Futu
    |
    = 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>>
+             `Layered<L, H, T, S>` implements `Handler<T, S>`
+             `MethodRouter<S>` implements `Handler<(), S>`
 note: required by a bound in `MethodRouter::<S>::post`
   --> $WORKSPACE/axum/src/routing/method_routing.rs
    |

diff --git a/axum-macros/tests/from_request/fail/parts_extracting_body.stderr b/axum-macros/tests/from_request/fail/parts_extracting_body.stderr
@@ -7,12 +7,12 @@ error[E0277]: the trait bound `String: FromRequestParts<S>` is not satisfied
   = note: Function argument is not a valid axum extractor.
           See `https://docs.rs/axum/0.7/axum/extract/index.html` for details
   = help: the following other types implement trait `FromRequestParts<S>`:
-            <Extractor as FromRequestParts<S>>
-            <HeaderMap as FromRequestParts<S>>
-            <Extension<T> as FromRequestParts<S>>
-            <Method as FromRequestParts<S>>
-            <axum::http::request::Parts as FromRequestParts<S>>
-            <Uri as FromRequestParts<S>>
-            <Version as FromRequestParts<S>>
-            <Extensions as FromRequestParts<S>>
+            `()` implements `FromRequestParts<S>`
+            `(T1, T2)` implements `FromRequestParts<S>`
+            `(T1, T2, T3)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5, T6)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5, T6, T7)` implements `FromRequestParts<S>`
+            `(T1, T2, T3, T4, T5, T6, T7, T8)` implements `FromRequestParts<S>`
           and $N others
diff --git a/axum-macros/tests/typed_path/fail/not_deserialize.stderr b/axum-macros/tests/typed_path/fail/not_deserialize.stderr
@@ -4,7 +4,16 @@ error[E0277]: the trait bound `MyPath: serde::de::DeserializeOwned` is not satis
 3 | #[derive(TypedPath)]
   |          ^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `MyPath`, which is required by `axum::extract::Path<MyPath>: FromRequestParts<S>`
   |
-  = help: the trait `FromRequestParts<S>` is implemented for `axum::extract::Path<T>`
+  = help: the following other types implement trait `serde::de::Deserialize<'de>`:
+            &'a [u8]
+            &'a serde_json::raw::RawValue
+            &'a std::path::Path
+            &'a str
+            ()
+            (T,)
+            (T0, T1)
+            (T0, T1, T2)
+          and $N 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)
@@ -15,7 +24,16 @@ error[E0277]: the trait bound `MyPath: serde::de::DeserializeOwned` is not satis
 3 | #[derive(TypedPath)]
   |          ^^^^^^^^^ the trait `for<'de> serde::de::Deserialize<'de>` is not implemented for `MyPath`, which is required by `axum::extract::Path<MyPath>: FromRequestParts<S>`
   |
-  = help: the trait `FromRequestParts<S>` is implemented for `axum::extract::Path<T>`
+  = help: the following other types implement trait `serde::de::Deserialize<'de>`:
+            &'a [u8]
+            &'a serde_json::raw::RawValue
+            &'a std::path::Path
+            &'a str
+            ()
+            (T,)
+            (T0, T1)
+            (T0, T1, T2)
+          and $N 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 attribute macro `::axum::async_trait` (in Nightly builds, run with -Z macro-backtrace for more info)