Skip to content

Commit 811d817

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

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/librustc_parse/lexer/tokentrees.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ 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+
8081
match self.token.kind {
8182
token::Eof => {
8283
let msg = "this file contains an unclosed delimiter";
@@ -216,21 +217,16 @@ impl<'a> TokenTreesReader<'a> {
216217

217218
Ok(TokenTree::Delimited(delim_span, delim, tts).into())
218219
}
219-
token::CloseDelim(delim) => {
220+
token::CloseDelim(_delim) => {
220221
// An unexpected closing delimiter (i.e., there is no
221222
// matching opening delimiter).
222223
let token_str = token_to_string(&self.token);
223224
let msg = format!("unexpected closing delimiter: `{}`", token_str);
224225
let mut err =
225226
self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, &msg);
226227

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-
}
233228
err.span_label(self.token.span, "unexpected closing delimiter");
229+
234230
Err(err)
235231
}
236232
_ => {

0 commit comments

Comments
 (0)