Skip to content

Commit fe819a0

Browse files
committed
Collect occurrences of for mismatched braces diagnostic
Change-Id: I20ba0b62308370ee961141fa1aefc4b9c9f0cb3a
1 parent 888d0ba commit fe819a0

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

src/libsyntax/parse/lexer/tokentrees.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<'a> TokenTreesReader<'a> {
126126
let (open_brace, open_brace_span) = self.open_braces.pop().unwrap();
127127
let close_brace_span = self.token.span;
128128

129-
if close_brace_span.lo() == open_brace_span.hi() {
129+
if tts.is_empty() {
130130
let empty_block_span = open_brace_span.to(close_brace_span);
131131
self.last_delim_empty_block_spans.insert(delim, empty_block_span);
132132
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
fn main() {}
1+
fn main() {
2+
3+
}
24
let _ = ();
35
} //~ ERROR unexpected close delimiter
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
error: unexpected close delimiter: `}`
2-
--> $DIR/mismatched-delim-brace-empty-block.rs:3:1
2+
--> $DIR/mismatched-delim-brace-empty-block.rs:5:1
33
|
4-
LL | fn main() {}
5-
| -- this block is empty, you might have not meant to close it
6-
LL | let _ = ();
7-
LL | }
8-
| ^ unexpected close delimiter
4+
LL | fn main() {
5+
| ___________-
6+
LL | |
7+
LL | | }
8+
| |_- this block is empty, you might have not meant to close it
9+
LL | let _ = ();
10+
LL | }
11+
| ^ unexpected close delimiter
912

1013
error: aborting due to previous error
1114

0 commit comments

Comments
 (0)