about summary refs log tree commit diff
path: root/src/test/ui/rfc-2005-default-binding-mode
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-21 17:53:19 +0000
committerbors <bors@rust-lang.org>2019-11-21 17:53:19 +0000
commit53712f8637dbe326df569a90814aae1cc5429710 (patch)
tree3ffee9436fa178bcc3d74251c686074cbd8a4c04 /src/test/ui/rfc-2005-default-binding-mode
parent35ef33a89dfd8ff8c8a7b3c58fa7136bbcb2f1ed (diff)
parent468722b33c589ade04a11f05f53d0f3bff6c7a99 (diff)
downloadrust-53712f8637dbe326df569a90814aae1cc5429710.tar.gz
rust-53712f8637dbe326df569a90814aae1cc5429710.zip
Auto merge of #66389 - estebank:type-err-labels, r=petrochenkov
Specific labels when referring to "expected" and "found" types
Diffstat (limited to 'src/test/ui/rfc-2005-default-binding-mode')
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/const.stderr5
-rw-r--r--src/test/ui/rfc-2005-default-binding-mode/lit.stderr12
2 files changed, 7 insertions, 10 deletions
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/src/test/ui/rfc-2005-default-binding-mode/const.stderr
index 210b4f6be63..f25fc300d7f 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/const.stderr
@@ -2,10 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/const.rs:14:9
    |
 LL |         FOO => {},
-   |         ^^^ expected &Foo, found struct `Foo`
-   |
-   = note: expected type `&Foo`
-              found type `Foo`
+   |         ^^^ expected `&Foo`, found struct `Foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
index 9be1876b714..b0d60c7a4c8 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
@@ -2,19 +2,19 @@ error[E0308]: mismatched types
   --> $DIR/lit.rs:7:13
    |
 LL |             "abc" => true,
-   |             ^^^^^ expected &str, found str
+   |             ^^^^^ expected `&str`, found `str`
    |
-   = note: expected type `&&str`
-              found type `&'static str`
+   = note:   expected type `&&str`
+           found reference `&'static str`
 
 error[E0308]: mismatched types
   --> $DIR/lit.rs:16:9
    |
 LL |         b"abc" => true,
-   |         ^^^^^^ expected &[u8], found array of 3 elements
+   |         ^^^^^^ expected `&[u8]`, found array `[u8; 3]`
    |
-   = note: expected type `&&[u8]`
-              found type `&'static [u8; 3]`
+   = note:   expected type `&&[u8]`
+           found reference `&'static [u8; 3]`
 
 error: aborting due to 2 previous errors