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

Change how parse_expr_force_collect works.

Browse source 
It now parses outer attributes before collecting tokens. This avoids the
problem where the outer attribute tokens were being stored twice -- for
the attribute tokesn, and also for the expression tokens.

Fixes #86055.
This commit is contained in:
Nicholas Nethercote 2024-06-19 17:33:46 +10:00
parent 8170acb197
commit 64c2e9ed3b
2 changed files with 6 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,9 +98,12 @@ impl<'a> Parser<'a> {
self.parse_expr_res(Restrictions::empty(), attrs)
}
/// Parses an expression, forcing tokens to be collected
/// Parses an expression, forcing tokens to be collected.
pub fn parse_expr_force_collect(&mut self) -> PResult<'a, P<Expr>> {
self.collect_tokens_no_attrs(|this| this.parse_expr())
self.current_closure.take();
let attrs = self.parse_outer_attributes()?;
self.collect_tokens_no_attrs(|this| this.parse_expr_res(Restrictions::empty(), attrs))
}
pub fn parse_expr_anon_const(&mut self) -> PResult<'a, AnonConst> {