Expand test

diff --git a/src/test/ui/deref-suggestion.rs b/src/test/ui/deref-suggestion.rs
index f156766f528815a58f9caef68545f39200b1b82d..580410aecf4f8b0180cd796ac14a4c43db952926 100644 (file)
--- a/src/test/ui/deref-suggestion.rs
+++ b/src/test/ui/deref-suggestion.rs
@@ -38,7 +38,11 @@ fn main() {
     let u = 3;
     let s = S { u };
     //~^ ERROR mismatched types
+    let s = S { u: u };
+    //~^ ERROR mismatched types
     let i = &4;
     let r = R { i };
     //~^ ERROR mismatched types
+    let r = R { i: i };
+    //~^ ERROR mismatched types
 }

diff --git a/src/test/ui/deref-suggestion.stderr b/src/test/ui/deref-suggestion.stderr
index bd0ebfac5319d694d88c3746fae31dea21d8a6ac..9c49f541c9309b0c8ed4364cde7fd672b3a8e426 100644 (file)
--- a/src/test/ui/deref-suggestion.stderr
+++ b/src/test/ui/deref-suggestion.stderr
@@ -81,7 +81,19 @@ LL |     let s = S { u };
               found type `{integer}`
 
 error[E0308]: mismatched types
-  --> $DIR/deref-suggestion.rs:42:17
+  --> $DIR/deref-suggestion.rs:41:20
+   |
+LL |     let s = S { u: u };
+   |                    ^
+   |                    |
+   |                    expected &u32, found integer
+   |                    help: consider borrowing here: `&u`
+   |
+   = note: expected type `&u32`
+              found type `{integer}`
+
+error[E0308]: mismatched types
+  --> $DIR/deref-suggestion.rs:44:17
    |
 LL |     let r = R { i };
    |                 ^
@@ -92,6 +104,18 @@ LL |     let r = R { i };
    = note: expected type `u32`
               found type `&{integer}`
 
-error: aborting due to 8 previous errors
+error[E0308]: mismatched types
+  --> $DIR/deref-suggestion.rs:46:20
+   |
+LL |     let r = R { i: i };
+   |                    ^
+   |                    |
+   |                    expected u32, found &{integer}
+   |                    help: consider dereferencing the borrow: `*i`
+   |
+   = note: expected type `u32`
+              found type `&{integer}`
+
+error: aborting due to 10 previous errors
 
 For more information about this error, try `rustc --explain E0308`.