Suggest macro call when not sure that it is fn definition

14 files changed, 15 insertions, 13 deletions

diff --git a/src/test/parse-fail/doc-after-struct-field.rs b/src/test/parse-fail/doc-after-struct-field.rs
index 1aa6af5b78f..8babf4daadd 100644
--- a/src/test/parse-fail/doc-after-struct-field.rs
+++ b/src/test/parse-fail/doc-after-struct-field.rs
@@ -16,5 +16,5 @@ struct X {
 }
 
 fn main() {
-    let y = X {a = 1};
+    let y = X {a: 1};
 }
diff --git a/src/test/parse-fail/doc-before-struct-rbrace-1.rs b/src/test/parse-fail/doc-before-struct-rbrace-1.rs
index 5ba83190c8e..6d9b4b05ad9 100644
--- a/src/test/parse-fail/doc-before-struct-rbrace-1.rs
+++ b/src/test/parse-fail/doc-before-struct-rbrace-1.rs
@@ -17,5 +17,5 @@ struct X {
 }
 
 fn main() {
-    let y = X {a = 1};
+    let y = X {a: 1};
 }
diff --git a/src/test/parse-fail/doc-before-struct-rbrace-2.rs b/src/test/parse-fail/doc-before-struct-rbrace-2.rs
index 643e4aa17a1..63b2f963799 100644
--- a/src/test/parse-fail/doc-before-struct-rbrace-2.rs
+++ b/src/test/parse-fail/doc-before-struct-rbrace-2.rs
@@ -16,5 +16,5 @@ struct X {
 }
 
 fn main() {
-    let y = X {a = 1};
+    let y = X {a: 1};
 }
diff --git a/src/test/parse-fail/issue-22647.rs b/src/test/parse-fail/issue-22647.rs
index 1ace57edba3..3da9d1a8712 100644
--- a/src/test/parse-fail/issue-22647.rs
+++ b/src/test/parse-fail/issue-22647.rs
@@ -16,6 +16,7 @@ fn main() {
         println!("Y {}",x);
         return x;
     };
+    //~^ ERROR expected item, found `;`
 
     caller(bar_handler);
 }
diff --git a/src/test/parse-fail/issue-22712.rs b/src/test/parse-fail/issue-22712.rs
index ed936cdd9a9..84d4a757a07 100644
--- a/src/test/parse-fail/issue-22712.rs
+++ b/src/test/parse-fail/issue-22712.rs
@@ -14,6 +14,6 @@ struct Foo<B> {
 
 fn bar() {
     let Foo<Vec<u8>>  //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `<`
-}
+}  //~ ERROR expected item, found `}`
 
 fn main() {}
diff --git a/src/test/parse-fail/issue-24197.rs b/src/test/parse-fail/issue-24197.rs
index 37d62182612..b6bc3a29e06 100644
--- a/src/test/parse-fail/issue-24197.rs
+++ b/src/test/parse-fail/issue-24197.rs
@@ -10,4 +10,4 @@
 
 fn main() {
     let buf[0] = 0; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[`
-}
+}  //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/mut-patterns.rs b/src/test/parse-fail/mut-patterns.rs
index 71d826c67f8..ffb45597552 100644
--- a/src/test/parse-fail/mut-patterns.rs
+++ b/src/test/parse-fail/mut-patterns.rs
@@ -15,4 +15,5 @@
 pub fn main() {
     struct Foo { x: isize }
     let mut Foo { x: x } = Foo { x: 3 }; //~ ERROR: expected one of `:`, `;`, `=`, or `@`, found `{`
+    //~^ ERROR expected item, found `=`
 }
diff --git a/src/test/parse-fail/pat-lt-bracket-5.rs b/src/test/parse-fail/pat-lt-bracket-5.rs
index 3345845eee9..95ad006402e 100644
--- a/src/test/parse-fail/pat-lt-bracket-5.rs
+++ b/src/test/parse-fail/pat-lt-bracket-5.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    let v[0] = v[1]; //~ error: expected one of `:`, `;`, `=`, or `@`, found `[`
-}
+    let v[0] = v[1]; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[`
+} //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/pat-ranges-1.rs b/src/test/parse-fail/pat-ranges-1.rs
index 857a3924aec..7a42f453c74 100644
--- a/src/test/parse-fail/pat-ranges-1.rs
+++ b/src/test/parse-fail/pat-ranges-1.rs
@@ -12,4 +12,4 @@
 
 fn main() {
     let macropus!() ..= 11 = 12; //~ error: expected one of `:`, `;`, or `=`, found `..=`
-}
+} //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/pat-ranges-2.rs b/src/test/parse-fail/pat-ranges-2.rs
index 64c749333cf..ad0a3b3b67f 100644
--- a/src/test/parse-fail/pat-ranges-2.rs
+++ b/src/test/parse-fail/pat-ranges-2.rs
@@ -12,4 +12,4 @@
 
 fn main() {
     let 10 ..= makropulos!() = 12; //~ error: expected one of `::`, `:`, `;`, or `=`, found `!`
-}
+} //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/pat-ranges-3.rs b/src/test/parse-fail/pat-ranges-3.rs
index 1327a9fab36..4a9a12bcdd2 100644
--- a/src/test/parse-fail/pat-ranges-3.rs
+++ b/src/test/parse-fail/pat-ranges-3.rs
@@ -12,4 +12,4 @@
 
 fn main() {
     let 10 ..= 10 + 3 = 12; //~ expected one of `:`, `;`, or `=`, found `+`
-}
+} //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/pat-ranges-4.rs b/src/test/parse-fail/pat-ranges-4.rs
index c159c770250..32fdc263b2d 100644
--- a/src/test/parse-fail/pat-ranges-4.rs
+++ b/src/test/parse-fail/pat-ranges-4.rs
@@ -13,4 +13,4 @@
 fn main() {
     let 10 - 3 ..= 10 = 8;
     //~^ error: expected one of `...`, `..=`, `..`, `:`, `;`, or `=`, found `-`
-}
+} //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/range-3.rs b/src/test/parse-fail/range-3.rs
index 95aa71b0cdf..f413ac34087 100644
--- a/src/test/parse-fail/range-3.rs
+++ b/src/test/parse-fail/range-3.rs
@@ -15,4 +15,4 @@
 pub fn main() {
     let r = 1..2..3;
     //~^ ERROR expected one of `.`, `;`, `?`, or an operator, found `..`
-}
+} //~ ERROR expected item, found `}`
diff --git a/src/test/parse-fail/range-4.rs b/src/test/parse-fail/range-4.rs
index 4500df116a2..0b385129b23 100644
--- a/src/test/parse-fail/range-4.rs
+++ b/src/test/parse-fail/range-4.rs
@@ -15,4 +15,4 @@
 pub fn main() {
     let r = ..1..2;
     //~^ ERROR expected one of `.`, `;`, `?`, or an operator, found `..`
-}
+} //~ ERROR expected item, found `}`