about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-01-02 16:40:10 +0000
committerbors <bors@rust-lang.org>2019-01-02 16:40:10 +0000
commit0fc5857d0b2150e2427f4e76b155e00997d6250c (patch)
tree578ad66579fa81254e92f218e41be956db27a3e2
parent3de9a3de540c0c394870b81e8d0a6a98725c3f9f (diff)
parent5f9a65ffd69318d0a400a2f21e72e72444f1ac4a (diff)
downloadrust-0fc5857d0b2150e2427f4e76b155e00997d6250c.tar.gz
rust-0fc5857d0b2150e2427f4e76b155e00997d6250c.zip
Auto merge of #3609 - codeworm96:fix_test, r=phansch
Fix test for rust-lang/rust#57250

Part of rust-lang/rust#57250.
~~Do not merge. Waiting a nightly with that PR merged.~~
-rw-r--r--tests/ui/builtin-type-shadow.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/builtin-type-shadow.stderr b/tests/ui/builtin-type-shadow.stderr
index 9bfed9dbba8..940a6dc2bcc 100644
--- 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}`