Skip to content

Commit af16794

Browse files
committed
Revert "Dropping "block is empty..." error message on incorrect closing delimiter #70583"
This reverts commit 811d817.
1 parent 811d817 commit af16794

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/librustc_parse/lexer/tokentrees.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ impl<'a> TokenTreesReader<'a> {
7777

7878
fn parse_token_tree(&mut self) -> PResult<'a, TreeAndJoint> {
7979
let sm = self.string_reader.sess.source_map();
80-
8180
match self.token.kind {
8281
token::Eof => {
8382
let msg = "this file contains an unclosed delimiter";
@@ -217,16 +216,21 @@ impl<'a> TokenTreesReader<'a> {
217216

218217
Ok(TokenTree::Delimited(delim_span, delim, tts).into())
219218
}
220-
token::CloseDelim(_delim) => {
219+
token::CloseDelim(delim) => {
221220
// An unexpected closing delimiter (i.e., there is no
222221
// matching opening delimiter).
223222
let token_str = token_to_string(&self.token);
224223
let msg = format!("unexpected closing delimiter: `{}`", token_str);
225224
let mut err =
226225
self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, &msg);
227226

227+
if let Some(span) = self.last_delim_empty_block_spans.remove(&delim) {
228+
err.span_label(
229+
span,
230+
"this block is empty, you might have not meant to close it",
231+
);
232+
}
228233
err.span_label(self.token.span, "unexpected closing delimiter");
229-
230234
Err(err)
231235
}
232236
_ => {

0 commit comments

Comments
 (0)