mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move parse_or_use_outer_attributes out of parse_expr_prefix.

Browse Source 
This eliminates one `Option<AttrWrapper>` argument.
This commit is contained in:
Nicholas Nethercote 2024-06-19 14:41:01 +10:00
parent ead0a45202
commit 802779f77d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_parse/src/parser/expr.rs
View File

@ -155,6 +155,7 @@ impl<'a> Parser<'a> {
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 {
let attrs = self.parse_or_use_outer_attributes(attrs)?;
self.parse_expr_prefix(attrs)? self.parse_expr_prefix(attrs)?
} }
} }
@ -541,8 +542,7 @@ impl<'a> Parser<'a> {
} }
/// Parses a prefix-unary-operator expr. /// Parses a prefix-unary-operator expr.
fn parse_expr_prefix(&mut self, attrs: Option<AttrWrapper>) -> PResult<'a, P<Expr>> { fn parse_expr_prefix(&mut self, attrs: AttrWrapper) -> PResult<'a, P<Expr>> {
let attrs = self.parse_or_use_outer_attributes(attrs)?;
let lo = self.token.span; let lo = self.token.span;
macro_rules! make_it { macro_rules! make_it {
@ -591,7 +591,8 @@ impl<'a> Parser<'a> {
this.dcx().emit_err(err); this.dcx().emit_err(err);
this.bump(); this.bump();
this.parse_expr_prefix(None) let attrs = this.parse_outer_attributes()?;
this.parse_expr_prefix(attrs)
} }
// Recover from `++x`: // Recover from `++x`:
token::BinOp(token::Plus) token::BinOp(token::Plus)
@ -619,7 +620,8 @@ impl<'a> Parser<'a> {
fn parse_expr_prefix_common(&mut self, lo: Span) -> PResult<'a, (Span, P<Expr>)> { fn parse_expr_prefix_common(&mut self, lo: Span) -> PResult<'a, (Span, P<Expr>)> {
self.bump(); self.bump();
let expr = self.parse_expr_prefix(None)?; let attrs = self.parse_outer_attributes()?;
let expr = self.parse_expr_prefix(attrs)?;
let span = self.interpolated_or_expr_span(&expr); let span = self.interpolated_or_expr_span(&expr);
Ok((lo.to(span), expr)) Ok((lo.to(span), expr))
} }
@ -872,7 +874,8 @@ impl<'a> Parser<'a> {
let expr = if self.token.is_range_separator() { let expr = if self.token.is_range_separator() {
self.parse_expr_prefix_range(None) self.parse_expr_prefix_range(None)
} else { } else {
self.parse_expr_prefix(None) let attrs = self.parse_outer_attributes()?;
self.parse_expr_prefix(attrs)
}?; }?;
let hi = self.interpolated_or_expr_span(&expr); let hi = self.interpolated_or_expr_span(&expr);
let span = lo.to(hi); let span = lo.to(hi);