bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #103986 - compiler-errors:oh-no-bad-block-should-not-have-label, r=lcnr

Browse source 
Don't silently eat label before block in block-like expr

Fixes #103983
cc #92823 (where the regression was introduced)
This commit is contained in:
Dylan DPC 2022-11-07 18:35:24 +05:30 • committed by GitHub
commit 170ad4a0ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 227 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -2468,11 +2468,15 @@ impl<'a> Parser<'a> {
}
pub(crate) fn maybe_recover_unexpected_block_label(&mut self) -> bool {
let Some(label) = self.eat_label().filter(|_| {
self.eat(&token::Colon) && self.token.kind == token::OpenDelim(Delimiter::Brace)
}) else {
// Check for `'a : {`
if !(self.check_lifetime()
&& self.look_ahead(1, |tok| tok.kind == token::Colon)
&& self.look_ahead(2, |tok| tok.kind == token::OpenDelim(Delimiter::Brace)))
{
return false;
};
}
let label = self.eat_label().expect("just checked if a label exists");
self.bump(); // eat `:`
let span = label.ident.span.to(self.prev_token.span);
let mut err = self.struct_span_err(span, "block label not supported here");
err.span_label(span, "not supported here");