bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove delayed bug when encountering label in bad turbofish

Browse source
This commit is contained in:
Michael Goulet 2022-01-25 10:47:10 -08:00
parent e7825f2b69
commit a090bb1dea
6 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -737,7 +737,7 @@ impl<'a> Parser<'a> {
"::".to_string(),
Applicability::MaybeIncorrect,
);
if self.check(&TokenKind::Semi) {
if matches!(self.token.kind, token::Semi | token::CloseDelim(_)) {
turbo_err.emit();
*expr = self.mk_expr_err(expr.span);
return Ok(());

5
compiler/rustc_parse/src/parser/expr.rs
View file

@ -1448,6 +1448,8 @@ impl<'a> Parser<'a> {
let lo = label.ident.span;
let label = Some(label);
let ate_colon = self.eat(&token::Colon);
let msg = "expected `while`, `for`, `loop` or `{` after a label";
let expr = if self.eat_keyword(kw::While) {
self.parse_while_expr(label, lo, attrs)
} else if self.eat_keyword(kw::For) {
@ -1457,13 +1459,12 @@ impl<'a> Parser<'a> {
} else if self.check(&token::OpenDelim(token::Brace)) || self.token.is_whole_block() {
self.parse_block_expr(label, lo, BlockCheckMode::Default, attrs)
} else if !ate_colon && (self.check(&TokenKind::Comma) || self.check(&TokenKind::Gt)) {
self.struct_span_err(self.token.span, msg).span_label(self.token.span, msg).emit();
// We're probably inside of a `Path<'a>` that needs a turbofish, so suppress the
// "must be followed by a colon" error.
self.diagnostic().delay_span_bug(lo, "this label wasn't parsed correctly");
consume_colon = false;
Ok(self.mk_expr_err(lo))
} else {
let msg = "expected `while`, `for`, `loop` or `{` after a label";
self.struct_span_err(self.token.span, msg).span_label(self.token.span, msg).emit();
// Continue as an expression in an effort to recover on `'label: non_block_expr`.
self.parse_expr()