bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Refactor LhsExpr.

Browse source 
Combine `NotYetParsed` and `AttributesParsed` into a single variant,
because (a) that reflects the structure of the code that consumes
`LhsExpr`, and (b) because that variant will have the `Option` removed
in a later commit.
This commit is contained in:
Nicholas Nethercote 2024-06-18 20:40:27 +10:00
parent 42e47dfe82
commit 25523ba382
3 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -174,10 +174,7 @@ impl<'a> Parser<'a> {
// Perform this outside of the `collect_tokens_trailing_token` closure,
// since our outer attributes do not apply to this part of the expression
let expr = self.with_res(Restrictions::STMT_EXPR, |this| {
this.parse_expr_assoc_with(
0,
LhsExpr::AlreadyParsed { expr, starts_statement: true },
)
this.parse_expr_assoc_with(0, LhsExpr::Parsed { expr, starts_statement: true })
})?;
Ok(self.mk_stmt(lo.to(self.prev_token.span), StmtKind::Expr(expr)))
} else {
@ -210,10 +207,8 @@ impl<'a> Parser<'a> {
let e = self.mk_expr(lo.to(hi), ExprKind::MacCall(mac));
let e = self.maybe_recover_from_bad_qpath(e)?;
let e = self.parse_expr_dot_or_call_with(e, lo, attrs)?;
let e = self.parse_expr_assoc_with(
0,
LhsExpr::AlreadyParsed { expr: e, starts_statement: false },
)?;
let e = self
.parse_expr_assoc_with(0, LhsExpr::Parsed { expr: e, starts_statement: false })?;
StmtKind::Expr(e)
};
Ok(self.mk_stmt(lo.to(hi), kind))