Auto merge of #116923 - fmease:rollup-ev7q387, r=fmease

bors · bors · commit 643af4a1850c · 2023-10-19T03:52:32.000Z
Rollup of 7 pull requests

Successful merges:

 - #116663 (Don't ICE when encountering unresolved regions in `fully_resolve`)
 - #116761 (Fix podman detection in CI scripts)
 - #116795 (Add `#[track_caller]` to `Option::unwrap_or_else`)
 - #116829 (Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd`)
 - #116883 (Change my name in mailmap)
 - #116908 (Tweak wording of type errors involving type params)
 - #116912 (Some renaming nits for `rustc_type_ir`)

r? `@ghost`
`@rustbot` modify labels: rollup
diff --git a/tests/ui/builtin_type_shadow.stderr b/tests/ui/builtin_type_shadow.stderr
@@ -13,7 +13,7 @@ error[E0308]: mismatched types
 LL | fn foo<u32>(a: u32) -> u32 {
    |        ---             --- expected `u32` because of return type
    |        |
-   |        this type parameter
+   |        expected this type parameter
 LL |     42
    |     ^^ expected type parameter `u32`, found integer
    |

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ error[E0308]: mismatched types`
`13`	`13`	`LL \| fn foo<u32>(a: u32) -> u32 {`
`14`	`14`	\| --- --- expected `u32` because of return type
`15`	`15`	`\| \|`
`16`		`- \| this type parameter`
	`16`	`+ \| expected this type parameter`
`17`	`17`	`LL \| 42`
`18`	`18`	\| ^^ expected type parameter `u32`, found integer
`19`	`19`	`\|`