bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify LhsExpr::Unparsed.

Browse source 
By making the `AttrWrapper` non-optional.
This commit is contained in:
Nicholas Nethercote 2024-06-19 16:06:16 +10:00
parent aaa220e875
commit 43eae4cef4
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,8 +70,8 @@ macro_rules! maybe_whole_expr {
#[derive(Debug)] #[derive(Debug)]
pub(super) enum LhsExpr { pub(super) enum LhsExpr {
// Already parsed either (a) nothing or (b) just the outer attributes. // Already parsed just the outer attributes.
Unparsed { attrs: Option<AttrWrapper> }, Unparsed { attrs: AttrWrapper },
// Already parsed the expression. // Already parsed the expression.
Parsed { expr: P<Expr>, starts_statement: bool }, Parsed { expr: P<Expr>, starts_statement: bool },
} }
@ -136,6 +136,7 @@ impl<'a> Parser<'a> {
r: Restrictions, r: Restrictions,
attrs: Option<AttrWrapper>, attrs: Option<AttrWrapper>,
) -> PResult<'a, P<Expr>> { ) -> PResult<'a, P<Expr>> {
let attrs = self.parse_or_use_outer_attributes(attrs)?;
self.with_res(r, |this| this.parse_expr_assoc_with(0, LhsExpr::Unparsed { attrs })) self.with_res(r, |this| this.parse_expr_assoc_with(0, LhsExpr::Unparsed { attrs }))
} }
@ -152,7 +153,6 @@ impl<'a> Parser<'a> {
expr expr
} }
LhsExpr::Unparsed { attrs } => { LhsExpr::Unparsed { attrs } => {
let attrs = self.parse_or_use_outer_attributes(attrs)?;
if self.token.is_range_separator() { if self.token.is_range_separator() {
return self.parse_expr_prefix_range(attrs); return self.parse_expr_prefix_range(attrs);
} else { } else {
@ -295,10 +295,8 @@ impl<'a> Parser<'a> {
Fixity::None => 1, Fixity::None => 1,
}; };
let rhs = self.with_res(restrictions - Restrictions::STMT_EXPR, |this| { let rhs = self.with_res(restrictions - Restrictions::STMT_EXPR, |this| {
this.parse_expr_assoc_with( let attrs = this.parse_outer_attributes()?;
prec + prec_adjustment, this.parse_expr_assoc_with(prec + prec_adjustment, LhsExpr::Unparsed { attrs })
LhsExpr::Unparsed { attrs: None },
)
})?; })?;
let span = self.mk_expr_sp(&lhs, lhs_span, rhs.span); let span = self.mk_expr_sp(&lhs, lhs_span, rhs.span);
@ -471,8 +469,9 @@ impl<'a> Parser<'a> {
) -> PResult<'a, P<Expr>> { ) -> PResult<'a, P<Expr>> {
let rhs = if self.is_at_start_of_range_notation_rhs() { let rhs = if self.is_at_start_of_range_notation_rhs() {
let maybe_lt = self.token.clone(); let maybe_lt = self.token.clone();
let attrs = self.parse_outer_attributes()?;
Some( Some(
self.parse_expr_assoc_with(prec + 1, LhsExpr::Unparsed { attrs: None }) self.parse_expr_assoc_with(prec + 1, LhsExpr::Unparsed { attrs })
.map_err(|err| self.maybe_err_dotdotlt_syntax(maybe_lt, err))?, .map_err(|err| self.maybe_err_dotdotlt_syntax(maybe_lt, err))?,
) )
} else { } else {
@ -528,9 +527,10 @@ impl<'a> Parser<'a> {
this.bump(); this.bump();
let (span, opt_end) = if this.is_at_start_of_range_notation_rhs() { let (span, opt_end) = if this.is_at_start_of_range_notation_rhs() {
// RHS must be parsed with more associativity than the dots. // RHS must be parsed with more associativity than the dots.
let attrs = this.parse_outer_attributes()?;
this.parse_expr_assoc_with( this.parse_expr_assoc_with(
op.unwrap().precedence() + 1, op.unwrap().precedence() + 1,
LhsExpr::Unparsed { attrs: None }, LhsExpr::Unparsed { attrs },
) )
.map(|x| (lo.to(x.span), Some(x))) .map(|x| (lo.to(x.span), Some(x)))
.map_err(|err| this.maybe_err_dotdotlt_syntax(maybe_lt, err))? .map_err(|err| this.maybe_err_dotdotlt_syntax(maybe_lt, err))?
@ -2639,9 +2639,10 @@ impl<'a> Parser<'a> {
} else { } else {
self.expect(&token::Eq)?; self.expect(&token::Eq)?;
} }
let attrs = self.parse_outer_attributes()?;
let expr = self.parse_expr_assoc_with( let expr = self.parse_expr_assoc_with(
1 + prec_let_scrutinee_needs_par(), 1 + prec_let_scrutinee_needs_par(),
LhsExpr::Unparsed { attrs: None }, LhsExpr::Unparsed { attrs },
)?; )?;
let span = lo.to(expr.span); let span = lo.to(expr.span);
Ok(self.mk_expr(span, ExprKind::Let(pat, expr, span, recovered))) Ok(self.mk_expr(span, ExprKind::Let(pat, expr, span, recovered)))