nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 19:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #12327 - jonas-schievink:lambda-to-closure, r=jonas-schievink

Browse Source 
internal: Rename `Expr::Lambda` to `Expr::Closure`

They're never really called "Lambda"s in Rust, so let's call them "Closures" consistently.
This commit is contained in:
bors 2022-05-20 13:45:21 +00:00
commit c8d9a2dbdb
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/hir-def/src/body/lower.rs
View File

@ -452,7 +452,12 @@ impl ExprCollector<'_> {
.map(|it| Interned::new(TypeRef::from_ast(&self.ctx(), it)));
let body = self.collect_expr_opt(e.body());
self.alloc_expr(
Expr::Lambda { args: args.into(), arg_types: arg_types.into(), ret_type, body },
Expr::Closure {
args: args.into(),
arg_types: arg_types.into(),
ret_type,
body,
},
syntax_ptr,
)
}

2
crates/hir-def/src/body/scope.rs
View File

@ -197,7 +197,7 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope
let mut scope = scopes.new_labeled_scope(*scope, make_label(label));
compute_expr_scopes(*body_expr, body, scopes, &mut scope);
}
Expr::Lambda { args, body: body_expr, .. } => {
Expr::Closure { args, body: body_expr, .. } => {
let mut scope = scopes.new_scope(*scope);
scopes.add_params_bindings(body, scope, args);
compute_expr_scopes(*body_expr, body, scopes, &mut scope);

4
crates/hir-def/src/expr.rs
View File

@ -165,7 +165,7 @@ pub enum Expr {
base: ExprId,
index: ExprId,
},
Lambda {
Closure {
args: Box<[PatId]>,
arg_types: Box<[Option<Interned<TypeRef>>]>,
ret_type: Option<Interned<TypeRef>>,
@ -286,7 +286,7 @@ impl Expr {
f(expr);
}
}
Expr::Lambda { body, .. } => {
Expr::Closure { body, .. } => {
f(*body);
}
Expr::BinaryOp { lhs, rhs, .. } => {

4
crates/hir-ty/src/infer/expr.rs
View File

@ -218,7 +218,7 @@ impl<'a> InferenceContext<'a> {
self.diverges = Diverges::Maybe;
TyBuilder::unit()
}
Expr::Lambda { body, args, ret_type, arg_types } => {
Expr::Closure { body, args, ret_type, arg_types } => {
assert_eq!(args.len(), arg_types.len());
let mut sig_tys = Vec::new();
@ -1058,7 +1058,7 @@ impl<'a> InferenceContext<'a> {
for (idx, ((&arg, param_ty), expected_ty)) in
args.iter().zip(param_iter).zip(expected_iter).enumerate()
{
let is_closure = matches!(&self.body[arg], Expr::Lambda { .. });
let is_closure = matches!(&self.body[arg], Expr::Closure { .. });
if is_closure != check_closures {
continue;
}