Collect occurrences of for mismatched braces diagnostic

Change-Id: I20ba0b62308370ee961141fa1aefc4b9c9f0cb3a

diff --git a/src/libsyntax/parse/lexer/tokentrees.rs b/src/libsyntax/parse/lexer/tokentrees.rs
index b088d160b923e9a2b32760669809e2e921446155..b4dd23c9f9b0f90b338589b8ffba372e4321ea2f 100644 (file)
--- a/src/libsyntax/parse/lexer/tokentrees.rs
+++ b/src/libsyntax/parse/lexer/tokentrees.rs
@@ -126,7 +126,7 @@ fn parse_token_tree(&mut self) -> PResult<'a, TreeAndJoint> {
                         let (open_brace, open_brace_span) = self.open_braces.pop().unwrap();
                         let close_brace_span = self.token.span;
 
-                        if close_brace_span.lo() == open_brace_span.hi() {
+                        if tts.is_empty() {
                             let empty_block_span = open_brace_span.to(close_brace_span);
                             self.last_delim_empty_block_spans.insert(delim, empty_block_span);
                         }

diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.rs b/src/test/ui/parser/mismatched-delim-brace-empty-block.rs
index bcc95c09e1e9910f155661d7841d0e7b8d9c118d..0f5a2cb09ecc4cb9027cfa162fc1bc2f1b376352 100644 (file)
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.rs
+++ b/src/test/ui/parser/mismatched-delim-brace-empty-block.rs
@@ -1,3 +1,5 @@
-fn main() {}
+fn main() {
+
+}
     let _ = ();
 } //~ ERROR unexpected close delimiter

diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr b/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
index 82fe8930c325fcf2436fa6c243a5b7f6ad827144..5ae5fc91a4e8a9f78062dce2cd2911fe42bee9e7 100644 (file)
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
+++ b/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
@@ -1,11 +1,14 @@
 error: unexpected close delimiter: `}`
-  --> $DIR/mismatched-delim-brace-empty-block.rs:3:1
+  --> $DIR/mismatched-delim-brace-empty-block.rs:5:1
    |
-LL | fn main() {}
-   |           -- this block is empty, you might have not meant to close it
-LL |     let _ = ();
-LL | }
-   | ^ unexpected close delimiter
+LL |   fn main() {
+   |  ___________-
+LL | |
+LL | | }
+   | |_- this block is empty, you might have not meant to close it
+LL |       let _ = ();
+LL |   }
+   |   ^ unexpected close delimiter
 
 error: aborting due to previous error