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

Cleanup: Consistently use Param instead of Arg #62426

Browse source
This commit is contained in:
Kevin Per 2019-08-27 13:24:32 +02:00
parent 0444b9f66a
commit e0ce9f8c0a
53 changed files with 379 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libsyntax/parse/parser/expr.rs
View file

@ -7,7 +7,7 @@ use crate::maybe_recover_from_interpolated_ty_qpath;
use crate::ptr::P;
use crate::ast::{self, Attribute, AttrStyle, Ident, CaptureBy, BlockCheckMode};
use crate::ast::{Expr, ExprKind, RangeLimits, Label, Movability, IsAsync, Arm};
use crate::ast::{Ty, TyKind, FunctionRetTy, Arg, FnDecl};
use crate::ast::{Ty, TyKind, FunctionRetTy, Param, FnDecl};
use crate::ast::{BinOpKind, BinOp, UnOp};
use crate::ast::{Mac, AnonConst, Field};
@ -1157,7 +1157,7 @@ impl<'a> Parser<'a> {
&[&token::BinOp(token::Or), &token::OrOr],
SeqSep::trailing_allowed(token::Comma),
TokenExpectType::NoExpect,
|p| p.parse_fn_block_arg()
|p| p.parse_fn_block_param()
)?.0;
self.expect_or()?;
args
@ -1172,10 +1172,10 @@ impl<'a> Parser<'a> {
}))
}
/// Parses an argument in a lambda header (e.g., `|arg, arg|`).
fn parse_fn_block_arg(&mut self) -> PResult<'a, Arg> {
/// Parses a parameter in a lambda header (e.g., `|arg, arg|`).
fn parse_fn_block_param(&mut self) -> PResult<'a, Param> {
let lo = self.token.span;
let attrs = self.parse_arg_attributes()?;
let attrs = self.parse_param_attributes()?;
let pat = self.parse_pat(PARAM_EXPECTED)?;
let t = if self.eat(&token::Colon) {
self.parse_ty()?
@ -1187,7 +1187,7 @@ impl<'a> Parser<'a> {
})
};
let span = lo.to(self.token.span);
Ok(Arg {
Ok(Param {
attrs: attrs.into(),
ty: t,
pat,