user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Dropping "block is empty..." error message on incorrect closing delimiter #70583"

Browse source 
This reverts commit 811d817eaf.
This commit is contained in:
Kevin Per 2020-04-01 08:16:23 +02:00
parent 811d817eaf
commit af16794b2f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_parse/lexer/tokentrees.rs
View file

@ -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";
@ -217,7 +216,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);
@ -225,8 +224,13 @@ 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)
}
_ => {