Update UI tests for latest rustc.

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

@@ -1,15 +1,15 @@
 error[E0277]: the trait bound `Unknown: Pool` is not satisfied
-  --> tests/ui-fail-stable/database-types.rs:7:10
+ --> tests/ui-fail-stable/database-types.rs:7:10
-   |
+  |
-7  | struct A(Unknown);
+7 | struct A(Unknown);
-   |          ^^^^^^^ the trait `Pool` is not implemented for `Unknown`
+  |          ^^^^^^^ the trait `Pool` is not implemented for `Unknown`
-   |
+  |
-   = help: the trait `Pool` is implemented for `deadpool::managed::Pool<M, C>`
+  = help: the trait `Pool` is implemented for `deadpool::managed::Pool<M, C>`
 note: required by a bound in `rocket_db_pools::Database::Pool`
-  --> $WORKSPACE/contrib/db_pools/lib/src/database.rs
+ --> $WORKSPACE/contrib/db_pools/lib/src/database.rs
-   |
+  |
-   |     type Pool: Pool;
+  |     type Pool: Pool;
-   |                ^^^^ required by this bound in `rocket_db_pools::Database::Pool`
+  |                ^^^^ required by this bound in `Database::Pool`
 
 error[E0277]: the trait bound `Vec<i32>: Pool` is not satisfied
   --> tests/ui-fail-stable/database-types.rs:11:10
@@ -22,4 +22,4 @@ note: required by a bound in `rocket_db_pools::Database::Pool`
   --> $WORKSPACE/contrib/db_pools/lib/src/database.rs
    |
    |     type Pool: Pool;
-   |                ^^^^ required by this bound in `rocket_db_pools::Database::Pool`
+   |                ^^^^ required by this bound in `Database::Pool`

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

