Auto merge of #4565 - matthiaskrgr:rustup_16, r=phansch

bors · bors · commit dbb1bdea87e1 · 2019-09-22T10:36:32.000Z
rustup #64666 changelog: none
diff --git a/tests/ui/builtin-type-shadow.stderr b/tests/ui/builtin-type-shadow.stderr
@@ -16,6 +16,8 @@ LL |     42
    |
    = note: expected type `u32`
               found type `{integer}`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 
 error: aborting due to 2 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ LL \| 42`
`16`	`16`	`\|`
`17`	`17`	= note: expected type `u32`
`18`	`18`	found type `{integer}`
	`19`	`+ = help: type parameters must be constrained to match other types`
	`20`	`+ = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters`
`19`	`21`
`20`	`22`	`error: aborting due to 2 previous errors`
`21`	`23`