Skip to content

Commit

Permalink
Revert "Dropping "block is empty..." error message on incorrect closi…
Browse files Browse the repository at this point in the history
…ng delimiter #70583"

This reverts commit 811d817.
  • Loading branch information
kper committed Apr 1, 2020
1 parent 811d817 commit af16794
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/librustc_parse/lexer/tokentrees.rs
Expand Up @@ -77,7 +77,6 @@ impl<'a> TokenTreesReader<'a> {

fn parse_token_tree(&mut self) -> PResult<'a, TreeAndJoint> {
let sm = self.string_reader.sess.source_map();

match self.token.kind {
token::Eof => {
let msg = "this file contains an unclosed delimiter";
Expand Down Expand Up @@ -217,16 +216,21 @@ impl<'a> TokenTreesReader<'a> {

Ok(TokenTree::Delimited(delim_span, delim, tts).into())
}
token::CloseDelim(_delim) => {
token::CloseDelim(delim) => {
// An unexpected closing delimiter (i.e., there is no
// matching opening delimiter).
let token_str = token_to_string(&self.token);
let msg = format!("unexpected closing delimiter: `{}`", token_str);
let mut err =
self.string_reader.sess.span_diagnostic.struct_span_err(self.token.span, &msg);

if let Some(span) = self.last_delim_empty_block_spans.remove(&delim) {
err.span_label(
span,
"this block is empty, you might have not meant to close it",
);
}
err.span_label(self.token.span, "unexpected closing delimiter");

Err(err)
}
_ => {
Expand Down

0 comments on commit af16794

Please sign in to comment.