@@ -9,7 +9,7 @@ note: required by a bound in `rocket_sync_db_pools::Connection`
  --> $WORKSPACE/contrib/sync_db_pools/lib/src/connection.rs
   |
   | pub struct Connection<K, C: Poolable> {
-  |                             ^^^^^^^^ required by this bound in `rocket_sync_db_pools::Connection`
+  |                             ^^^^^^^^ required by this bound in `Connection`
 
 error[E0277]: the trait bound `Vec<i32>: Poolable` is not satisfied
  --> tests/ui-fail-stable/database-types.rs:9:10
@@ -22,7 +22,7 @@ note: required by a bound in `rocket_sync_db_pools::Connection`
  --> $WORKSPACE/contrib/sync_db_pools/lib/src/connection.rs
   |
   | pub struct Connection<K, C: Poolable> {
-  |                             ^^^^^^^^ required by this bound in `rocket_sync_db_pools::Connection`
+  |                             ^^^^^^^^ required by this bound in `Connection`
 
 error[E0277]: the trait bound `Unknown: Poolable` is not satisfied
  --> tests/ui-fail-stable/database-types.rs:6:10

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

@@ -111,7 +111,7 @@ error[E0308]: mismatched types
   --> tests/ui-fail-stable/async-entry.rs:35:9
    |
 35 |         rocket::build()
-   |         ^^^^^^^^^^^^^^^ expected struct `std::string::String`, found struct `Rocket`
+   |         ^^^^^^^^^^^^^^^ expected struct `String`, found struct `Rocket`
    |
    = note: expected struct `std::string::String`
               found struct `Rocket<Build>`
@@ -120,7 +120,7 @@ error[E0308]: mismatched types
   --> tests/ui-fail-stable/async-entry.rs:44:9
    |
 44 |         "hi".to_string()
-   |         ^^^^^^^^^^^^^^^^ expected struct `Rocket`, found struct `std::string::String`
+   |         ^^^^^^^^^^^^^^^^ expected struct `Rocket`, found struct `String`
    |
    = note: expected struct `Rocket<Build>`
               found struct `std::string::String`
@@ -141,18 +141,6 @@ error[E0308]: mismatched types
    = note: expected unit type `()`
                  found struct `Rocket<Build>`
 
-error[E0308]: mismatched types
-  --> tests/ui-fail-stable/async-entry.rs:33:26
-   |
-33 |     async fn rocket() -> String {
-   |                          ^^^^^^
-   |                          |
-   |                          expected struct `Rocket`, found struct `std::string::String`
-   |                          expected due to this
-   |
-   = note: expected struct `Rocket<Build>`
-              found struct `std::string::String`
-
 error[E0277]: `main` has invalid return type `Rocket<Build>`
   --> tests/ui-fail-stable/async-entry.rs:94:20
    |

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

@@ -40,7 +40,7 @@ error[E0308]: mismatched types
   --> tests/ui-fail-stable/catch_type_errors.rs:16:17
    |
 16 | fn f3(_request: bool) -> usize {
-   |    --           ^^^^ expected `bool`, found `&rocket::Request<'_>`
+   |    --           ^^^^ expected `bool`, found `&Request<'_>`
    |    |
    |    arguments to this function are incorrect
    |

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

@@ -481,7 +481,7 @@ error[E0308]: mismatched types
 159 |     #[field(validate = ext(rocket::http::ContentType::HTML))]
     |                        --- arguments to this function are incorrect
 160 |     first: String,
-    |            ^^^^^^ expected enum `TempFile`, found struct `std::string::String`
+    |            ^^^^^^ expected enum `TempFile`, found struct `String`
     |
     = note: expected reference `&TempFile<'_>`
                found reference `&std::string::String`
@@ -497,7 +497,7 @@ error[E0308]: arguments to this function are incorrect
 165 |     #[field(validate = ext("hello"))]
     |                        ^^^ ------- expected struct `ContentType`, found `&str`
 166 |     first: String,
-    |            ------ expected enum `TempFile`, found struct `std::string::String`
+    |            ------ expected enum `TempFile`, found struct `String`
     |
     = note: expected reference `&TempFile<'_>`
                found reference `&std::string::String`
@@ -513,9 +513,14 @@ error[E0308]: mismatched types
 171 |     #[field(default = 123)]
     |                       ^^^- help: try using a conversion method: `.to_string()`
     |                       |
-    |                       expected struct `std::string::String`, found integer
+    |                       expected struct `String`, found integer
     |                       arguments to this enum variant are incorrect
     |
+help: the type constructed contains `{integer}` due to the type of the argument passed
+   --> tests/ui-fail-stable/from_form.rs:171:23
+    |
+171 |     #[field(default = 123)]
+    |                       ^^^ this argument influences the type of `Some`
 note: tuple variant defined here
    --> $RUST/core/src/option.rs
 
@@ -525,9 +530,16 @@ error[E0308]: mismatched types
 203 |     #[field(default_with = Some("hi"))]
     |                            ---- ^^^^- help: try using a conversion method: `.to_string()`
     |                            |    |
-    |                            |    expected struct `std::string::String`, found `&str`
+    |                            |    expected struct `String`, found `&str`
     |                            arguments to this enum variant are incorrect
     |
+help: the type constructed contains `&'static str` due to the type of the argument passed
+   --> tests/ui-fail-stable/from_form.rs:203:28
+    |
+203 |     #[field(default_with = Some("hi"))]
+    |                            ^^^^^----^
+    |                                 |
+    |                                 this argument influences the type of `Some`
 note: tuple variant defined here
    --> $RUST/core/src/option.rs
 

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

@@ -36,7 +36,7 @@ note: required by a bound in `rocket::Response::<'r>::set_header`
   --> $WORKSPACE/core/lib/src/response/response.rs
    |
    |     pub fn set_header<'h: 'r, H: Into<Header<'h>>>(&mut self, header: H) -> bool {
-   |                                  ^^^^^^^^^^^^^^^^ required by this bound in `rocket::Response::<'r>::set_header`
+   |                                  ^^^^^^^^^^^^^^^^ required by this bound in `Response::<'r>::set_header`
 
 error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
   --> tests/ui-fail-stable/responder-types.rs:16:5
@@ -76,7 +76,7 @@ note: required by a bound in `rocket::Response::<'r>::set_header`
   --> $WORKSPACE/core/lib/src/response/response.rs
    |
    |     pub fn set_header<'h: 'r, H: Into<Header<'h>>>(&mut self, header: H) -> bool {
-   |                                  ^^^^^^^^^^^^^^^^ required by this bound in `rocket::Response::<'r>::set_header`
+   |                                  ^^^^^^^^^^^^^^^^ required by this bound in `Response::<'r>::set_header`
 
 error[E0277]: the trait bound `Header<'_>: From<std::string::String>` is not satisfied
   --> tests/ui-fail-stable/responder-types.rs:24:5
@@ -99,7 +99,7 @@ note: required by a bound in `rocket::Response::<'r>::set_header`
   --> $WORKSPACE/core/lib/src/response/response.rs
    |
    |     pub fn set_header<'h: 'r, H: Into<Header<'h>>>(&mut self, header: H) -> bool {
-   |                                  ^^^^^^^^^^^^^^^^ required by this bound in `rocket::Response::<'r>::set_header`
+   |                                  ^^^^^^^^^^^^^^^^ required by this bound in `Response::<'r>::set_header`
 
 error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
   --> tests/ui-fail-stable/responder-types.rs:28:13
@@ -121,4 +121,4 @@ note: required by a bound in `route::handler::<impl Outcome<rocket::Response<'o>
   --> $WORKSPACE/core/lib/src/route/handler.rs
    |
    |     pub fn from<R: Responder<'r, 'o>>(req: &'r Request<'_>, responder: R) -> Outcome<'r> {
-   |                    ^^^^^^^^^^^^^^^^^ required by this bound in `route::handler::<impl Outcome<rocket::Response<'o>, Status, rocket::Data<'o>>>::from`
+   |                    ^^^^^^^^^^^^^^^^^ required by this bound in `route::handler::<impl Outcome<Response<'o>, Status, Data<'o>>>::from`

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

@@ -1,10 +1,10 @@
-error[E0271]: type mismatch resolving `<std::string::String as FromParam<'_>>::Error == &str`
+error[E0271]: type mismatch resolving `<String as FromParam<'_>>::Error == &str`
   --> tests/ui-fail-stable/typed-uri-bad-type.rs:22:37
    |
 22 | fn optionals(id: Option<i32>, name: Result<String, &str>) {  }
    |                                     ^^^^^^ expected enum `Infallible`, found `&str`
 
-error[E0271]: type mismatch resolving `<std::string::String as FromParam<'_>>::Error == &str`
+error[E0271]: type mismatch resolving `<String as FromParam<'_>>::Error == &str`
   --> tests/ui-fail-stable/typed-uri-bad-type.rs:22:37
    |
 22 | fn optionals(id: Option<i32>, name: Result<String, &str>) {  }

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

@@ -272,13 +272,13 @@ error: route expects 1 parameter but 0 were supplied
 21 |     uri!(has_one);
    |          ^^^^^^^
 
-error[E0271]: type mismatch resolving `<std::string::String as FromParam<'_>>::Error == &str`
+error[E0271]: type mismatch resolving `<String as FromParam<'_>>::Error == &str`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:15:37
    |
 15 | fn optionals(id: Option<i32>, name: Result<String, &str>) {  }
    |                                     ^^^^^^ expected enum `Infallible`, found `&str`
 
-error[E0271]: type mismatch resolving `<std::string::String as FromParam<'_>>::Error == &str`
+error[E0271]: type mismatch resolving `<String as FromParam<'_>>::Error == &str`
   --> tests/ui-fail-stable/typed-uris-bad-params.rs:15:37
    |
 15 | fn optionals(id: Option<i32>, name: Result<String, &str>) {  }

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

@@ -19,7 +19,7 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_
  --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
   |
   |     pub fn write_value<T: UriDisplay<P>>(&mut self, value: T) -> fmt::Result {
-  |                           ^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_value`
+  |                           ^^^^^^^^^^^^^ required by this bound in `Formatter::<'i, P>::write_value`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query>` is not satisfied
   --> tests/ui-fail-stable/uri_display_type_errors.rs:10:5
@@ -42,7 +42,7 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::ht
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
    |     pub fn write_named_value<T: UriDisplay<Query>>(&mut self, name: &str, value: T) -> fmt::Result {
-   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::http::uri::fmt::Query>::write_named_value`
+   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `Formatter::<'_, Query>::write_named_value`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query>` is not satisfied
   --> tests/ui-fail-stable/uri_display_type_errors.rs:16:5
@@ -65,7 +65,7 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::ht
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
    |     pub fn write_named_value<T: UriDisplay<Query>>(&mut self, name: &str, value: T) -> fmt::Result {
-   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::http::uri::fmt::Query>::write_named_value`
+   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `Formatter::<'_, Query>::write_named_value`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query>` is not satisfied
   --> tests/ui-fail-stable/uri_display_type_errors.rs:21:11
@@ -90,7 +90,7 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
    |     pub fn write_value<T: UriDisplay<P>>(&mut self, value: T) -> fmt::Result {
-   |                           ^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_value`
+   |                           ^^^^^^^^^^^^^ required by this bound in `Formatter::<'i, P>::write_value`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query>` is not satisfied
   --> tests/ui-fail-stable/uri_display_type_errors.rs:27:9
@@ -115,7 +115,7 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::ht
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
    |     pub fn write_named_value<T: UriDisplay<Query>>(&mut self, name: &str, value: T) -> fmt::Result {
-   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::http::uri::fmt::Query>::write_named_value`
+   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `Formatter::<'_, Query>::write_named_value`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Query>` is not satisfied
   --> tests/ui-fail-stable/uri_display_type_errors.rs:35:9
@@ -140,7 +140,7 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::ht
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
    |     pub fn write_named_value<T: UriDisplay<Query>>(&mut self, name: &str, value: T) -> fmt::Result {
-   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'_, rocket::http::uri::fmt::Query>::write_named_value`
+   |                                 ^^^^^^^^^^^^^^^^^ required by this bound in `Formatter::<'_, Query>::write_named_value`
 
 error[E0277]: the trait bound `BadType: UriDisplay<rocket::http::uri::fmt::Path>` is not satisfied
   --> tests/ui-fail-stable/uri_display_type_errors.rs:40:12
@@ -163,4 +163,4 @@ note: required by a bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_
   --> $WORKSPACE/core/http/src/uri/fmt/formatter.rs
    |
    |     pub fn write_value<T: UriDisplay<P>>(&mut self, value: T) -> fmt::Result {
-   |                           ^^^^^^^^^^^^^ required by this bound in `rocket::http::uri::fmt::Formatter::<'i, P>::write_value`
+   |                           ^^^^^^^^^^^^^ required by this bound in `Formatter::<'i, P>::write_value`