Auto merge of #3609 - codeworm96:fix_test, r=phansch

bors · bors · commit 0fc5857d0b21 · 2019-01-02T16:40:10.000Z
Fix test for rust-lang/rust#57250 Part of rust-lang/rust#57250. ~~Do not merge. Waiting a nightly with that PR merged.~~
diff --git a/tests/ui/builtin-type-shadow.stderr b/tests/ui/builtin-type-shadow.stderr
@@ -12,7 +12,7 @@ error[E0308]: mismatched types
 LL | fn foo<u32>(a: u32) -> u32 {
    |                        --- expected `u32` because of return type
 LL |     42
-   |     ^^ expected type parameter, found integral variable
+   |     ^^ expected type parameter, found integer
    |
    = note: expected type `u32`
               found type `{integer}`

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