diff options
| -rw-r--r-- | src/librustc_parse/lexer/tokentrees.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/librustc_parse/lexer/tokentrees.rs b/src/librustc_parse/lexer/tokentrees.rs index b65b8941728..795512c21ed 100644 --- a/src/librustc_parse/lexer/tokentrees.rs +++ b/src/librustc_parse/lexer/tokentrees.rs @@ -77,6 +77,7 @@ 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"; @@ -216,7 +217,7 @@ 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); @@ -224,13 +225,8 @@ impl<'a> TokenTreesReader<'a> { 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) } _ => { |