diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-04-13 11:10:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 11:10:43 +0200 |
| commit | e40d7e6d8453013b25f079c577e4a3a5c7c3ab1b (patch) | |
| tree | b40d8443af4839bfc2c6bd2dedf5779f44f9fbea /compiler/rustc_parse/src/parser | |
| parent | cf67c9bbf79d7f94af2a361fda666426e5e8d400 (diff) | |
| parent | 4dfaa784332f0fee3e64a75602fd44ad10527dff (diff) | |
| download | rust-e40d7e6d8453013b25f079c577e4a3a5c7c3ab1b.tar.gz rust-e40d7e6d8453013b25f079c577e4a3a5c7c3ab1b.zip | |
Rollup merge of #84140 - b-naber:parser_past_eof, r=varkor
Don't call bump in check_mistyped_turbofish_with_multiple_type_params Fixes https://github.com/rust-lang/rust/issues/84117
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index 77e85c06ff5..70a5ac6f15e 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -666,21 +666,23 @@ impl<'a> Parser<'a> { ); match x { Ok((_, _, false)) => { - self.bump(); // `>` - match self.parse_expr() { - Ok(_) => { - e.span_suggestion_verbose( - binop.span.shrink_to_lo(), - TURBOFISH_SUGGESTION_STR, - "::".to_string(), - Applicability::MaybeIncorrect, - ); - e.emit(); - *expr = self.mk_expr_err(expr.span.to(self.prev_token.span)); - return Ok(()); - } - Err(mut err) => { - err.cancel(); + if self.eat(&token::Gt) { + match self.parse_expr() { + Ok(_) => { + e.span_suggestion_verbose( + binop.span.shrink_to_lo(), + TURBOFISH_SUGGESTION_STR, + "::".to_string(), + Applicability::MaybeIncorrect, + ); + e.emit(); + *expr = + self.mk_expr_err(expr.span.to(self.prev_token.span)); + return Ok(()); + } + Err(mut err) => { + err.cancel(); + } } } } |
