diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-29 13:16:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-29 13:16:06 +0100 |
| commit | 031a2143f0ef78e9b080b20481507ec0268e7bab (patch) | |
| tree | 3f09df0b5e60fd60fadea3fd1a8cd8abee15bbb1 /compiler/rustc_parse/src/parser/expr.rs | |
| parent | 98f2409c82a9527428abd6514aba36444f8428dc (diff) | |
| parent | 62c8e3144a8bc7d07d66bc14c8a7cce94a3dbce5 (diff) | |
| download | rust-031a2143f0ef78e9b080b20481507ec0268e7bab.tar.gz rust-031a2143f0ef78e9b080b20481507ec0268e7bab.zip | |
Rollup merge of #106242 - estebank:diff-markers, r=jyn514
Detect diff markers in the parser Partly address #32059.
Diffstat (limited to 'compiler/rustc_parse/src/parser/expr.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 6a115088eca..1fc1ffd6cb6 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -3039,6 +3039,7 @@ impl<'a> Parser<'a> { /// Parses `ident (COLON expr)?`. fn parse_expr_field(&mut self) -> PResult<'a, ExprField> { let attrs = self.parse_outer_attributes()?; + self.recover_diff_marker(); self.collect_tokens_trailing_token(attrs, ForceCollect::No, |this, attrs| { let lo = this.token.span; |