diff --git a/core/codegen/tests/ui-fail-nightly/catch.stderr b/core/codegen/tests/ui-fail-nightly/catch.stderr
index 79cc292c..823904b4 100644
--- a/core/codegen/tests/ui-fail-nightly/catch.stderr
+++ b/core/codegen/tests/ui-fail-nightly/catch.stderr
@@ -75,7 +75,7 @@ note: function defined here
    |
 30 | fn f3(_request: &Request, other: bool) { }
    |    ^^ ------------------  -----------
-help: did you mean
+help: provide the argument
    |
 29 | f3(bool, /* bool */)
    |
diff --git a/core/codegen/tests/ui-fail-stable/catch_type_errors.stderr b/core/codegen/tests/ui-fail-stable/catch_type_errors.stderr
index c65b195b..9b930dbb 100644
--- a/core/codegen/tests/ui-fail-stable/catch_type_errors.stderr
+++ b/core/codegen/tests/ui-fail-stable/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>>
-            <&'o str as Responder<'r, 'o>>
-            <() as Responder<'r, 'static>>
-            <(ContentType, R) as Responder<'r, 'o>>
-            <(Status, R) as Responder<'r, 'o>>
-            <Accepted<R> as Responder<'r, 'o>>
-            <Arc<[u8]> as Responder<'r, 'static>>
-            <Arc<str> as Responder<'r, 'static>>
+            <rocket::Either<T, E> as Responder<'r, 'o>>
+            <Box<str> as Responder<'r, 'static>>
+            <Box<[u8]> as Responder<'r, 'static>>
+            <Box<T> as Responder<'r, 'o>>
+            <Cow<'o, R> as Responder<'r, 'o>>
+            <rocket::tokio::fs::File as Responder<'r, 'static>>
+            <EventStream<S> as Responder<'r, 'r>>
+            <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>>
-             <&'o str as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
-             <Arc<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
+             <Box<T> as Responder<'r, 'o>>
+             <Cow<'o, R> as Responder<'r, 'o>>
+             <rocket::tokio::fs::File as Responder<'r, 'static>>
+             <EventStream<S> as Responder<'r, 'r>>
+             <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>>
-             <&'o str as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
-             <Arc<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
+             <Box<T> as Responder<'r, 'o>>
+             <Cow<'o, R> as Responder<'r, 'o>>
+             <rocket::tokio::fs::File as Responder<'r, 'static>>
+             <EventStream<S> as Responder<'r, 'r>>
+             <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>>
-             <&'o str as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
-             <Arc<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
+             <Box<[u8]> as Responder<'r, 'static>>
+             <Box<T> as Responder<'r, 'o>>
+             <Cow<'o, R> as Responder<'r, 'o>>
+             <rocket::tokio::fs::File as Responder<'r, 'static>>
+             <EventStream<S> as Responder<'r, 'r>>
+             <std::fs::File as Responder<'r, 'static>>
            and $N others
diff --git a/core/codegen/tests/ui-fail-stable/from_form.stderr b/core/codegen/tests/ui-fail-stable/from_form.stderr
index 3bc006df..afd9e509 100644
--- a/core/codegen/tests/ui-fail-stable/from_form.stderr
+++ b/core/codegen/tests/ui-fail-stable/from_form.stderr
@@ -523,9 +523,6 @@ help: the type constructed contains `{integer}` due to the type of the argument
     |                       ^^^ this argument influences the type of `Some`
 note: tuple variant defined here
    --> $RUST/core/src/option.rs
-    |
-    |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-    |     ^^^^
 
 error[E0308]: mismatched types
    --> tests/ui-fail-stable/from_form.rs:203:33
@@ -545,9 +542,6 @@ help: the type constructed contains `&'static str` due to the type of the argume
     |                                 this argument influences the type of `Some`
 note: tuple variant defined here
    --> $RUST/core/src/option.rs
-    |
-    |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-    |     ^^^^
 
 error[E0277]: the trait bound `bool: From<&str>` is not satisfied
    --> tests/ui-fail-stable/from_form.rs:209:23
