diff options
| author | bors <bors@rust-lang.org> | 2022-04-28 01:37:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-28 01:37:03 +0000 |
| commit | 81799cd8fd841e23b52876ae5e22faeb3ad04eb5 (patch) | |
| tree | c71d7bc6f9a603865bdcdc32361ded0f199f686f /compiler/rustc_parse/src/parser/expr.rs | |
| parent | c95346b8ac8f10927b4aec31e61d45c75b10ba74 (diff) | |
| parent | 89db345859a3f4e33aa334713767e79870319369 (diff) | |
| download | rust-81799cd8fd841e23b52876ae5e22faeb3ad04eb5.tar.gz rust-81799cd8fd841e23b52876ae5e22faeb3ad04eb5.zip | |
Auto merge of #96495 - Dylan-DPC:rollup-9lm4tpp, r=Dylan-DPC
Rollup of 7 pull requests
Successful merges:
- #96377 (make `fn() -> _ { .. }` suggestion MachineApplicable)
- #96397 (Make EncodeWide implement FusedIterator)
- #96421 (Less `NoDelim`)
- #96432 (not need `Option` for `dbg_scope`)
- #96466 (Better error messages when collecting into `[T; n]`)
- #96471 (replace let else with `?`)
- #96483 (Add missing `target_feature` to the list of well known cfg names)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser/expr.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 7efc0ca2da2..e4370809ebc 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -2043,7 +2043,8 @@ impl<'a> Parser<'a> { self.sess.gated_spans.gate(sym::async_closure, span); } - if self.token.kind == TokenKind::Semi && self.token_cursor.frame.delim == DelimToken::Paren + if self.token.kind == TokenKind::Semi + && matches!(self.token_cursor.frame.delim_sp, Some((DelimToken::Paren, _))) { // It is likely that the closure body is a block but where the // braces have been removed. We will recover and eat the next |