Update UI test output for latest rustc.

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

@@ -116,8 +116,11 @@ error[E0728]: `await` is only allowed inside `async` functions and blocks
 error[E0308]: mismatched types
   --> tests/ui-fail-nightly/async-entry.rs:35:9
    |
+33 |     async fn rocket() -> String {
+   |                          ------ expected `std::string::String` because of return type
+34 |         let _ = rocket::build().launch().await;
 35 |         rocket::build()
-   |         ^^^^^^^^^^^^^^^ expected struct `String`, found struct `Rocket`
+   |         ^^^^^^^^^^^^^^^ expected `String`, found `Rocket<Build>`
    |
    = note: expected struct `std::string::String`
               found struct `Rocket<Build>`
@@ -125,8 +128,11 @@ error[E0308]: mismatched types
 error[E0308]: mismatched types
   --> tests/ui-fail-nightly/async-entry.rs:44:9
    |
+42 |     async fn rocket() -> _ {
+   |                          - expected `Rocket<Build>` because of return type
+43 |         let _ = rocket::build().launch().await;
 44 |         "hi".to_string()
-   |         ^^^^^^^^^^^^^^^^ expected struct `Rocket`, found struct `String`
+   |         ^^^^^^^^^^^^^^^^ expected `Rocket<Build>`, found `String`
    |
    = note: expected struct `Rocket<Build>`
               found struct `std::string::String`
@@ -142,11 +148,29 @@ error[E0308]: mismatched types
 26 | |     }
    | |     ^- help: consider using a semicolon here: `;`
    | |_____|
-   |       expected `()`, found struct `Rocket`
+   |       expected `()`, found `Rocket<Build>`
    |
    = note: expected unit type `()`
                  found struct `Rocket<Build>`
 
+error[E0308]: mismatched types
+  --> tests/ui-fail-nightly/async-entry.rs:35:9
+   |
+35 |         rocket::build()
+   |         ^^^^^^^^^^^^^^^ expected `String`, found `Rocket<Build>`
+   |
+   = note: expected struct `std::string::String`
+              found struct `Rocket<Build>`
+
+error[E0308]: mismatched types
+  --> tests/ui-fail-nightly/async-entry.rs:44:9
+   |
+44 |         "hi".to_string()
+   |         ^^^^^^^^^^^^^^^^ expected `Rocket<Build>`, found `String`
+   |
+   = note: expected struct `Rocket<Build>`
+              found struct `std::string::String`
+
 error[E0277]: `main` has invalid return type `Rocket<Build>`
   --> tests/ui-fail-nightly/async-entry.rs:94:20
    |

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

@@ -68,7 +68,7 @@ error[E0308]: arguments to this function are incorrect
 30 | fn f3(_request: &Request, other: bool) { }
    |    ^^           --------         ---- an argument of type `bool` is missing
    |                 |
-   |                 argument of type `Status` unexpected
+   |                 unexpected argument of type `Status`
    |
 note: function defined here
   --> tests/ui-fail-nightly/catch.rs:30:4

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

@@ -432,7 +432,7 @@ error[E0308]: mismatched types
    --> tests/ui-fail-nightly/from_form.rs:147:24
     |
 147 |     #[field(validate = 123)]
-    |                        ^^^ expected enum `Result`, found integer
+    |                        ^^^ expected `Result<(), Errors<'_>>`, found integer
     |
     = note: expected enum `Result<(), Errors<'_>>`
                found type `{integer}`
@@ -449,7 +449,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 `String`
+    |            ^^^^^^ expected `&TempFile<'_>`, found `&String`
     |
     = note: expected reference `&TempFile<'_>`
                found reference `&std::string::String`
@@ -463,9 +463,9 @@ error[E0308]: arguments to this function are incorrect
    --> tests/ui-fail-nightly/from_form.rs:165:24
     |
 165 |     #[field(validate = ext("hello"))]
-    |                        ^^^ ------- expected struct `ContentType`, found `&str`
+    |                        ^^^ ------- expected `ContentType`, found `&str`
 166 |     first: String,
-    |            ------ expected enum `TempFile`, found struct `String`
+    |            ------ expected `&TempFile<'_>`, found `&String`
     |
     = note: expected reference `&TempFile<'_>`
                found reference `&std::string::String`
@@ -481,7 +481,7 @@ error[E0308]: mismatched types
 171 |     #[field(default = 123)]
     |                       ^^^- help: try using a conversion method: `.to_string()`
     |                       |
-    |                       expected struct `String`, found integer
+    |                       expected `String`, found integer
     |                       arguments to this enum variant are incorrect
     |
 help: the type constructed contains `{integer}` due to the type of the argument passed
@@ -501,7 +501,7 @@ error[E0308]: mismatched types
 203 |     #[field(default_with = Some("hi"))]
     |                            ---- ^^^^- help: try using a conversion method: `.to_string()`
     |                            |    |
-    |                            |    expected struct `String`, found `&str`
+    |                            |    expected `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

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

@@ -13,7 +13,7 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
             NonZeroI16
             NonZeroI32
             NonZeroI64
-          and 30 others
+          and $N others
 
 error[E0277]: the trait bound `Q: FromSegments<'_>` is not satisfied
  --> tests/ui-fail-nightly/route-type-errors.rs:9:12
@@ -42,7 +42,7 @@ error[E0277]: the trait bound `Q: FromFormField<'_>` is not satisfied
              Cow<'v, str>
              IpAddr
              Ipv4Addr
-           and 38 others
+           and $N others
    = note: required for `Q` to implement `FromForm<'_>`
 
 error[E0277]: the trait bound `Q: FromFormField<'_>` is not satisfied
@@ -60,7 +60,7 @@ error[E0277]: the trait bound `Q: FromFormField<'_>` is not satisfied
              Cow<'v, str>
              IpAddr
              Ipv4Addr
-           and 38 others
+           and $N others
    = note: required for `Q` to implement `FromForm<'_>`
 
 error[E0277]: the trait bound `Q: FromData<'_>` is not satisfied
@@ -76,9 +76,9 @@ error[E0277]: the trait bound `Q: FromData<'_>` is not satisfied
              Capped<&'r RawStr>
              Capped<&'r [u8]>
              Capped<&'r str>
-             Capped<Cow<'impl0, str>>
-             Capped<TempFile<'impl0>>
-           and 12 others
+             Capped<Cow<'_, str>>
+             Capped<TempFile<'_>>
+           and $N others
 
 error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
   --> tests/ui-fail-nightly/route-type-errors.rs:21:10
@@ -95,7 +95,7 @@ error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
              &'r rocket::State<T>
              &'r rocket::http::Accept
              &'r rocket::http::CookieJar<'r>
-           and 8 others
+           and $N others
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> tests/ui-fail-nightly/route-type-errors.rs:21:18
@@ -112,7 +112,7 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
              NonZeroI16
              NonZeroI32
              NonZeroI64
-           and 30 others
+           and $N others
 
 error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
   --> tests/ui-fail-nightly/route-type-errors.rs:24:10
@@ -129,7 +129,7 @@ error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied
              &'r rocket::State<T>
              &'r rocket::http::Accept
              &'r rocket::http::CookieJar<'r>
-           and 8 others
+           and $N others
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> tests/ui-fail-nightly/route-type-errors.rs:24:18
@@ -146,7 +146,7 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
              NonZeroI16
              NonZeroI32
              NonZeroI64
-           and 30 others
+           and $N others
 
 error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
   --> tests/ui-fail-nightly/route-type-errors.rs:24:39
@@ -163,4 +163,4 @@ error[E0277]: the trait bound `Q: FromParam<'_>` is not satisfied
              NonZeroI16
              NonZeroI32
              NonZeroI64
-           and 30 others
+           and $N others

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

@@ -2,13 +2,13 @@ error[E0271]: type mismatch resolving `<String as FromParam<'_>>::Error == &str`
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:22:37
    |
 22 | fn optionals(id: Option<i32>, name: Result<String, &str>) {  }
-   |                                     ^^^^^^^^^^^^^^^^^^^^ expected enum `Infallible`, found `&str`
+   |                                     ^^^^^^^^^^^^^^^^^^^^ expected `Infallible`, found `&str`
 
 error[E0271]: type mismatch resolving `<String as FromParam<'_>>::Error == &str`
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:22:37
    |
 22 | fn optionals(id: Option<i32>, name: Result<String, &str>) {  }
-   |                                     ^^^^^^^^^^^^^^^^^^^^ expected `&str`, found enum `Infallible`
+   |                                     ^^^^^^^^^^^^^^^^^^^^ expected `&str`, found `Infallible`
 
 error[E0277]: the trait bound `usize: FromUriParam<rocket::http::uri::fmt::Path, &str>` is not satisfied
   --> tests/ui-fail-nightly/typed-uri-bad-type.rs:45:22

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

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

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

@@ -518,9 +518,6 @@ error[E0308]: mismatched types
     |
 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
@@ -533,9 +530,6 @@ error[E0308]: mismatched types
     |
 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

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

@@ -76,8 +76,8 @@ error[E0277]: the trait bound `Q: FromData<'_>` is not satisfied
              Capped<&'r RawStr>
              Capped<&'r [u8]>
              Capped<&'r str>
-             Capped<Cow<'impl0, str>>
-             Capped<TempFile<'impl0>>
+             Capped<Cow<'_, str>>
+             Capped<TempFile<'_>>
            and $N others
 
 error[E0277]: the trait bound `Q: FromRequest<'_>` is not satisfied