diff --git a/core/codegen/tests/ui-fail-stable/from_form_type_errors.stderr b/core/codegen/tests/ui-fail-stable/from_form_type_errors.stderr
index 705ee23f..6022e34c 100644
--- a/core/codegen/tests/ui-fail-stable/from_form_type_errors.stderr
+++ b/core/codegen/tests/ui-fail-stable/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]
-            &'v str
-            Capped<&'v [u8]>
-            Capped<&'v str>
-            Capped<Cow<'v, str>>
-            Capped<TempFile<'v>>
-            Capped<std::string::String>
-            Cow<'v, str>
+            bool
+            isize
+            i8
+            i16
+            i32
+            i64
+            i128
+            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]
-             &'v str
-             Capped<&'v [u8]>
-             Capped<&'v str>
-             Capped<Cow<'v, str>>
-             Capped<TempFile<'v>>
-             Capped<std::string::String>
-             Cow<'v, str>
+             bool
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
+             usize
            and $N others
    = note: required for `Foo<usize>` to implement `FromForm<'r>`
diff --git a/core/codegen/tests/ui-fail-stable/responder-types.stderr b/core/codegen/tests/ui-fail-stable/responder-types.stderr
index 4dafb9f5..1ee3af24 100644
--- a/core/codegen/tests/ui-fail-stable/responder-types.stderr
+++ b/core/codegen/tests/ui-fail-stable/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>>
-            <&'o str as Responder<'r, 'o>>
-            <() as Responder<'r, 'static>>
-            <(ContentType, R) as Responder<'r, 'o>>
-            <(Status, R) as Responder<'r, 'o>>
-            <Accepted<R> as Responder<'r, 'o>>
-            <Arc<[u8]> as Responder<'r, 'static>>
-            <Arc<str> as Responder<'r, 'static>>
+            <Thing1 as Responder<'r, 'o>>
+            <Thing2 as Responder<'r, 'o>>
+            <Thing3 as Responder<'r, 'o>>
+            <Thing4 as Responder<'r, 'o>>
+            <rocket::Either<T, E> as Responder<'r, 'o>>
+            <Box<str> as Responder<'r, 'static>>
+            <Box<[u8]> 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>>
-             <&'o str as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
-             <Arc<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <Thing1 as Responder<'r, 'o>>
+             <Thing2 as Responder<'r, 'o>>
+             <Thing3 as Responder<'r, 'o>>
+             <Thing4 as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
+             <Box<[u8]> 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>>
-             <&'o str as Responder<'r, 'o>>
-             <() as Responder<'r, 'static>>
-             <(ContentType, R) as Responder<'r, 'o>>
-             <(Status, R) as Responder<'r, 'o>>
-             <Accepted<R> as Responder<'r, 'o>>
-             <Arc<[u8]> as Responder<'r, 'static>>
-             <Arc<str> as Responder<'r, 'static>>
+             <Thing1 as Responder<'r, 'o>>
+             <Thing2 as Responder<'r, 'o>>
+             <Thing3 as Responder<'r, 'o>>
+             <Thing4 as Responder<'r, 'o>>
+             <rocket::Either<T, E> as Responder<'r, 'o>>
+             <Box<str> as Responder<'r, 'static>>
+             <Box<[u8]> 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
diff --git a/core/codegen/tests/ui-fail-stable/route-type-errors.stderr b/core/codegen/tests/ui-fail-stable/route-type-errors.stderr
index a76bdfe2..40dd0d27 100644
--- a/core/codegen/tests/ui-fail-stable/route-type-errors.stderr
+++ b/core/codegen/tests/ui-fail-stable/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
-            IpAddr
-            Ipv4Addr
-            Ipv6Addr
-            NonZeroI128
-            NonZeroI16
-            NonZeroI32
-            NonZeroI64
+            bool
+            isize
+            i8
+            i16
+            i32
+            i64
+            i128
+            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-stable/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]
-             &'v str
-             Capped<&'v [u8]>
-             Capped<&'v str>
-             Capped<Cow<'v, str>>
-             Capped<TempFile<'v>>
-             Capped<std::string::String>
-             Cow<'v, str>
+             bool
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
+             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]
-             &'v str
-             Capped<&'v [u8]>
-             Capped<&'v str>
-             Capped<Cow<'v, str>>
-             Capped<TempFile<'v>>
-             Capped<std::string::String>
-             Cow<'v, str>
+             bool
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
+             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
-             &'r [u8]
-             &'r str
-             Capped<&'r RawStr>
-             Capped<&'r [u8]>
-             Capped<&'r str>
+             rocket::Data<'r>
+             Cow<'_, str>
              Capped<Cow<'_, str>>
