Update UI test expected results.

contrib/sync_db_pools/codegen/tests/ui-fail-stable/database-syntax.stderr

@@ -31,7 +31,7 @@ error: `database` attribute can only be used on structs
    | ^^^^
 
 error: `database` attribute can only be applied to structs with exactly one unnamed field
-         --- help: example: `struct MyDatabase(diesel::SqliteConnection);`
+       = help: example: `struct MyDatabase(diesel::SqliteConnection);`
   --> tests/ui-fail-stable/database-syntax.rs:43:11
    |
 43 | struct Bar(Connection, Connection);

core/codegen/tests/ui-fail-nightly/async-entry.stderr

@@ -113,6 +113,14 @@ error[E0728]: `await` is only allowed inside `async` functions and blocks
 73 |         let _ = rocket::build().launch().await;
    |                                          ^^^^^ only allowed inside `async` functions and blocks
 
+error[E0277]: `main` has invalid return type `Rocket<Build>`
+  --> tests/ui-fail-nightly/async-entry.rs:94:20
+   |
+94 | async fn main() -> rocket::Rocket<rocket::Build> {
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `main` can only return types that implement `Termination`
+   |
+   = help: consider using `()`, or a `Result`
+
 error[E0308]: mismatched types
   --> tests/ui-fail-nightly/async-entry.rs:35:9
    |
@@ -171,11 +179,3 @@ error[E0308]: mismatched types
    |
    = note: expected struct `Rocket<Build>`
               found struct `std::string::String`
-
-error[E0277]: `main` has invalid return type `Rocket<Build>`
-  --> tests/ui-fail-nightly/async-entry.rs:94:20
-   |
-94 | async fn main() -> rocket::Rocket<rocket::Build> {
-   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `main` can only return types that implement `Termination`
-   |
-   = help: consider using `()`, or a `Result`

core/codegen/tests/ui-fail-nightly/catch_type_errors.stderr

@@ -7,14 +7,14 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
   |                              ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
   |
   = help: the following other types implement trait `Responder<'r, 'o>`:
-            <&'o [u8] as Responder<'r, 'o>>
+            <rocket::Either<T, E> as Responder<'r, 'o>>
-            <&'o str as Responder<'r, 'o>>
+            <Box<str> as Responder<'r, 'static>>
-            <() as Responder<'r, 'static>>
+            <Box<[u8]> as Responder<'r, 'static>>
-            <(ContentType, R) as Responder<'r, 'o>>
+            <Box<T> as Responder<'r, 'o>>
-            <(Status, R) as Responder<'r, 'o>>
+            <Cow<'o, R> as Responder<'r, 'o>>
-            <Accepted<R> as Responder<'r, 'o>>
+            <rocket::tokio::fs::File as Responder<'r, 'static>>
-            <Arc<[u8]> as Responder<'r, 'static>>
+            <EventStream<S> as Responder<'r, 'r>>
-            <Arc<str> as Responder<'r, 'static>>
+            <std::fs::File as Responder<'r, 'static>>
           and $N others
 
 error[E0277]: the trait bound `bool: Responder<'_, '_>` is not satisfied
@@ -26,14 +26,14 @@ error[E0277]: the trait bound `bool: Responder<'_, '_>` is not satisfied
    |                              ^^^^ the trait `Responder<'_, '_>` is not implemented for `bool`
    |
    = help: the following other types implement trait `Responder<'r, 'o>`:
-             <&'o [u8] as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
-             <&'o str as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
-             <() as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
+             <Box<T> as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
+             <Cow<'o, R> as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
+             <rocket::tokio::fs::File as Responder<'r, 'static>>
-             <Arc<[u8]> as Responder<'r, 'static>>
+             <EventStream<S> as Responder<'r, 'r>>
-             <Arc<str> as Responder<'r, 'static>>
+             <std::fs::File as Responder<'r, 'static>>
            and $N others
 
 error[E0308]: mismatched types
@@ -59,14 +59,14 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
    |                          ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
    |
    = help: the following other types implement trait `Responder<'r, 'o>`:
-             <&'o [u8] as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
-             <&'o str as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
-             <() as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
+             <Box<T> as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
+             <Cow<'o, R> as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
+             <rocket::tokio::fs::File as Responder<'r, 'static>>
-             <Arc<[u8]> as Responder<'r, 'static>>
+             <EventStream<S> as Responder<'r, 'r>>
-             <Arc<str> as Responder<'r, 'static>>
+             <std::fs::File as Responder<'r, 'static>>
            and $N others
 
 error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
@@ -78,12 +78,12 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
    |            ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
    |
    = help: the following other types implement trait `Responder<'r, 'o>`:
-             <&'o [u8] as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
-             <&'o str as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
-             <() as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
+             <Box<T> as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
+             <Cow<'o, R> as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
+             <rocket::tokio::fs::File as Responder<'r, 'static>>
-             <Arc<[u8]> as Responder<'r, 'static>>
+             <EventStream<S> as Responder<'r, 'r>>
-             <Arc<str> as Responder<'r, 'static>>
+             <std::fs::File as Responder<'r, 'static>>
            and $N others

core/codegen/tests/ui-fail-nightly/from_form_type_errors.stderr

@@ -5,14 +5,14 @@ error[E0277]: the trait bound `Unknown: FromFormField<'_>` is not satisfied
   |            ^^^^^^^ the trait `FromFormField<'_>` is not implemented for `Unknown`
   |
   = help: the following other types implement trait `FromFormField<'v>`:
-            &'v [u8]
+            bool
-            &'v str
+            isize
-            Capped<&'v [u8]>
+            i8
-            Capped<&'v str>
+            i16
-            Capped<Cow<'v, str>>
+            i32
-            Capped<TempFile<'v>>
+            i64
-            Capped<std::string::String>
+            i128
-            Cow<'v, str>
+            usize
           and $N others
   = note: required for `Unknown` to implement `FromForm<'r>`
 
@@ -23,13 +23,13 @@ error[E0277]: the trait bound `Foo<usize>: FromFormField<'_>` is not satisfied
    |            ^^^^^^^^^^ the trait `FromFormField<'_>` is not implemented for `Foo<usize>`
    |
    = help: the following other types implement trait `FromFormField<'v>`:
-             &'v [u8]
+             bool
-             &'v str
+             isize
-             Capped<&'v [u8]>
+             i8
-             Capped<&'v str>
+             i16
-             Capped<Cow<'v, str>>
+             i32
-             Capped<TempFile<'v>>
+             i64
-             Capped<std::string::String>
+             i128
-             Cow<'v, str>
+             usize
            and $N others
    = note: required for `Foo<usize>` to implement `FromForm<'r>`

core/codegen/tests/ui-fail-nightly/responder-types.stderr

@@ -5,14 +5,14 @@ error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
   |     ^^^^^^^^^ the trait `Responder<'_, '_>` is not implemented for `u8`
   |
   = help: the following other types implement trait `Responder<'r, 'o>`:
-            <&'o [u8] as Responder<'r, 'o>>
+            <Thing1 as Responder<'r, 'o>>
-            <&'o str as Responder<'r, 'o>>
+            <Thing2 as Responder<'r, 'o>>
-            <() as Responder<'r, 'static>>
+            <Thing3 as Responder<'r, 'o>>
-            <(ContentType, R) as Responder<'r, 'o>>
+            <Thing4 as Responder<'r, 'o>>
-            <(Status, R) as Responder<'r, 'o>>
+            <rocket::Either<T, E> as Responder<'r, 'o>>
-            <Accepted<R> as Responder<'r, 'o>>
+            <Box<str> as Responder<'r, 'static>>
-            <Arc<[u8]> as Responder<'r, 'static>>
+            <Box<[u8]> as Responder<'r, 'static>>
-            <Arc<str> as Responder<'r, 'static>>
+            <Box<T> as Responder<'r, 'o>>
           and $N others
 
 error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
@@ -22,14 +22,14 @@ error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
    |     ^^^^^^^^^ the trait `From<u8>` is not implemented for `Header<'_>`
    |
    = help: the following other types implement trait `From<T>`:
+             <Header<'static> as From<Cookie<'_>>>
+             <Header<'static> as From<ContentType>>
+             <Header<'static> as From<rocket::http::Accept>>
              <Header<'static> as From<&Cookie<'_>>>
-             <Header<'static> as From<&ExpectCt>>
-             <Header<'static> as From<&Frame>>
-             <Header<'static> as From<&Hsts>>
-             <Header<'static> as From<&NoSniff>>
-             <Header<'static> as From<&Permission>>
-             <Header<'static> as From<&Prefetch>>
              <Header<'static> as From<&Referrer>>
+             <Header<'static> as From<&ExpectCt>>
+             <Header<'static> as From<&NoSniff>>
+             <Header<'static> as From<&Hsts>>
            and $N others
    = note: required for `u8` to implement `Into<Header<'_>>`
 note: required by a bound in `rocket::Response::<'r>::set_header`
@@ -45,14 +45,14 @@ error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
    |     ^^^^^^^^^ the trait `Responder<'_, '_>` is not implemented for `u8`
    |
    = help: the following other types implement trait `Responder<'r, 'o>`:
-             <&'o [u8] as Responder<'r, 'o>>
+             <Thing1 as Responder<'r, 'o>>
-             <&'o str as Responder<'r, 'o>>
+             <Thing2 as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
+             <Thing3 as Responder<'r, 'o>>
-             <(ContentType, R) as Responder<'r, 'o>>
+             <Thing4 as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
-             <Arc<[u8]> as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <Box<T> as Responder<'r, 'o>>
            and $N others
 
 error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
@@ -62,14 +62,14 @@ error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
    |     ^^^^^^^^^ the trait `From<u8>` is not implemented for `Header<'_>`
    |
    = help: the following other types implement trait `From<T>`:
+             <Header<'static> as From<Cookie<'_>>>
+             <Header<'static> as From<ContentType>>
+             <Header<'static> as From<rocket::http::Accept>>
              <Header<'static> as From<&Cookie<'_>>>
-             <Header<'static> as From<&ExpectCt>>
-             <Header<'static> as From<&Frame>>
-             <Header<'static> as From<&Hsts>>
-             <Header<'static> as From<&NoSniff>>
-             <Header<'static> as From<&Permission>>
-             <Header<'static> as From<&Prefetch>>
              <Header<'static> as From<&Referrer>>
+             <Header<'static> as From<&ExpectCt>>
+             <Header<'static> as From<&NoSniff>>
+             <Header<'static> as From<&Hsts>>
            and $N others
    = note: required for `u8` to implement `Into<Header<'_>>`
 note: required by a bound in `rocket::Response::<'r>::set_header`
@@ -85,14 +85,14 @@ error[E0277]: the trait bound `Header<'_>: From<std::string::String>` is not sat
    |     ^^^^^^^^^^^^ the trait `From<std::string::String>` is not implemented for `Header<'_>`
    |
    = help: the following other types implement trait `From<T>`:
+             <Header<'static> as From<Cookie<'_>>>
+             <Header<'static> as From<ContentType>>
+             <Header<'static> as From<rocket::http::Accept>>
              <Header<'static> as From<&Cookie<'_>>>
-             <Header<'static> as From<&ExpectCt>>
-             <Header<'static> as From<&Frame>>
-             <Header<'static> as From<&Hsts>>
-             <Header<'static> as From<&NoSniff>>
-             <Header<'static> as From<&Permission>>
-             <Header<'static> as From<&Prefetch>>
              <Header<'static> as From<&Referrer>>
+             <Header<'static> as From<&ExpectCt>>
+             <Header<'static> as From<&NoSniff>>
+             <Header<'static> as From<&Hsts>>
            and $N others
    = note: required for `std::string::String` to implement `Into<Header<'_>>`
 note: required by a bound in `rocket::Response::<'r>::set_header`
@@ -108,14 +108,14 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
    |             ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
    |
    = help: the following other types implement trait `Responder<'r, 'o>`:
-             <&'o [u8] as Responder<'r, 'o>>
+             <Thing1 as Responder<'r, 'o>>
-             <&'o str as Responder<'r, 'o>>
+             <Thing2 as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
+             <Thing3 as Responder<'r, 'o>>
-             <(ContentType, R) as Responder<'r, 'o>>
+             <Thing4 as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
-             <Arc<[u8]> as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <Box<T> as Responder<'r, 'o>>
            and $N others
 note: required by a bound in `route::handler::<impl Outcome<rocket::Response<'o>, Status, (rocket::Data<'o>, Status)>>::from`
   --> $WORKSPACE/core/lib/src/route/handler.rs

core/codegen/tests/ui-fail-nightly/route-type-errors.stderr

@@ -5,14 +5,14 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   |            ^ the trait `FromParam<'_>` is not implemented for `Q`
   |
   = help: the following other types implement trait `FromParam<'a>`:
-            &'a str
+            bool
-            IpAddr
+            isize
-            Ipv4Addr
+            i8
-            Ipv6Addr
+            i16
-            NonZeroI128
+            i32
-            NonZeroI16
+            i64
-            NonZeroI32
+            i128
-            NonZeroI64
+            usize
           and $N others
 
 error[E0277]: the trait bound `Q: FromSegments<'_>` is not satisfied
@@ -22,10 +22,10 @@ error[E0277]: the trait bound `Q: FromSegments<'_>` is not satisfied
   |            ^ the trait `FromSegments<'_>` is not implemented for `Q`
   |
   = help: the following other types implement trait `FromSegments<'r>`:
-            <PathBuf as FromSegments<'_>>
-            <Result<T, <T as FromSegments<'r>>::Error> as FromSegments<'r>>
             <Segments<'r, rocket::http::uri::fmt::Path> as FromSegments<'r>>
+            <PathBuf as FromSegments<'_>>
             <std::option::Option<T> as FromSegments<'r>>
+            <Result<T, <T as FromSegments<'r>>::Error> as FromSegments<'r>>
 
 error[E0277]: the trait bound `Q: FromFormField<'_>` is not satisfied
   --> tests/ui-fail-nightly/route-type-errors.rs:12:12
@@ -34,14 +34,14 @@ error[E0277]: the trait bound `Q: FromFormField<'_>` is not satisfied
    |            ^ the trait `FromFormField<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromFormField<'v>`:
-             &'v [u8]
+             bool
-             &'v str
+             isize
-             Capped<&'v [u8]>
+             i8
-             Capped<&'v str>
+             i16
-             Capped<Cow<'v, str>>
+             i32
-             Capped<TempFile<'v>>
+             i64
-             Capped<std::string::String>
+             i128
-             Cow<'v, str>
+             usize
            and $N others
    = note: required for `Q` to implement `FromForm<'_>`
 
@@ -52,14 +52,14 @@ error[E0277]: the trait bound `Q: FromFormField<'_>` is not satisfied
    |            ^ the trait `FromFormField<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromFormField<'v>`:
-             &'v [u8]
+             bool
-             &'v str
+             isize
-             Capped<&'v [u8]>
+             i8
-             Capped<&'v str>
+             i16
-             Capped<Cow<'v, str>>
+             i32
-             Capped<TempFile<'v>>
+             i64
-             Capped<std::string::String>
+             i128
-             Cow<'v, str>
+             usize
            and $N others
    = note: required for `Q` to implement `FromForm<'_>`
 
@@ -70,14 +70,14 @@ error[E0277]: the trait bound `Q: FromData<'_>` is not satisfied
    |            ^ the trait `FromData<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromData<'r>`:
-             &'r RawStr
+             rocket::Data<'r>
-             &'r [u8]
+             Cow<'_, str>
-             &'r str
-             Capped<&'r RawStr>
-             Capped<&'r [u8]>
-             Capped<&'r str>
              Capped<Cow<'_, str>>
+             Capped<Vec<u8>>
              Capped<TempFile<'_>>
+             Capped<std::string::String>
+             Capped<&'r str>
+             Capped<&'r RawStr>
            and $N others
 
 error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
@@ -87,14 +87,14 @@ error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
    |          ^ the trait `FromRequest<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromRequest<'r>`:
-             &'r ContentType
+             rocket::http::Method
-             &'r Host<'r>
+             Outcome<T, (Status, <T as FromRequest<'r>>::Error), Status>
-             &'r Limits
+             Flash<&'r rocket::http::CookieJar<'r>>
-             &'r Route
+             rocket::Shutdown
-             &'r rocket::Config
+             IpAddr
-             &'r rocket::State<T>
+             std::net::SocketAddr
-             &'r rocket::http::Accept
+             std::option::Option<T>
-             &'r rocket::http::CookieJar<'r>
+             Result<T, <T as FromRequest<'r>>::Error>
            and $N others
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
@@ -104,14 +104,14 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
    |                  ^ the trait `FromParam<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromParam<'a>`:
-             &'a str
+             bool
-             IpAddr
+             isize
-             Ipv4Addr
+             i8
-             Ipv6Addr
+             i16
-             NonZeroI128
+             i32
-             NonZeroI16
+             i64
-             NonZeroI32
+             i128
-             NonZeroI64
+             usize
            and $N others
 
 error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
@@ -121,14 +121,14 @@ error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
    |          ^ the trait `FromRequest<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromRequest<'r>`:
-             &'r ContentType
+             rocket::http::Method
-             &'r Host<'r>
+             Outcome<T, (Status, <T as FromRequest<'r>>::Error), Status>
-             &'r Limits
+             Flash<&'r rocket::http::CookieJar<'r>>
-             &'r Route
+             rocket::Shutdown
-             &'r rocket::Config
+             IpAddr
-             &'r rocket::State<T>
+             std::net::SocketAddr
-             &'r rocket::http::Accept
+             std::option::Option<T>
-             &'r rocket::http::CookieJar<'r>
+             Result<T, <T as FromRequest<'r>>::Error>
            and $N others
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
@@ -138,14 +138,14 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
    |                  ^ the trait `FromParam<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromParam<'a>`:
-             &'a str
+             bool
-             IpAddr
+             isize
-             Ipv4Addr
+             i8
-             Ipv6Addr
+             i16
-             NonZeroI128
+             i32
-             NonZeroI16
+             i64
-             NonZeroI32
+             i128
-             NonZeroI64
+             usize
            and $N others
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
@@ -155,12 +155,12 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
    |                                       ^ the trait `FromParam<'_>` is not implemented for `Q`
    |
    = help: the following other types implement trait `FromParam<'a>`:
-             &'a str
+             bool
-             IpAddr
+             isize
-             Ipv4Addr
+             i8
-             Ipv6Addr
+             i16
-             NonZeroI128
+             i32
-             NonZeroI16
+             i64
-             NonZeroI32
+             i128
-             NonZeroI64
+             usize
            and $N others

core/codegen/tests/ui-fail-nightly/typed-uri-bad-type.stderr

@@ -17,9 +17,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                      ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, &str>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path, &str>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:47:17
@@ -28,9 +28,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                 ^^^^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, &str>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path, i64>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:49:22
@@ -39,9 +39,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                      ^^^^^^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, i64>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Path, _>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:51:30
@@ -50,14 +50,14 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Path, _>`
    |                              ^ the trait `FromUriParam<rocket::http::uri::fmt::Path, _>` is not implemented for `S`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'a std::path::Path>>
+             <bool as FromUriParam<P, bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
+             <bool as FromUriParam<P, &'x bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
+             <bool as FromUriParam<P, &'x mut bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
+             <isize as FromUriParam<P, isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
+             <isize as FromUriParam<P, &'x isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
+             <isize as FromUriParam<P, &'x mut isize>>
-             <&'a str as FromUriParam<P, &'a str>>
+             <i8 as FromUriParam<P, i8>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <i8 as FromUriParam<P, &'x i8>>
            and $N others
 
 error[E0277]: the trait bound `i32: FromUriParam<rocket::http::uri::fmt::Path, std::option::Option<{integer}>>` is not satisfied
@@ -67,9 +67,9 @@ error[E0277]: the trait bound `i32: FromUriParam<rocket::http::uri::fmt::Path, s
    |                         ^^^^^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, std::option::Option<{integer}>>` is not implemented for `i32`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
+             <i32 as FromUriParam<P, i32>>
              <i32 as FromUriParam<P, &'x i32>>
              <i32 as FromUriParam<P, &'x mut i32>>
-             <i32 as FromUriParam<P, i32>>
    = note: required for `std::option::Option<i32>` to implement `FromUriParam<rocket::http::uri::fmt::Path, std::option::Option<{integer}>>`
 
 error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::uri::fmt::Path, Result<_, _>>` is not satisfied
@@ -79,12 +79,12 @@ error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::u
    |                                          ^^^^^^^^^^^^^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, Result<_, _>>` is not implemented for `std::string::String`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
+             <std::string::String as FromUriParam<P, std::string::String>>
+             <std::string::String as FromUriParam<P, &'x std::string::String>>
+             <std::string::String as FromUriParam<P, &'x mut std::string::String>>
              <std::string::String as FromUriParam<P, &'a str>>
              <std::string::String as FromUriParam<P, &'x &'a str>>
              <std::string::String as FromUriParam<P, &'x mut &'a str>>
-             <std::string::String as FromUriParam<P, &'x mut std::string::String>>
-             <std::string::String as FromUriParam<P, &'x std::string::String>>
-             <std::string::String as FromUriParam<P, std::string::String>>
    = note: required for `Result<std::string::String, &str>` to implement `FromUriParam<rocket::http::uri::fmt::Path, Result<_, _>>`
 
 error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::fmt::Query, &str>` is not satisfied
@@ -94,9 +94,9 @@ error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::fmt::Query
    |                   ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Query, &str>` is not implemented for `isize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
+             <isize as FromUriParam<P, isize>>
              <isize as FromUriParam<P, &'x isize>>
              <isize as FromUriParam<P, &'x mut isize>>
-             <isize as FromUriParam<P, isize>>
 
 error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::fmt::Query, &str>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:60:24
@@ -105,9 +105,9 @@ error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::fmt::Query
    |                        ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Query, &str>` is not implemented for `isize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
+             <isize as FromUriParam<P, isize>>
              <isize as FromUriParam<P, &'x isize>>
              <isize as FromUriParam<P, &'x mut isize>>
-             <isize as FromUriParam<P, isize>>
 
 error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Query, _>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:62:23
@@ -116,14 +116,14 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Query, _>
    |                       ^ the trait `FromUriParam<rocket::http::uri::fmt::Query, _>` is not implemented for `S`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'a std::path::Path>>
+             <bool as FromUriParam<P, bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
+             <bool as FromUriParam<P, &'x bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
+             <bool as FromUriParam<P, &'x mut bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
+             <isize as FromUriParam<P, isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
+             <isize as FromUriParam<P, &'x isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
+             <isize as FromUriParam<P, &'x mut isize>>
-             <&'a str as FromUriParam<P, &'a str>>
+             <i8 as FromUriParam<P, i8>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <i8 as FromUriParam<P, &'x i8>>
            and $N others
 
 error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Query, _>` is not satisfied
@@ -133,14 +133,14 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Query, _>
    |                         ^ the trait `FromUriParam<rocket::http::uri::fmt::Query, _>` is not implemented for `S`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'a std::path::Path>>
+             <bool as FromUriParam<P, bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
+             <bool as FromUriParam<P, &'x bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
+             <bool as FromUriParam<P, &'x mut bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
+             <isize as FromUriParam<P, isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
+             <isize as FromUriParam<P, &'x isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
+             <isize as FromUriParam<P, &'x mut isize>>
-             <&'a str as FromUriParam<P, &'a str>>
+             <i8 as FromUriParam<P, i8>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <i8 as FromUriParam<P, &'x i8>>
            and $N others
 
 error[E0277]: the trait bound `S: Ignorable<rocket::http::uri::fmt::Query>` is not satisfied
@@ -150,8 +150,8 @@ error[E0277]: the trait bound `S: Ignorable<rocket::http::uri::fmt::Query>` is n
    |                         ^ the trait `Ignorable<rocket::http::uri::fmt::Query>` is not implemented for `S`
    |
    = help: the following other types implement trait `Ignorable<P>`:
-             Result<T, E>
              std::option::Option<T>
+             Result<T, E>
 note: required by a bound in `assert_ignorable`
   --> $WORKSPACE/core/http/src/uri/fmt/uri_display.rs
    |
@@ -165,8 +165,8 @@ error[E0277]: the trait bound `usize: Ignorable<rocket::http::uri::fmt::Query>`
    |                                 ^ the trait `Ignorable<rocket::http::uri::fmt::Query>` is not implemented for `usize`
    |
    = help: the following other types implement trait `Ignorable<P>`:
-             Result<T, E>
              std::option::Option<T>
+             Result<T, E>
 note: required by a bound in `assert_ignorable`
   --> $WORKSPACE/core/http/src/uri/fmt/uri_display.rs
    |
@@ -180,14 +180,14 @@ error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::fmt::Query, _>
    |                         ^ the trait `FromUriParam<rocket::http::uri::fmt::Query, _>` is not implemented for `S`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'a std::path::Path>>
+             <bool as FromUriParam<P, bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
+             <bool as FromUriParam<P, &'x bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
+             <bool as FromUriParam<P, &'x mut bool>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
+             <isize as FromUriParam<P, isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
+             <isize as FromUriParam<P, &'x isize>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
+             <isize as FromUriParam<P, &'x mut isize>>
-             <&'a str as FromUriParam<P, &'a str>>
+             <i8 as FromUriParam<P, i8>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <i8 as FromUriParam<P, &'x i8>>
            and $N others
 
 error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path, &str>` is not satisfied
@@ -197,9 +197,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                                        ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, &str>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `rocket::http::uri::Reference<'_>: ValidRoutePrefix` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:77:15
@@ -211,8 +211,8 @@ error[E0277]: the trait bound `rocket::http::uri::Reference<'_>: ValidRoutePrefi
    |          required by a bound introduced by this call
    |
    = help: the following other types implement trait `ValidRoutePrefix`:
-             rocket::http::uri::Absolute<'a>
              rocket::http::uri::Origin<'a>
+             rocket::http::uri::Absolute<'a>
 note: required by a bound in `RouteUriBuilder::with_prefix`
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
@@ -226,9 +226,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                                 ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, &str>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `rocket::http::uri::Asterisk: ValidRoutePrefix` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:78:15
@@ -240,8 +240,8 @@ error[E0277]: the trait bound `rocket::http::uri::Asterisk: ValidRoutePrefix` is
    |          required by a bound introduced by this call
    |
    = help: the following other types implement trait `ValidRoutePrefix`:
-             rocket::http::uri::Absolute<'a>
              rocket::http::uri::Origin<'a>
+             rocket::http::uri::Absolute<'a>
 note: required by a bound in `RouteUriBuilder::with_prefix`
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
@@ -255,9 +255,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                         ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, &str>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `rocket::http::uri::Asterisk: ValidRouteSuffix<rocket::http::uri::Origin<'static>>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:81:37
@@ -269,10 +269,10 @@ error[E0277]: the trait bound `rocket::http::uri::Asterisk: ValidRouteSuffix<roc
    |                                required by a bound introduced by this call
    |
    = help: the following other types implement trait `ValidRouteSuffix<T>`:
-             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
-             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Origin<'a>>>
-             <rocket::http::uri::Reference<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
              <rocket::http::uri::Reference<'a> as ValidRouteSuffix<rocket::http::uri::Origin<'a>>>
+             <rocket::http::uri::Reference<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
+             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Origin<'a>>>
+             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
 note: required by a bound in `RouteUriBuilder::with_suffix`
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
@@ -288,9 +288,9 @@ error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path,
    |                         ^^^^ the trait `FromUriParam<rocket::http::uri::fmt::Path, &str>` is not implemented for `usize`
    |
    = help: the following other types implement trait `FromUriParam<P, T>`:
-             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as FromUriParam<P, &'x usize>>
              <usize as FromUriParam<P, usize>>
+             <usize as FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
 
 error[E0277]: the trait bound `rocket::http::uri::Origin<'_>: ValidRouteSuffix<rocket::http::uri::Origin<'static>>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:82:37
@@ -302,10 +302,10 @@ error[E0277]: the trait bound `rocket::http::uri::Origin<'_>: ValidRouteSuffix<r
    |                                required by a bound introduced by this call
    |
    = help: the following other types implement trait `ValidRouteSuffix<T>`:
-             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
-             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Origin<'a>>>
-             <rocket::http::uri::Reference<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
              <rocket::http::uri::Reference<'a> as ValidRouteSuffix<rocket::http::uri::Origin<'a>>>
+             <rocket::http::uri::Reference<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
+             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Origin<'a>>>
+             <rocket::http::uri::Absolute<'a> as ValidRouteSuffix<rocket::http::uri::Absolute<'a>>>
 note: required by a bound in `RouteUriBuilder::with_suffix`
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |

core/codegen/tests/ui-fail-nightly/typed-uris-invalid-syntax.stderr

@@ -96,7 +96,7 @@ error: unexpected token
 27 |     uri!(simple: id = );
    |                ^
 
-error: unexpected end of input, expected expression
+error: unexpected end of input, expected an expression
   --> tests/ui-fail-nightly/typed-uris-invalid-syntax.rs:28:22
    |
 28 |     uri!(simple(id = ));

core/codegen/tests/ui-fail-nightly/uri_display_type_errors.stderr

@@ -5,14 +5,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query
   |             ^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Query>` is not implemented for `BadType`
   |
   = help: the following other types implement trait `UriDisplay<P>`:
-            <&T as UriDisplay<P>>
+            <bool as UriDisplay<P>>
-            <&mut T as UriDisplay<P>>
+            <isize as UriDisplay<P>>
-            <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+            <i8 as UriDisplay<P>>
-            <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+            <i16 as UriDisplay<P>>
-            <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+            <i32 as UriDisplay<P>>
-            <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+            <i64 as UriDisplay<P>>
-            <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+            <i128 as UriDisplay<P>>
-            <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+            <usize as UriDisplay<P>>
           and $N others
   = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Query>`
 note: required by a bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_value`
@@ -28,14 +28,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query
    |     ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Query>` is not implemented for `BadType`
    |
    = help: the following other types implement trait `UriDisplay<P>`:
-             <&T as UriDisplay<P>>
+             <bool as UriDisplay<P>>
-             <&mut T as UriDisplay<P>>
+             <isize as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i8 as UriDisplay<P>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i16 as UriDisplay<P>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i32 as UriDisplay<P>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i64 as UriDisplay<P>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i128 as UriDisplay<P>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <usize as UriDisplay<P>>
            and $N others
    = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Query>`
 note: required by a bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::http::uri::fmt::Query>::write_named_value`
@@ -51,14 +51,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query
    |     ^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Query>` is not implemented for `BadType`
    |
    = help: the following other types implement trait `UriDisplay<P>`:
-             <&T as UriDisplay<P>>
+             <bool as UriDisplay<P>>
-             <&mut T as UriDisplay<P>>
+             <isize as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i8 as UriDisplay<P>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i16 as UriDisplay<P>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i32 as UriDisplay<P>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i64 as UriDisplay<P>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i128 as UriDisplay<P>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <usize as UriDisplay<P>>
            and $N others
    = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Query>`
 note: required by a bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::http::uri::fmt::Query>::write_named_value`
@@ -74,14 +74,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query
    |           ^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Query>` is not implemented for `BadType`
    |
    = help: the following other types implement trait `UriDisplay<P>`:
-             <&T as UriDisplay<P>>
+             <bool as UriDisplay<P>>
-             <&mut T as UriDisplay<P>>
+             <isize as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i8 as UriDisplay<P>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i16 as UriDisplay<P>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i32 as UriDisplay<P>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i64 as UriDisplay<P>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i128 as UriDisplay<P>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <usize as UriDisplay<P>>
            and $N others
    = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Query>`
    = note: 1 redundant requirement hidden
@@ -99,14 +99,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query
    |         ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Query>` is not implemented for `BadType`
    |
    = help: the following other types implement trait `UriDisplay<P>`:
-             <&T as UriDisplay<P>>
+             <bool as UriDisplay<P>>
-             <&mut T as UriDisplay<P>>
+             <isize as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i8 as UriDisplay<P>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i16 as UriDisplay<P>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i32 as UriDisplay<P>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i64 as UriDisplay<P>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i128 as UriDisplay<P>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <usize as UriDisplay<P>>
            and $N others
    = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Query>`
    = note: 1 redundant requirement hidden
@@ -124,14 +124,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query
    |         ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Query>` is not implemented for `BadType`
    |
    = help: the following other types implement trait `UriDisplay<P>`:
-             <&T as UriDisplay<P>>
+             <bool as UriDisplay<P>>
-             <&mut T as UriDisplay<P>>
+             <isize as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i8 as UriDisplay<P>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i16 as UriDisplay<P>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i32 as UriDisplay<P>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i64 as UriDisplay<P>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i128 as UriDisplay<P>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <usize as UriDisplay<P>>
            and $N others
    = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Query>`
    = note: 1 redundant requirement hidden
@@ -149,14 +149,14 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Path>
    |            ^^^^^^^ the trait `UriDisplay<rocket::http::uri::fmt::Path>` is not implemented for `BadType`
    |
    = help: the following other types implement trait `UriDisplay<P>`:
-             <&T as UriDisplay<P>>
+             <bool as UriDisplay<P>>
-             <&mut T as UriDisplay<P>>
+             <isize as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i8 as UriDisplay<P>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i16 as UriDisplay<P>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i32 as UriDisplay<P>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i64 as UriDisplay<P>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <i128 as UriDisplay<P>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <usize as UriDisplay<P>>
            and $N others
    = note: required for `&BadType` to implement `UriDisplay<rocket::http::uri::fmt::Path>`
 note: required by a bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_value`

core/codegen/tests/ui-fail-stable/async-entry.stderr

@@ -27,7 +27,7 @@ error: [note] this function must be `async`
    |     ^^
 
 error: attribute cannot be applied to `main` function
-         --- note: this attribute generates a `main` function
+       = note: this attribute generates a `main` function
   --> tests/ui-fail-stable/async-entry.rs:49:5
    |
 49 |     #[rocket::launch]
@@ -70,7 +70,7 @@ error: [note] this function must return a value
    |     ^^
 
 error: attribute cannot be applied to `main` function
-         --- note: this attribute generates a `main` function
+       = note: this attribute generates a `main` function
   --> tests/ui-fail-stable/async-entry.rs:79:5
    |
 79 |     #[rocket::launch]
@@ -85,7 +85,7 @@ error: [note] this function cannot be `main`
    |        ^^^^
 
 error: attribute cannot be applied to `main` function
-         --- note: this attribute generates a `main` function
+       = note: this attribute generates a `main` function
   --> tests/ui-fail-stable/async-entry.rs:87:5
    |
 87 |     #[rocket::launch]
@@ -100,12 +100,12 @@ error: [note] this function cannot be `main`
    |              ^^^^
 
 error[E0728]: `await` is only allowed inside `async` functions and blocks
-  --> tests/ui-fail-stable/async-entry.rs:73:41
+  --> tests/ui-fail-stable/async-entry.rs:73:42
    |
 72 |     fn rocket() -> _ {
    |        ------ this is not `async`
 73 |         let _ = rocket::build().launch().await;
-   |                                         ^^^^^^ only allowed inside `async` functions and blocks
+   |                                          ^^^^^ only allowed inside `async` functions and blocks
 
 error[E0308]: mismatched types
   --> tests/ui-fail-stable/async-entry.rs:35:9

core/codegen/tests/ui-fail-stable/bad-ignored-segments.stderr

@@ -1,12 +1,12 @@
 error: parameter must be named
-         --- help: use a name such as `_guard` or `_param`
+       = help: use a name such as `_guard` or `_param`
  --> tests/ui-fail-stable/bad-ignored-segments.rs:6:7
   |
 6 | #[get("/c?<_>")]
   |       ^^^^^^^^
 
 error: parameter must be named
-         --- help: use a name such as `_guard` or `_param`
+       = help: use a name such as `_guard` or `_param`
  --> tests/ui-fail-stable/bad-ignored-segments.rs:9:21
   |
 9 | #[post("/d", data = "<_>")]

core/codegen/tests/ui-fail-stable/catch.stderr

@@ -1,54 +1,54 @@
 error: expected `fn`
-         --- help: `#[catch]` can only be used on functions
+       = help: `#[catch]` can only be used on functions
  --> tests/ui-fail-stable/catch.rs:6:1
   |
 6 | struct Catcher(String);
   | ^^^^^^
 
 error: expected `fn`
-         --- help: `#[catch]` can only be used on functions
+       = help: `#[catch]` can only be used on functions
  --> tests/ui-fail-stable/catch.rs:9:7
   |
 9 | const CATCH: &str = "Catcher";
   |       ^^^^^
 
 error: expected integer or `default`, found string literal
-         --- help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
+       = help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
   --> tests/ui-fail-stable/catch.rs:11:9
    |
 11 | #[catch("404")]
    |         ^^^^^
 
 error: unexpected keyed parameter: expected literal or identifier
-         --- help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
+       = help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
   --> tests/ui-fail-stable/catch.rs:14:9
    |
 14 | #[catch(code = "404")]
    |         ^^^^
 
 error: unexpected keyed parameter: expected literal or identifier
-         --- help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
+       = help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
   --> tests/ui-fail-stable/catch.rs:17:9
    |
 17 | #[catch(code = 404)]
    |         ^^^^
 
 error: status must be in range [100, 599]
-         --- help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
+       = help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
   --> tests/ui-fail-stable/catch.rs:20:9
    |
 20 | #[catch(99)]
    |         ^^
 
 error: status must be in range [100, 599]
-         --- help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
+       = help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
   --> tests/ui-fail-stable/catch.rs:23:9
    |
 23 | #[catch(600)]
    |         ^^^
 
 error: unexpected attribute parameter: `message`
-         --- help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
+       = help: `#[catch]` expects a status code int or `default`: `#[catch(404)]` or `#[catch(default)]`
   --> tests/ui-fail-stable/catch.rs:26:14
    |
 26 | #[catch(400, message = "foo")]

core/codegen/tests/ui-fail-stable/from_form.stderr

@@ -69,7 +69,7 @@ error: [note] error occurred while deriving `FromForm`
    = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
   --> tests/ui-fail-stable/from_form.rs:28:20
    |
 28 |     #[field(name = "isindex")]
@@ -300,7 +300,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
    --> tests/ui-fail-stable/from_form.rs:111:20
     |
 111 |     #[field(name = "hello&world")]
@@ -315,7 +315,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
    --> tests/ui-fail-stable/from_form.rs:117:20
     |
 117 |     #[field(name = "!@#$%^&*()_")]
@@ -330,7 +330,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
    --> tests/ui-fail-stable/from_form.rs:123:20
     |
 123 |     #[field(name = "?")]
@@ -345,7 +345,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
    --> tests/ui-fail-stable/from_form.rs:129:20
     |
 129 |     #[field(name = "")]
@@ -360,7 +360,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
    --> tests/ui-fail-stable/from_form.rs:135:20
     |
 135 |     #[field(name = "a&b")]
@@ -375,7 +375,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid form field name
-         --- help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
+       = help: field name cannot be `isindex` or contain '&', '=', '?', '.', '[', ']'
    --> tests/ui-fail-stable/from_form.rs:141:20
     |
 141 |     #[field(name = "a=")]
@@ -404,7 +404,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: duplicate default field expression
-         --- help: at most one `default` or `default_with` is allowed
+       = help: at most one `default` or `default_with` is allowed
    --> tests/ui-fail-stable/from_form.rs:184:23
     |
 184 |     #[field(default = 2)]
@@ -419,7 +419,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: duplicate default expressions
-         --- help: only one of `default` or `default_with` must be used
+       = help: only one of `default` or `default_with` must be used
    --> tests/ui-fail-stable/from_form.rs:190:23
     |
 190 |     #[field(default = 1, default_with = None)]
@@ -440,7 +440,7 @@ error: [note] error occurred while deriving `FromForm`
     = note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: duplicate default expressions
-         --- help: only one of `default` or `default_with` must be used
+       = help: only one of `default` or `default_with` must be used
    --> tests/ui-fail-stable/from_form.rs:197:23
     |
 197 |     #[field(default = 1)]

core/codegen/tests/ui-fail-stable/route-attribute-general-syntax.stderr

@@ -7,28 +7,28 @@ error: missing expected parameter: `uri`
   = note: this error originates in the attribute macro `get` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected `fn`
-         --- help: #[get] can only be used on functions
+       = help: #[get] can only be used on functions
  --> tests/ui-fail-stable/route-attribute-general-syntax.rs:9:1
   |
 9 | struct S;
   | ^^^^^^
 
 error: expected `fn`
-         --- help: #[get] can only be used on functions
+       = help: #[get] can only be used on functions
   --> tests/ui-fail-stable/route-attribute-general-syntax.rs:12:1
    |
 12 | enum A {  }
    | ^^^^
 
 error: expected `fn`
-         --- help: #[get] can only be used on functions
+       = help: #[get] can only be used on functions
   --> tests/ui-fail-stable/route-attribute-general-syntax.rs:15:1
    |
 15 | trait Foo {  }
    | ^^^^^
 
 error: expected `fn`
-         --- help: #[get] can only be used on functions
+       = help: #[get] can only be used on functions
   --> tests/ui-fail-stable/route-attribute-general-syntax.rs:18:1
    |
 18 | impl S {  }
@@ -65,7 +65,7 @@ error: expected key/value `key = value`
    |            ^
 
 error: handler arguments must be named
-         --- help: to name an ignored handler argument, use `_name`
+       = help: to name an ignored handler argument, use `_name`
   --> tests/ui-fail-stable/route-attribute-general-syntax.rs:39:7
    |
 39 | fn c1(_: usize) {}
@@ -168,35 +168,35 @@ error: invalid or unknown media type
    |                     ^^^^^^^^^^^
 
 error: invalid HTTP method for route handlers
-         --- help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
+       = help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
   --> tests/ui-fail-stable/route-attribute-general-syntax.rs:95:9
    |
 95 | #[route(CONNECT, "/")]
    |         ^^^^^^^
 
 error: invalid HTTP method
-         --- help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
+       = help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
   --> tests/ui-fail-stable/route-attribute-general-syntax.rs:98:9
    |
 98 | #[route(FIX, "/")]
    |         ^^^
 
 error: expected identifier, found string literal
-         --- help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
+       = help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
    --> tests/ui-fail-stable/route-attribute-general-syntax.rs:101:9
     |
 101 | #[route("hi", "/")]
     |         ^^^^
 
 error: expected identifier, found string literal
-         --- help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
+       = help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
    --> tests/ui-fail-stable/route-attribute-general-syntax.rs:104:9
     |
 104 | #[route("GET", "/")]
     |         ^^^^^
 
 error: expected identifier, found integer literal
-         --- help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
+       = help: method must be one of: `GET`, `PUT`, `POST`, `DELETE`, `HEAD`, `PATCH`, `OPTIONS`
    --> tests/ui-fail-stable/route-attribute-general-syntax.rs:107:9
     |
 107 | #[route(120, "/")]

core/codegen/tests/ui-fail-stable/route-path-bad-syntax.stderr

@@ -1,47 +1,47 @@
 error: invalid route URI: expected token '/' but found 'a' at index 0
-         --- help: expected URI in origin form: "/path/<param>"
+       = help: expected URI in origin form: "/path/<param>"
  --> tests/ui-fail-stable/route-path-bad-syntax.rs:5:7
   |
 5 | #[get("a")]
   |       ^^^
 
 error: invalid route URI: unexpected EOF: expected token '/' at index 0
-         --- help: expected URI in origin form: "/path/<param>"
+       = help: expected URI in origin form: "/path/<param>"
  --> tests/ui-fail-stable/route-path-bad-syntax.rs:8:7
   |
 8 | #[get("")]
   |       ^^
 
 error: invalid route URI: expected token '/' but found 'a' at index 0
-         --- help: expected URI in origin form: "/path/<param>"
+       = help: expected URI in origin form: "/path/<param>"
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:11:7
    |
 11 | #[get("a/b/c")]
    |       ^^^^^^^
 
 error: route URIs cannot contain empty segments
-         --- note: expected "/a/b", found "/a///b"
+       = note: expected "/a/b", found "/a///b"
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:14:7
    |
 14 | #[get("/a///b")]
    |       ^^^^^^^^
 
 error: route URIs cannot contain empty segments
-         --- note: expected "/?bat", found "/?bat&&"
+       = note: expected "/?bat", found "/?bat&&"
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:17:7
    |
 17 | #[get("/?bat&&")]
    |       ^^^^^^^^^
 
 error: route URIs cannot contain empty segments
-         --- note: expected "/?bat", found "/?bat&&"
+       = note: expected "/?bat", found "/?bat&&"
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:20:7
    |
 20 | #[get("/?bat&&")]
    |       ^^^^^^^^^
 
 error: route URIs cannot contain empty segments
-         --- note: expected "/a/b/", found "/a/b//"
+       = note: expected "/a/b/", found "/a/b//"
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:23:7
    |
 23 | #[get("/a/b//")]
@@ -108,68 +108,68 @@ error: [note] expected argument named `b` here
    |      ^^
 
 error: invalid identifier: `foo_.`
-         --- help: dynamic parameters must be valid identifiers
+       = help: dynamic parameters must be valid identifiers
-         --- help: did you mean `<foo_>`?
+       = help: did you mean `<foo_>`?
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:60:7
    |
 60 | #[get("/<foo_.>")]
    |       ^^^^^^^^^^
 
 error: invalid identifier: `foo*`
-         --- help: dynamic parameters must be valid identifiers
+       = help: dynamic parameters must be valid identifiers
-         --- help: did you mean `<foo>`?
+       = help: did you mean `<foo>`?
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:63:7
    |
 63 | #[get("/<foo*>")]
    |       ^^^^^^^^^
 
 error: invalid identifier: `!`
-         --- help: dynamic parameters must be valid identifiers
+       = help: dynamic parameters must be valid identifiers
-         --- help: did you mean `<param>`?
+       = help: did you mean `<param>`?
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:66:7
    |
 66 | #[get("/<!>")]
    |       ^^^^^^
 
 error: invalid identifier: `name>:<id`
-         --- help: dynamic parameters must be valid identifiers
+       = help: dynamic parameters must be valid identifiers
-         --- help: did you mean `<nameid>`?
+       = help: did you mean `<nameid>`?
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:69:7
    |
 69 | #[get("/<name>:<id>")]
    |       ^^^^^^^^^^^^^^
 
 error: unexpected static parameter
-         --- help: parameter must be dynamic: `<foo>`
+       = help: parameter must be dynamic: `<foo>`
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:74:19
    |
 74 | #[get("/", data = "foo")]
    |                   ^^^^^
 
 error: parameter cannot be trailing
-         --- help: did you mean `<foo>`?
+       = help: did you mean `<foo>`?
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:77:19
    |
 77 | #[get("/", data = "<foo..>")]
    |                   ^^^^^^^^^
 
 error: unexpected static parameter
-         --- help: parameter must be dynamic: `<foo>`
+       = help: parameter must be dynamic: `<foo>`
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:80:19
    |
 80 | #[get("/", data = "<foo")]
    |                   ^^^^^^
 
 error: invalid identifier: `test `
-         --- help: dynamic parameters must be valid identifiers
+       = help: dynamic parameters must be valid identifiers
-         --- help: did you mean `<test>`?
+       = help: did you mean `<test>`?
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:83:19
    |
 83 | #[get("/", data = "<test >")]
    |                   ^^^^^^^^^
 
 error: handler arguments must be named
-         --- help: to name an ignored handler argument, use `_name`
+       = help: to name an ignored handler argument, use `_name`
   --> tests/ui-fail-stable/route-path-bad-syntax.rs:89:7
    |
 89 | fn k0(_: usize) {}

core/codegen/tests/ui-fail-stable/typed-uri-bad-type.stderr

@@ -273,6 +273,8 @@ error[E0277]: the trait bound `rocket::http::uri::Asterisk: ValidRouteSuffix<roc
 note: required by a bound in `RouteUriBuilder::with_suffix`
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
+   |     pub fn with_suffix<S>(self, suffix: S) -> SuffixedRouteUri<S::Output>
+   |            ----------- required by a bound in this associated function
    |         where S: ValidRouteSuffix<Origin<'static>>
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RouteUriBuilder::with_suffix`
 
@@ -303,5 +305,7 @@ error[E0277]: the trait bound `rocket::http::uri::Origin<'_>: ValidRouteSuffix<r
 note: required by a bound in `RouteUriBuilder::with_suffix`
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
+   |     pub fn with_suffix<S>(self, suffix: S) -> SuffixedRouteUri<S::Output>
+   |            ----------- required by a bound in this associated function
    |         where S: ValidRouteSuffix<Origin<'static>>
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RouteUriBuilder::with_suffix`

core/codegen/tests/ui-fail-stable/typed-uris-bad-params.stderr

@@ -5,21 +5,21 @@ error: expected identifier, found keyword `_`
    |                  ^
 
 error: route expects 1 parameter but 2 were supplied
-         --- note: route `ignored` has uri "/<_>"
+       = note: route `ignored` has uri "/<_>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:69:18
    |
 69 |     uri!(ignored(10, "10"));
    |                  ^^
 
 error: expected unnamed arguments due to ignored parameters
-         --- note: uri for route `ignored` ignores path parameters: "/<_>"
+       = note: uri for route `ignored` ignores path parameters: "/<_>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:67:18
    |
 67 |     uri!(ignored(num = 10));
    |                  ^^^
 
 error: route expects 1 parameter but 2 were supplied
-         --- note: route `ignored` has uri "/<_>"
+       = note: route `ignored` has uri "/<_>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:65:18
    |
 65 |     uri!(ignored(10, 20));
@@ -44,8 +44,8 @@ error: path parameters cannot be ignored
    |                         ^
 
 error: invalid parameters for `has_two` route uri
-         --- note: uri parameters are: id: i32, name: String
+       = note: uri parameters are: id: i32, name: String
-         --- help: missing parameter: `name`
+       = help: missing parameter: `name`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:55:18
    |
 55 |     uri!(has_two(id = 100, cookies = "hi"));
@@ -58,8 +58,8 @@ error: [help] unknown parameter: `cookies`
    |                            ^^^^^^^
 
 error: invalid parameters for `has_two` route uri
-         --- note: uri parameters are: id: i32, name: String
+       = note: uri parameters are: id: i32, name: String
-         --- help: missing parameter: `name`
+       = help: missing parameter: `name`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:53:18
    |
 53 |     uri!(has_two(cookies = "hi", id = 100, id = 10, id = 10));
@@ -78,16 +78,16 @@ error: [help] duplicate parameter: `id`
    |                                            ^^
 
 error: invalid parameters for `has_two` route uri
-         --- note: uri parameters are: id: i32, name: String
+       = note: uri parameters are: id: i32, name: String
-         --- help: missing parameter: `id`
+       = help: missing parameter: `id`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:51:18
    |
 51 |     uri!(has_two(name = "hi"));
    |                  ^^^^
 
 error: invalid parameters for `has_two` route uri
-         --- note: uri parameters are: id: i32, name: String
+       = note: uri parameters are: id: i32, name: String
-         --- help: missing parameter: `name`
+       = help: missing parameter: `name`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:49:18
    |
 49 |     uri!(has_two(id = 100, id = 100, ));
@@ -100,7 +100,7 @@ error: [help] duplicate parameter: `id`
    |                            ^^
 
 error: invalid parameters for `has_one_guarded` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:47:26
    |
 47 |     uri!(has_one_guarded(id = 100, cookies = "hi"));
@@ -113,7 +113,7 @@ error: [help] unknown parameter: `cookies`
    |                                    ^^^^^^^
 
 error: invalid parameters for `has_one_guarded` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:45:26
    |
 45 |     uri!(has_one_guarded(cookies = "hi", id = 100));
@@ -126,8 +126,8 @@ error: [help] unknown parameter: `cookies`
    |                          ^^^^^^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
-         --- help: missing parameter: `id`
+       = help: missing parameter: `id`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:43:18
    |
 43 |     uri!(has_one(name = "hi"));
@@ -140,7 +140,7 @@ error: [help] unknown parameter: `name`
    |                  ^^^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:41:18
    |
 41 |     uri!(has_one(id = 100, id = 100, ));
@@ -153,7 +153,7 @@ error: [help] duplicate parameter: `id`
    |                            ^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:39:18
    |
 39 |     uri!(has_one(id = 100, id = 100));
@@ -166,7 +166,7 @@ error: [help] duplicate parameter: `id`
    |                            ^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:37:18
    |
 37 |     uri!(has_one(name = 100, age = 50, id = 100, id = 50));
@@ -185,7 +185,7 @@ error: [help] duplicate parameter: `id`
    |                                                  ^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:35:18
    |
 35 |     uri!(has_one(name = 100, age = 50, id = 100));
@@ -198,7 +198,7 @@ error: [help] unknown parameters: `name`, `age`
    |                  ^^^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:33:18
    |
 33 |     uri!(has_one(name = 100, id = 100));
@@ -211,7 +211,7 @@ error: [help] unknown parameter: `name`
    |                  ^^^^
 
 error: invalid parameters for `has_one` route uri
-         --- note: uri parameters are: id: i32
+       = note: uri parameters are: id: i32
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:31:18
    |
 31 |     uri!(has_one(id = 100, name = "hi"));
@@ -224,49 +224,49 @@ error: [help] unknown parameter: `name`
    |                            ^^^^
 
 error: route expects 2 parameters but 1 was supplied
-         --- note: route `has_two` has uri "/<id>?<name>"
+       = note: route `has_two` has uri "/<id>?<name>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:29:18
    |
 29 |     uri!(has_two(10));
    |                  ^^
 
 error: route expects 2 parameters but 3 were supplied
-         --- note: route `has_two` has uri "/<id>?<name>"
+       = note: route `has_two` has uri "/<id>?<name>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:28:18
    |
 28 |     uri!(has_two(10, "hi", "there"));
    |                  ^^
 
 error: route expects 1 parameter but 2 were supplied
-         --- note: route `has_one_guarded` has uri "/<id>"
+       = note: route `has_one_guarded` has uri "/<id>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:26:26
    |
 26 |     uri!(has_one_guarded("hi", 100));
    |                          ^^^^
 
 error: route expects 1 parameter but 2 were supplied
-         --- note: route `has_one` has uri "/<id>"
+       = note: route `has_one` has uri "/<id>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:25:18
    |
 25 |     uri!(has_one("Hello", 23, ));
    |                  ^^^^^^^
 
 error: route expects 1 parameter but 2 were supplied
-         --- note: route `has_one` has uri "/<id>"
+       = note: route `has_one` has uri "/<id>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:24:18
    |
 24 |     uri!(has_one(1, 23));
    |                  ^
 
 error: route expects 1 parameter but 0 were supplied
-         --- note: route `has_one` has uri "/<id>"
+       = note: route `has_one` has uri "/<id>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:22:10
    |
 22 |     uri!(has_one());
    |          ^^^^^^^
 
 error: route expects 1 parameter but 0 were supplied
-         --- note: route `has_one` has uri "/<id>"
+       = note: route `has_one` has uri "/<id>"
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:21:10
    |
 21 |     uri!(has_one);

core/codegen/tests/ui-fail-stable/typed-uris-invalid-syntax.stderr

@@ -96,7 +96,7 @@ error: unexpected token
 27 |     uri!(simple: id = );
    |                ^
 
-error: unexpected end of input, expected expression
+error: unexpected end of input, expected an expression
   --> tests/ui-fail-stable/typed-uris-invalid-syntax.rs:28:22
    |
 28 |     uri!(simple(id = ));
@@ -145,7 +145,7 @@ error: URI suffix must contain only query and/or fragment
    |                         ^^^^^^^^^
 
 error: route expects 2 parameters but 0 were supplied
-         --- note: route `simple` has uri "/<id>/<name>"
+       = note: route `simple` has uri "/<id>/<name>"
   --> tests/ui-fail-stable/typed-uris-invalid-syntax.rs:13:10
    |
 13 |     uri!(simple,);