fix rebase

Author: estebank

src/test/ui/async-await/issue-66387-if-without-else.stderr

@@ -4,10 +4,8 @@ error[E0317]: if may be missing an else clause
 LL | /     if true {
 LL | |         return 0;
 LL | |     }
-   | |_____^ expected (), found i32
+   | |_____^ expected `()`, found `i32`
    |
-   = note: expected type `()`
-              found type `i32`
    = note: `if` expressions without `else` evaluate to `()`
    = help: consider adding an `else` block that evaluates to the expected type
 

src/test/ui/proc-macro/span-preservation.stderr

@@ -33,10 +33,7 @@ error[E0308]: mismatched types
 LL | extern fn bar() {
    |                 - possibly return type missing here?
 LL |     0
-   |     ^ expected (), found integer
-   |
-   = note: expected type `()`
-              found type `{integer}`
+   |     ^ expected `()`, found integer
 
 error[E0308]: mismatched types
   --> $DIR/span-preservation.rs:44:5
@@ -52,21 +49,15 @@ error[E0308]: mismatched types
 LL | extern "Rust" fn rust_abi() {
    |                             - possibly return type missing here?
 LL |     0
-   |     ^ expected (), found integer
-   |
-   = note: expected type `()`
-              found type `{integer}`
+   |     ^ expected `()`, found integer
 
 error[E0308]: mismatched types
   --> $DIR/span-preservation.rs:54:5
    |
 LL | extern "\x43" fn c_abi_escaped() {
    |                                  - possibly return type missing here?
 LL |     0
-   |     ^ expected (), found integer
-   |
-   = note: expected type `()`
-              found type `{integer}`
+   |     ^ expected `()`, found integer
 
 error: aborting due to 8 previous errors