+             Capped<Vec<u8>>
+             Capped<std::string::String>
              Capped<TempFile<'_>>
+             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
-             &'r Host<'r>
-             &'r Limits
-             &'r Route
-             &'r rocket::Config
-             &'r rocket::State<T>
-             &'r rocket::http::Accept
-             &'r rocket::http::CookieJar<'r>
+             rocket::http::Method
+             Outcome<T, (Status, <T as FromRequest<'r>>::Error), Status>
+             Flash<&'r rocket::http::CookieJar<'r>>
+             rocket::Shutdown
+             IpAddr
+             std::net::SocketAddr
+             std::option::Option<T>
+             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
-             IpAddr
-             Ipv4Addr
-             Ipv6Addr
-             NonZeroI128
-             NonZeroI16
-             NonZeroI32
-             NonZeroI64
+             bool
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
+             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
-             &'r Host<'r>
-             &'r Limits
-             &'r Route
-             &'r rocket::Config
-             &'r rocket::State<T>
-             &'r rocket::http::Accept
-             &'r rocket::http::CookieJar<'r>
+             rocket::http::Method
+             Outcome<T, (Status, <T as FromRequest<'r>>::Error), Status>
+             Flash<&'r rocket::http::CookieJar<'r>>
+             rocket::Shutdown
+             IpAddr
+             std::net::SocketAddr
+             std::option::Option<T>
+             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
-             IpAddr
-             Ipv4Addr
-             Ipv6Addr
-             NonZeroI128
-             NonZeroI16
-             NonZeroI32
-             NonZeroI64
+             bool
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
+             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
-             IpAddr
-             Ipv4Addr
-             Ipv6Addr
-             NonZeroI128
-             NonZeroI16
-             NonZeroI32
-             NonZeroI64
+             bool
+             isize
+             i8
+             i16
+             i32
+             i64
+             i128
+             usize
            and $N others
diff --git a/core/codegen/tests/ui-fail-stable/typed-uri-bad-type.stderr b/core/codegen/tests/ui-fail-stable/typed-uri-bad-type.stderr
index 179c4abe..5b529fc2 100644
--- a/core/codegen/tests/ui-fail-stable/typed-uri-bad-type.stderr
+++ b/core/codegen/tests/ui-fail-stable/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-stable/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-stable/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-stable/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>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
-             <&'a str as FromUriParam<P, &'a str>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <bool as FromUriParam<P, bool>>
+             <bool as FromUriParam<P, &'x bool>>
+             <bool as FromUriParam<P, &'x mut bool>>
+             <isize as FromUriParam<P, isize>>
+             <isize as FromUriParam<P, &'x isize>>
+             <isize as FromUriParam<P, &'x mut isize>>
+             <i8 as FromUriParam<P, i8>>
+             <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-stable/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-stable/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>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
-             <&'a str as FromUriParam<P, &'a str>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <bool as FromUriParam<P, bool>>
+             <bool as FromUriParam<P, &'x bool>>
+             <bool as FromUriParam<P, &'x mut bool>>
+             <isize as FromUriParam<P, isize>>
+             <isize as FromUriParam<P, &'x isize>>
+             <isize as FromUriParam<P, &'x mut isize>>
+             <i8 as FromUriParam<P, i8>>
+             <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>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
-             <&'a str as FromUriParam<P, &'a str>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <bool as FromUriParam<P, bool>>
+             <bool as FromUriParam<P, &'x bool>>
+             <bool as FromUriParam<P, &'x mut bool>>
+             <isize as FromUriParam<P, isize>>
+             <isize as FromUriParam<P, &'x isize>>
+             <isize as FromUriParam<P, &'x mut isize>>
+             <i8 as FromUriParam<P, i8>>
+             <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>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut &'a std::path::Path>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, &'x mut PathBuf>>
-             <&'a std::path::Path as FromUriParam<rocket::http::uri::fmt::Path, PathBuf>>
-             <&'a str as FromUriParam<P, &'a str>>
-             <&'a str as FromUriParam<P, &'x &'a str>>
+             <bool as FromUriParam<P, bool>>
+             <bool as FromUriParam<P, &'x bool>>
+             <bool as FromUriParam<P, &'x mut bool>>
+             <isize as FromUriParam<P, isize>>
+             <isize as FromUriParam<P, &'x isize>>
+             <isize as FromUriParam<P, &'x mut isize>>
+             <i8 as FromUriParam<P, i8>>
+             <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-stable/typed-uri-bad-type.rs:77:15
@@ -210,8 +210,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
    |
@@ -225,9 +225,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-stable/typed-uri-bad-type.rs:78:15
@@ -238,8 +238,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
    |
@@ -253,9 +253,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-stable/typed-uri-bad-type.rs:81:37
@@ -266,10 +266,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
    |
@@ -285,9 +285,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-stable/typed-uri-bad-type.rs:82:37
@@ -298,10 +298,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
    |
diff --git a/core/codegen/tests/ui-fail-stable/uri_display_type_errors.stderr b/core/codegen/tests/ui-fail-stable/uri_display_type_errors.stderr
index 65271c40..92916ace 100644
--- a/core/codegen/tests/ui-fail-stable/uri_display_type_errors.stderr
+++ b/core/codegen/tests/ui-fail-stable/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>>
-            <&mut T as UriDisplay<P>>
-            <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-            <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-            <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-            <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-            <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-            <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+            <bool as UriDisplay<P>>
+            <isize as UriDisplay<P>>
+            <i8 as UriDisplay<P>>
+            <i16 as UriDisplay<P>>
+            <i32 as UriDisplay<P>>
+            <i64 as UriDisplay<P>>
+            <i128 as UriDisplay<P>>
+            <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>>
-             <&mut T as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <bool as UriDisplay<P>>
+             <isize as UriDisplay<P>>
+             <i8 as UriDisplay<P>>
+             <i16 as UriDisplay<P>>
+             <i32 as UriDisplay<P>>
+             <i64 as UriDisplay<P>>
+             <i128 as UriDisplay<P>>
+             <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>>
-             <&mut T as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <bool as UriDisplay<P>>
+             <isize as UriDisplay<P>>
+             <i8 as UriDisplay<P>>
+             <i16 as UriDisplay<P>>
+             <i32 as UriDisplay<P>>
+             <i64 as UriDisplay<P>>
+             <i128 as UriDisplay<P>>
+             <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>>
-             <&mut T as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <bool as UriDisplay<P>>
+             <isize as UriDisplay<P>>
+             <i8 as UriDisplay<P>>
+             <i16 as UriDisplay<P>>
+             <i32 as UriDisplay<P>>
+             <i64 as UriDisplay<P>>
+             <i128 as UriDisplay<P>>
+             <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>>
-             <&mut T as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <bool as UriDisplay<P>>
+             <isize as UriDisplay<P>>
+             <i8 as UriDisplay<P>>
+             <i16 as UriDisplay<P>>
+             <i32 as UriDisplay<P>>
+             <i64 as UriDisplay<P>>
+             <i128 as UriDisplay<P>>
+             <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>>
-             <&mut T as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <bool as UriDisplay<P>>
+             <isize as UriDisplay<P>>
+             <i8 as UriDisplay<P>>
+             <i16 as UriDisplay<P>>
+             <i32 as UriDisplay<P>>
+             <i64 as UriDisplay<P>>
+             <i128 as UriDisplay<P>>
+             <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>>
-             <&mut T as UriDisplay<P>>
-             <BTreeMap<K, V> as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar1 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar2 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar3 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar4 as UriDisplay<rocket::http::uri::fmt::Query>>
-             <Bar5 as UriDisplay<rocket::http::uri::fmt::Query>>
+             <bool as UriDisplay<P>>
+             <isize as UriDisplay<P>>
+             <i8 as UriDisplay<P>>
+             <i16 as UriDisplay<P>>
+             <i32 as UriDisplay<P>>
+             <i64 as UriDisplay<P>>
+             <i128 as UriDisplay<P>>
+             <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`