diff options
| author | bors <bors@rust-lang.org> | 2022-11-20 04:28:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-20 04:28:21 +0000 |
| commit | 2ed65da15279d25e8b8b91d60162930ab48f16f6 (patch) | |
| tree | 2704d1527822c0bba74acea1fba9122ba20b8c4c /compiler/rustc_parse/src | |
| parent | 7477c1f4f7d6bef037d523099b240d22aa1b63a0 (diff) | |
| parent | d553811c1fcaad51219457713c27ef4c070889e2 (diff) | |
| download | rust-2ed65da15279d25e8b8b91d60162930ab48f16f6.tar.gz rust-2ed65da15279d25e8b8b91d60162930ab48f16f6.zip | |
Auto merge of #104629 - JohnTitor:rollup-vp3m98i, r=JohnTitor
Rollup of 6 pull requests Successful merges: - #103901 (Add tracking issue for `const_arguments_as_str`) - #104112 (rustdoc: Add copy to the description of repeat) - #104435 (`VecDeque::resize` should re-use the buffer in the passed-in element) - #104467 (Fix substraction with overflow in `wrong_number_of_generic_args.rs`) - #104608 (Cleanup macro matching recovery) - #104626 (Fix doctest errors related to rustc_middle) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 9f680a60613..fe7401786a0 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -2078,12 +2078,7 @@ impl<'a> Parser<'a> { if self.token.kind == TokenKind::Semi && matches!(self.token_cursor.frame.delim_sp, Some((Delimiter::Parenthesis, _))) - // HACK: This is needed so we can detect whether we're inside a macro, - // where regular assumptions about what tokens can follow other tokens - // don't necessarily apply. && self.may_recover() - // FIXME(Nilstrieb): Remove this check once `may_recover` actually stops recovery - && self.subparser_name.is_none() { // It is likely that the closure body is a block but where the // braces have been removed. We will recover and eat the next |