Update UI tests for latest stable.

contrib/codegen/tests/ui-fail-stable/database-types.stderr

@@ -1,19 +1,19 @@
-error[E0277]: the trait bound `Unknown: rocket_contrib::databases::Poolable` is not satisfied
+error[E0277]: the trait bound `Unknown: Poolable` is not satisfied
    --> $DIR/database-types.rs:7:10
     |
 7   | struct A(Unknown);
-    |          ^^^^^^^ the trait `rocket_contrib::databases::Poolable` is not implemented for `Unknown`
+    |          ^^^^^^^ the trait `Poolable` is not implemented for `Unknown`
     |
    ::: $WORKSPACE/contrib/lib/src/databases.rs
     |
     | pub struct Connection<K, C: Poolable> {
     |                             -------- required by this bound in `rocket_contrib::databases::Connection`
 
-error[E0277]: the trait bound `std::vec::Vec<i32>: rocket_contrib::databases::Poolable` is not satisfied
+error[E0277]: the trait bound `Vec<i32>: Poolable` is not satisfied
    --> $DIR/database-types.rs:10:10
     |
 10  | struct B(Vec<i32>);
-    |          ^^^ the trait `rocket_contrib::databases::Poolable` is not implemented for `std::vec::Vec<i32>`
+    |          ^^^ the trait `Poolable` is not implemented for `Vec<i32>`
     |
    ::: $WORKSPACE/contrib/lib/src/databases.rs
     |

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

@@ -29,6 +29,7 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is
    |           ^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: 1 redundant requirements hidden
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
@@ -38,6 +39,7 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is
    |         ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: 1 redundant requirements hidden
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
@@ -47,6 +49,7 @@ error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is
    |         ^^^^^^^^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: 1 redundant requirements hidden
    = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Path>` is not satisfied

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

@@ -111,13 +111,13 @@ error[E0308]: mismatched types
   --> $DIR/async-entry.rs:37:9
    |
 37 |         rocket::ignite()
-   |         ^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found struct `rocket::Rocket`
+   |         ^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found struct `Rocket`
 
 error[E0308]: mismatched types
   --> $DIR/async-entry.rs:46:9
    |
 46 |         "hi".to_string()
-   |         ^^^^^^^^^^^^^^^^ expected struct `rocket::Rocket`, found struct `std::string::String`
+   |         ^^^^^^^^^^^^^^^^ expected struct `Rocket`, found struct `std::string::String`
 
 error[E0308]: mismatched types
   --> $DIR/async-entry.rs:26:21
@@ -130,7 +130,7 @@ error[E0308]: mismatched types
 28 | |     }
    | |     ^- help: try adding a semicolon: `;`
    | |_____|
-   |       expected `()`, found struct `rocket::Rocket`
+   |       expected `()`, found struct `Rocket`
 
 error[E0308]: mismatched types
   --> $DIR/async-entry.rs:35:26
@@ -138,13 +138,13 @@ error[E0308]: mismatched types
 35 |     async fn rocket() -> String {
    |                          ^^^^^^
    |                          |
-   |                          expected struct `rocket::Rocket`, found struct `std::string::String`
+   |                          expected struct `Rocket`, found struct `std::string::String`
    |                          expected due to this
 
-error[E0277]: `main` has invalid return type `rocket::Rocket`
+error[E0277]: `main` has invalid return type `Rocket`
   --> $DIR/async-entry.rs:96:20
    |
 96 | async fn main() -> rocket::Rocket {
-   |                    ^^^^^^^^^^^^^^ `main` can only return types that implement `std::process::Termination`
+   |                    ^^^^^^^^^^^^^^ `main` can only return types that implement `Termination`
    |
    = help: consider using `()`, or a `Result`

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

@@ -58,7 +58,7 @@ error[E0308]: mismatched types
   --> $DIR/catch.rs:30:17
    |
 30 | fn f3(_request: &Request, other: bool) { }
-   |                 ^ expected `&rocket::Request<'_>`, found struct `rocket::http::Status`
+   |                 ^ expected `&rocket::Request<'_>`, found struct `Status`
 
 error[E0308]: mismatched types
   --> $DIR/catch.rs:30:34

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

@@ -1,18 +1,18 @@
-error[E0277]: the trait bound `usize: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
  --> $DIR/catch_type_errors.rs:6:30
   |
 6 | fn f1(_request: &Request) -> usize {
-  |                              ^^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `usize`
+  |                              ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
   |
-  = note: required by `rocket::response::Responder::respond_to`
+  = note: required by `respond_to`
 
-error[E0277]: the trait bound `bool: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `bool: Responder<'_, '_>` is not satisfied
   --> $DIR/catch_type_errors.rs:11:30
    |
 11 | fn f2(_request: &Request) -> bool {
-   |                              ^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `bool`
+   |                              ^^^^ the trait `Responder<'_, '_>` is not implemented for `bool`
    |
-   = note: required by `rocket::response::Responder::respond_to`
+   = note: required by `respond_to`
 
 error[E0308]: mismatched types
   --> $DIR/catch_type_errors.rs:16:17
@@ -20,18 +20,18 @@ error[E0308]: mismatched types
 16 | fn f3(_request: bool) -> usize {
    |                 ^^^^ expected `bool`, found `&rocket::Request<'_>`
 
-error[E0277]: the trait bound `usize: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
   --> $DIR/catch_type_errors.rs:16:26
    |
 16 | fn f3(_request: bool) -> usize {
-   |                          ^^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `usize`
+   |                          ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
    |
-   = note: required by `rocket::response::Responder::respond_to`
+   = note: required by `respond_to`
 
-error[E0277]: the trait bound `usize: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
   --> $DIR/catch_type_errors.rs:21:12
    |
 21 | fn f4() -> usize {
-   |            ^^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `usize`
+   |            ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
    |
-   = note: required by `rocket::response::Responder::respond_to`
+   = note: required by `respond_to`

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

@@ -1,11 +1,11 @@
-error[E0277]: the trait bound `Unknown: rocket::request::FromFormValue<'_>` is not satisfied
+error[E0277]: the trait bound `Unknown: FromFormValue<'_>` is not satisfied
  --> $DIR/from_form_type_errors.rs:7:5
   |
 7 |     field: Unknown,
-  |     ^^^^^ the trait `rocket::request::FromFormValue<'_>` is not implemented for `Unknown`
+  |     ^^^^^ the trait `FromFormValue<'_>` is not implemented for `Unknown`
 
-error[E0277]: the trait bound `Foo<usize>: rocket::request::FromFormValue<'_>` is not satisfied
+error[E0277]: the trait bound `Foo<usize>: FromFormValue<'_>` is not satisfied
   --> $DIR/from_form_type_errors.rs:14:5
    |
 14 |     field: Foo<usize>,
-   |     ^^^^^ the trait `rocket::request::FromFormValue<'_>` is not implemented for `Foo<usize>`
+   |     ^^^^^ the trait `FromFormValue<'_>` is not implemented for `Foo<usize>`

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

@@ -1,56 +1,56 @@
-error[E0277]: the trait bound `u8: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
  --> $DIR/responder-types.rs:5:5
   |
 5 |     thing: u8,
-  |     ^^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `u8`
+  |     ^^^^^ the trait `Responder<'_, '_>` is not implemented for `u8`
   |
-  = note: required by `rocket::response::Responder::respond_to`
+  = note: required by `respond_to`
 
-error[E0277]: the trait bound `rocket::http::Header<'_>: std::convert::From<u8>` is not satisfied
+error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
   --> $DIR/responder-types.rs:11:5
    |
 11 |     other: u8,
-   |     ^^^^^ the trait `std::convert::From<u8>` is not implemented for `rocket::http::Header<'_>`
+   |     ^^^^^ the trait `From<u8>` is not implemented for `Header<'_>`
    |
    = help: the following implementations were found:
-             <rocket::http::Header<'static> as std::convert::From<&rocket::http::Cookie<'_>>>
+             <Header<'static> as From<&Cookie<'_>>>
-             <rocket::http::Header<'static> as std::convert::From<rocket::http::Cookie<'_>>>
+             <Header<'static> as From<Cookie<'_>>>
-   = note: required because of the requirements on the impl of `std::convert::Into<rocket::http::Header<'_>>` for `u8`
+   = note: required because of the requirements on the impl of `Into<Header<'_>>` for `u8`
 
-error[E0277]: the trait bound `u8: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
   --> $DIR/responder-types.rs:16:5
    |
 16 |     thing: u8,
-   |     ^^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `u8`
+   |     ^^^^^ the trait `Responder<'_, '_>` is not implemented for `u8`
    |
-   = note: required by `rocket::response::Responder::respond_to`
+   = note: required by `respond_to`
 
-error[E0277]: the trait bound `rocket::http::Header<'_>: std::convert::From<u8>` is not satisfied
+error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
   --> $DIR/responder-types.rs:17:5
    |
 17 |     other: u8,
-   |     ^^^^^ the trait `std::convert::From<u8>` is not implemented for `rocket::http::Header<'_>`
+   |     ^^^^^ the trait `From<u8>` is not implemented for `Header<'_>`
    |
    = help: the following implementations were found:
-             <rocket::http::Header<'static> as std::convert::From<&rocket::http::Cookie<'_>>>
+             <Header<'static> as From<&Cookie<'_>>>
-             <rocket::http::Header<'static> as std::convert::From<rocket::http::Cookie<'_>>>
+             <Header<'static> as From<Cookie<'_>>>
-   = note: required because of the requirements on the impl of `std::convert::Into<rocket::http::Header<'_>>` for `u8`
+   = note: required because of the requirements on the impl of `Into<Header<'_>>` for `u8`
 
-error[E0277]: the trait bound `rocket::http::Header<'_>: std::convert::From<std::string::String>` is not satisfied
+error[E0277]: the trait bound `Header<'_>: From<std::string::String>` is not satisfied
   --> $DIR/responder-types.rs:24:5
    |
 24 |     then: String,
-   |     ^^^^ the trait `std::convert::From<std::string::String>` is not implemented for `rocket::http::Header<'_>`
+   |     ^^^^ the trait `From<std::string::String>` is not implemented for `Header<'_>`
    |
    = help: the following implementations were found:
-             <rocket::http::Header<'static> as std::convert::From<&rocket::http::Cookie<'_>>>
+             <Header<'static> as From<&Cookie<'_>>>
-             <rocket::http::Header<'static> as std::convert::From<rocket::http::Cookie<'_>>>
+             <Header<'static> as From<Cookie<'_>>>
-   = note: required because of the requirements on the impl of `std::convert::Into<rocket::http::Header<'_>>` for `std::string::String`
+   = note: required because of the requirements on the impl of `Into<Header<'_>>` for `std::string::String`
 
-error[E0277]: the trait bound `usize: rocket::response::Responder<'_, '_>` is not satisfied
+error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
   --> $DIR/responder-types.rs:28:13
    |
 28 | fn foo() -> usize { 0 }
-   |             ^^^^^ the trait `rocket::response::Responder<'_, '_>` is not implemented for `usize`
+   |             ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
    |
-   = note: required by `rocket::handler::<impl rocket::outcome::Outcome<rocket::Response<'o>, rocket::http::Status, rocket::Data>>::from`
+   = note: required by `handler::<impl rocket::outcome::Outcome<rocket::Response<'o>, Status, rocket::Data>>::from`

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

@@ -1,67 +1,67 @@
-error[E0277]: the trait bound `Q: rocket::request::FromParam<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
  --> $DIR/route-type-errors.rs:6:12
   |
 6 | fn f0(foo: Q) {}
-  |            ^ the trait `rocket::request::FromParam<'_>` is not implemented for `Q`
+  |            ^ the trait `FromParam<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromSegments<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromSegments<'_>` is not satisfied
  --> $DIR/route-type-errors.rs:9:12
   |
 9 | fn f1(foo: Q) {}
-  |            ^ the trait `rocket::request::FromSegments<'_>` is not implemented for `Q`
+  |            ^ the trait `FromSegments<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromFormValue<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromFormValue<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:12:12
    |
 12 | fn f2(foo: Q) {}
-   |            ^ the trait `rocket::request::FromFormValue<'_>` is not implemented for `Q`
+   |            ^ the trait `FromFormValue<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromFormValue<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromFormValue<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:12:7
    |
 12 | fn f2(foo: Q) {}
-   |       ^^^^^^ the trait `rocket::request::FromFormValue<'_>` is not implemented for `Q`
+   |       ^^^^^^ the trait `FromFormValue<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromQuery<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromQuery<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:15:12
    |
 15 | fn f3(foo: Q) {}
-   |            ^ the trait `rocket::request::FromQuery<'_>` is not implemented for `Q`
+   |            ^ the trait `FromQuery<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::data::FromData` is not satisfied
+error[E0277]: the trait bound `Q: FromData` is not satisfied
   --> $DIR/route-type-errors.rs:18:12
    |
 18 | fn f4(foo: Q) {}
-   |            ^ the trait `rocket::data::FromData` is not implemented for `Q`
+   |            ^ the trait `FromData` is not implemented for `Q`
    |
-   = note: required because of the requirements on the impl of `rocket::data::FromTransformedData<'_>` for `Q`
+   = note: required because of the requirements on the impl of `FromTransformedData<'_>` for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromRequest<'_, '_>` is not satisfied
+error[E0277]: the trait bound `Q: FromRequest<'_, '_>` is not satisfied
   --> $DIR/route-type-errors.rs:21:10
    |
 21 | fn f5(a: Q, foo: Q) {}
-   |          ^ the trait `rocket::request::FromRequest<'_, '_>` is not implemented for `Q`
+   |          ^ the trait `FromRequest<'_, '_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromParam<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:21:18
    |
 21 | fn f5(a: Q, foo: Q) {}
-   |                  ^ the trait `rocket::request::FromParam<'_>` is not implemented for `Q`
+   |                  ^ the trait `FromParam<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromRequest<'_, '_>` is not satisfied
+error[E0277]: the trait bound `Q: FromRequest<'_, '_>` is not satisfied
   --> $DIR/route-type-errors.rs:24:10
    |
 24 | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
-   |          ^ the trait `rocket::request::FromRequest<'_, '_>` is not implemented for `Q`
+   |          ^ the trait `FromRequest<'_, '_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromParam<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:24:18
    |
 24 | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
-   |                  ^ the trait `rocket::request::FromParam<'_>` is not implemented for `Q`
+   |                  ^ the trait `FromParam<'_>` is not implemented for `Q`
 
-error[E0277]: the trait bound `Q: rocket::request::FromParam<'_>` is not satisfied
+error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> $DIR/route-type-errors.rs:24:39
    |
 24 | fn f6(a: Q, foo: Q, good: usize, bar: Q) {}
-   |                                       ^ the trait `rocket::request::FromParam<'_>` is not implemented for `Q`
+   |                                       ^ the trait `FromParam<'_>` is not implemented for `Q`

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

@@ -1,112 +1,112 @@
-error[E0277]: the trait bound `usize: rocket::http::uri::FromUriParam<rocket::http::uri::Path, &str>` is not satisfied
+error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::Path, &str>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:42:23
    |
 42 |     uri!(simple: id = "hi");
-   |                       ^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Path, &str>` is not implemented for `usize`
+   |                       ^^^^ the trait `FromUriParam<rocket::http::uri::Path, &str>` is not implemented for `usize`
    |
    = help: the following implementations were found:
-             <usize as rocket::http::uri::FromUriParam<P, &'x mut usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as rocket::http::uri::FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x usize>>
-             <usize as rocket::http::uri::FromUriParam<P, usize>>
+             <usize as FromUriParam<P, usize>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `usize: rocket::http::uri::FromUriParam<rocket::http::uri::Path, &str>` is not satisfied
+error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::Path, &str>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:44:18
    |
 44 |     uri!(simple: "hello");
-   |                  ^^^^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Path, &str>` is not implemented for `usize`
+   |                  ^^^^^^^ the trait `FromUriParam<rocket::http::uri::Path, &str>` is not implemented for `usize`
    |
    = help: the following implementations were found:
-             <usize as rocket::http::uri::FromUriParam<P, &'x mut usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as rocket::http::uri::FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x usize>>
-             <usize as rocket::http::uri::FromUriParam<P, usize>>
+             <usize as FromUriParam<P, usize>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `usize: rocket::http::uri::FromUriParam<rocket::http::uri::Path, i64>` is not satisfied
+error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::Path, i64>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:46:23
    |
 46 |     uri!(simple: id = 239239i64);
-   |                       ^^^^^^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Path, i64>` is not implemented for `usize`
+   |                       ^^^^^^^^^ the trait `FromUriParam<rocket::http::uri::Path, i64>` is not implemented for `usize`
    |
    = help: the following implementations were found:
-             <usize as rocket::http::uri::FromUriParam<P, &'x mut usize>>
+             <usize as FromUriParam<P, &'x mut usize>>
-             <usize as rocket::http::uri::FromUriParam<P, &'x usize>>
+             <usize as FromUriParam<P, &'x usize>>
-             <usize as rocket::http::uri::FromUriParam<P, usize>>
+             <usize as FromUriParam<P, usize>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `S: rocket::http::uri::FromUriParam<rocket::http::uri::Path, _>` is not satisfied
+error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Path, _>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:48:31
    |
 48 |     uri!(not_uri_display: 10, S);
-   |                               ^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Path, _>` is not implemented for `S`
+   |                               ^ the trait `FromUriParam<rocket::http::uri::Path, _>` is not implemented for `S`
 
-error[E0277]: the trait bound `i32: rocket::http::uri::FromUriParam<rocket::http::uri::Path, std::option::Option<{integer}>>` is not satisfied
+error[E0277]: the trait bound `i32: FromUriParam<rocket::http::uri::Path, std::option::Option<{integer}>>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:53:26
    |
 53 |     uri!(optionals: id = Some(10), name = Ok("bob".into()));
-   |                          ^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Path, std::option::Option<{integer}>>` is not implemented for `i32`
+   |                          ^^^^ the trait `FromUriParam<rocket::http::uri::Path, std::option::Option<{integer}>>` is not implemented for `i32`
    |
    = help: the following implementations were found:
-             <i32 as rocket::http::uri::FromUriParam<P, &'x i32>>
+             <i32 as FromUriParam<P, &'x i32>>
-             <i32 as rocket::http::uri::FromUriParam<P, &'x mut i32>>
+             <i32 as FromUriParam<P, &'x mut i32>>
-             <i32 as rocket::http::uri::FromUriParam<P, i32>>
+             <i32 as FromUriParam<P, i32>>
-   = note: required because of the requirements on the impl of `rocket::http::uri::FromUriParam<rocket::http::uri::Path, std::option::Option<{integer}>>` for `std::option::Option<i32>`
+   = note: required because of the requirements on the impl of `FromUriParam<rocket::http::uri::Path, std::option::Option<{integer}>>` for `std::option::Option<i32>`
 
-error[E0277]: the trait bound `std::string::String: rocket::http::uri::FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` is not satisfied
+error[E0277]: the trait bound `std::string::String: FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:53:43
    |
 53 |     uri!(optionals: id = Some(10), name = Ok("bob".into()));
-   |                                           ^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` is not implemented for `std::string::String`
+   |                                           ^^ the trait `FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` is not implemented for `std::string::String`
    |
    = help: the following implementations were found:
-             <std::string::String as rocket::http::uri::FromUriParam<P, &'a str>>
+             <std::string::String as FromUriParam<P, &'a str>>
-             <std::string::String as rocket::http::uri::FromUriParam<P, &'x &'a str>>
+             <std::string::String as FromUriParam<P, &'x &'a str>>
-             <std::string::String as rocket::http::uri::FromUriParam<P, &'x mut &'a str>>
+             <std::string::String as FromUriParam<P, &'x mut &'a str>>
-             <std::string::String as rocket::http::uri::FromUriParam<P, &'x mut std::string::String>>
+             <std::string::String as FromUriParam<P, &'x mut std::string::String>>
            and 2 others
-   = note: required because of the requirements on the impl of `rocket::http::uri::FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` for `std::result::Result<std::string::String, &rocket::http::RawStr>`
+   = note: required because of the requirements on the impl of `FromUriParam<rocket::http::uri::Path, std::result::Result<_, _>>` for `std::result::Result<std::string::String, &RawStr>`
 
-error[E0277]: the trait bound `isize: rocket::http::uri::FromUriParam<rocket::http::uri::Query, &str>` is not satisfied
+error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::Query, &str>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:55:20
    |
 55 |     uri!(simple_q: "hi");
-   |                    ^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, &str>` is not implemented for `isize`
+   |                    ^^^^ the trait `FromUriParam<rocket::http::uri::Query, &str>` is not implemented for `isize`
    |
    = help: the following implementations were found:
-             <isize as rocket::http::uri::FromUriParam<P, &'x isize>>
+             <isize as FromUriParam<P, &'x isize>>
-             <isize as rocket::http::uri::FromUriParam<P, &'x mut isize>>
+             <isize as FromUriParam<P, &'x mut isize>>
-             <isize as rocket::http::uri::FromUriParam<P, isize>>
+             <isize as FromUriParam<P, isize>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `isize: rocket::http::uri::FromUriParam<rocket::http::uri::Query, &str>` is not satisfied
+error[E0277]: the trait bound `isize: FromUriParam<rocket::http::uri::Query, &str>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:57:25
    |
 57 |     uri!(simple_q: id = "hi");
-   |                         ^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, &str>` is not implemented for `isize`
+   |                         ^^^^ the trait `FromUriParam<rocket::http::uri::Query, &str>` is not implemented for `isize`
    |
    = help: the following implementations were found:
-             <isize as rocket::http::uri::FromUriParam<P, &'x isize>>
+             <isize as FromUriParam<P, &'x isize>>
-             <isize as rocket::http::uri::FromUriParam<P, &'x mut isize>>
+             <isize as FromUriParam<P, &'x mut isize>>
-             <isize as rocket::http::uri::FromUriParam<P, isize>>
+             <isize as FromUriParam<P, isize>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `S: rocket::http::uri::FromUriParam<rocket::http::uri::Query, _>` is not satisfied
+error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Query, _>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:59:24
    |
 59 |     uri!(other_q: 100, S);
-   |                        ^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
+   |                        ^ the trait `FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
 
-error[E0277]: the trait bound `S: rocket::http::uri::FromUriParam<rocket::http::uri::Query, _>` is not satisfied
+error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Query, _>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:61:26
    |
 61 |     uri!(other_q: rest = S, id = 100);
-   |                          ^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
+   |                          ^ the trait `FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
 
-error[E0277]: the trait bound `S: rocket::http::uri::Ignorable<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `S: Ignorable<rocket::http::uri::Query>` is not satisfied
    --> $DIR/typed-uri-bad-type.rs:36:29
     |
 36  | fn other_q(id: usize, rest: S) {  }
-    |                             ^ the trait `rocket::http::uri::Ignorable<rocket::http::uri::Query>` is not implemented for `S`
+    |                             ^ the trait `Ignorable<rocket::http::uri::Query>` is not implemented for `S`
 ...
 63  |     uri!(other_q: rest = _, id = 100);
     |     ---------------------------------- in this macro invocation
@@ -114,15 +114,15 @@ error[E0277]: the trait bound `S: rocket::http::uri::Ignorable<rocket::http::uri
    ::: $WORKSPACE/core/http/src/uri/uri_display.rs
     |
     | pub fn assert_ignorable<P: UriPart, T: Ignorable<P>>() {  }
-    |                                        ------------ required by this bound in `rocket::http::uri::assert_ignorable`
+    |                                        ------------ required by this bound in `assert_ignorable`
     |
     = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `usize: rocket::http::uri::Ignorable<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `usize: Ignorable<rocket::http::uri::Query>` is not satisfied
    --> $DIR/typed-uri-bad-type.rs:36:16
     |
 36  | fn other_q(id: usize, rest: S) {  }
-    |                ^^^^^ the trait `rocket::http::uri::Ignorable<rocket::http::uri::Query>` is not implemented for `usize`
+    |                ^^^^^ the trait `Ignorable<rocket::http::uri::Query>` is not implemented for `usize`
 ...
 65  |     uri!(other_q: rest = S, id = _);
     |     -------------------------------- in this macro invocation
@@ -130,36 +130,36 @@ error[E0277]: the trait bound `usize: rocket::http::uri::Ignorable<rocket::http:
    ::: $WORKSPACE/core/http/src/uri/uri_display.rs
     |
     | pub fn assert_ignorable<P: UriPart, T: Ignorable<P>>() {  }
-    |                                        ------------ required by this bound in `rocket::http::uri::assert_ignorable`
+    |                                        ------------ required by this bound in `assert_ignorable`
     |
     = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `S: rocket::http::uri::FromUriParam<rocket::http::uri::Query, _>` is not satisfied
+error[E0277]: the trait bound `S: FromUriParam<rocket::http::uri::Query, _>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:65:26
    |
 65 |     uri!(other_q: rest = S, id = _);
-   |                          ^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
+   |                          ^ the trait `FromUriParam<rocket::http::uri::Query, _>` is not implemented for `S`
 
-error[E0277]: the trait bound `std::option::Option<i32>: rocket::http::uri::FromUriParam<rocket::http::uri::Query, {integer}>` is not satisfied
+error[E0277]: the trait bound `std::option::Option<i32>: FromUriParam<rocket::http::uri::Query, {integer}>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:69:28
    |
 69 |     uri!(optionals_q: id = 10, name = "Bob".to_string());
-   |                            ^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, {integer}>` is not implemented for `std::option::Option<i32>`
+   |                            ^^ the trait `FromUriParam<rocket::http::uri::Query, {integer}>` is not implemented for `std::option::Option<i32>`
    |
    = help: the following implementations were found:
-             <std::option::Option<T> as rocket::http::uri::FromUriParam<rocket::http::uri::Path, A>>
+             <std::option::Option<T> as FromUriParam<rocket::http::uri::Path, A>>
-             <std::option::Option<T> as rocket::http::uri::FromUriParam<rocket::http::uri::Query, std::option::Option<A>>>
+             <std::option::Option<T> as FromUriParam<rocket::http::uri::Query, std::option::Option<A>>>
-             <std::option::Option<T> as rocket::http::uri::FromUriParam<rocket::http::uri::Query, std::result::Result<A, E>>>
+             <std::option::Option<T> as FromUriParam<rocket::http::uri::Query, std::result::Result<A, E>>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`
 
-error[E0277]: the trait bound `std::result::Result<std::string::String, &rocket::http::RawStr>: rocket::http::uri::FromUriParam<rocket::http::uri::Query, std::string::String>` is not satisfied
+error[E0277]: the trait bound `std::result::Result<std::string::String, &RawStr>: FromUriParam<rocket::http::uri::Query, std::string::String>` is not satisfied
   --> $DIR/typed-uri-bad-type.rs:69:39
    |
 69 |     uri!(optionals_q: id = 10, name = "Bob".to_string());
-   |                                       ^^^^^ the trait `rocket::http::uri::FromUriParam<rocket::http::uri::Query, std::string::String>` is not implemented for `std::result::Result<std::string::String, &rocket::http::RawStr>`
+   |                                       ^^^^^ the trait `FromUriParam<rocket::http::uri::Query, std::string::String>` is not implemented for `std::result::Result<std::string::String, &RawStr>`
    |
    = help: the following implementations were found:
-             <std::result::Result<T, E> as rocket::http::uri::FromUriParam<rocket::http::uri::Path, A>>
+             <std::result::Result<T, E> as FromUriParam<rocket::http::uri::Path, A>>
-             <std::result::Result<T, E> as rocket::http::uri::FromUriParam<rocket::http::uri::Query, std::option::Option<A>>>
+             <std::result::Result<T, E> as FromUriParam<rocket::http::uri::Query, std::option::Option<A>>>
-             <std::result::Result<T, E> as rocket::http::uri::FromUriParam<rocket::http::uri::Query, std::result::Result<A, E>>>
+             <std::result::Result<T, E> as FromUriParam<rocket::http::uri::Query, std::result::Result<A, E>>>
-   = note: required by `rocket::http::uri::FromUriParam::from_uri_param`
+   = note: required by `from_uri_param`

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

@@ -1,58 +1,58 @@
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
  --> $DIR/uri_display_type_errors.rs:6:13
   |
 6 | struct Bar1(BadType);
-  |             ^^^^^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
+  |             ^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
   |
-  = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&BadType`
+  = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
 
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
   --> $DIR/uri_display_type_errors.rs:10:5
    |
 10 |     field: BadType,
-   |     ^^^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
+   |     ^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
 
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
   --> $DIR/uri_display_type_errors.rs:16:5
    |
 16 |     bad: BadType,
-   |     ^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
+   |     ^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
 
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
   --> $DIR/uri_display_type_errors.rs:21:11
    |
 21 |     Inner(BadType),
-   |           ^^^^^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
+   |           ^^^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
   --> $DIR/uri_display_type_errors.rs:27:9
    |
 27 |         field: BadType,
-   |         ^^^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
+   |         ^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Query>` is not satisfied
   --> $DIR/uri_display_type_errors.rs:35:9
    |
 35 |         other: BadType,
-   |         ^^^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
+   |         ^^^^^ the trait `UriDisplay<rocket::http::uri::Query>` is not implemented for `BadType`
    |
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&BadType`
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Query>` for `&&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Query>` for `&&BadType`
 
-error[E0277]: the trait bound `BadType: rocket::http::uri::UriDisplay<rocket::http::uri::Path>` is not satisfied
+error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::Path>` is not satisfied
   --> $DIR/uri_display_type_errors.rs:40:12
    |
 40 | struct Baz(BadType);
-   |            ^^^^^^^ the trait `rocket::http::uri::UriDisplay<rocket::http::uri::Path>` is not implemented for `BadType`
+   |            ^^^^^^^ the trait `UriDisplay<rocket::http::uri::Path>` is not implemented for `BadType`
    |
-   = note: required because of the requirements on the impl of `rocket::http::uri::UriDisplay<rocket::http::uri::Path>` for `&BadType`
+   = note: required because of the requirements on the impl of `UriDisplay<rocket::http::uri::Path>` for `&BadType`