Revert to correct recovery behavior

src/libsyntax/parse/parser.rs

@@ -4273,6 +4273,7 @@ impl<'a> Parser<'a> {
                 Err(mut err) => {
                     err.emit();
                     self.recover_stmt_(SemiColonMode::Ignore, BlockMode::Break);
+                    self.eat(&token::CloseDelim(token::Brace));
                     break;
                 }
                 Ok(stmt) => stmt,

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() {}

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 `}`
+}

src/test/parse-fail/pat-lt-bracket-5.rs

@@ -10,4 +10,4 @@
 
 fn main() {
     let v[0] = v[1]; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[`
-} //~ ERROR expected item, found `}`
+}

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 `}`
+}

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 `}`
+}

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 `}`
+}

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 `}`
+}

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 `}`
+}

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 `}`
+}