bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Allow lower_lifetime_binder receive a closure

Browse source
This commit is contained in:
Santiago Pastorino 2022-08-18 14:26:59 -03:00
parent 3c72788461
commit 36fa12f1a4
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
2 changed files with 63 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

59
compiler/rustc_ast_lowering/src/expr.rs
View file

@ -847,21 +847,22 @@ impl<'hir> LoweringContext<'_, 'hir> {
(body_id, generator_option)
});
let bound_generic_params = self.lower_lifetime_binder(closure_id, generic_params);
// Lower outside new scope to preserve `is_in_loop_condition`.
let fn_decl = self.lower_fn_decl(decl, None, FnDeclKind::Closure, None);
self.lower_lifetime_binder(closure_id, generic_params, |lctx, bound_generic_params| {
// Lower outside new scope to preserve `is_in_loop_condition`.
let fn_decl = lctx.lower_fn_decl(decl, None, FnDeclKind::Closure, None);
let c = self.arena.alloc(hir::Closure {
binder: binder_clause,
capture_clause,
bound_generic_params,
fn_decl,
body: body_id,
fn_decl_span: self.lower_span(fn_decl_span),
movability: generator_option,
});
let c = lctx.arena.alloc(hir::Closure {
binder: binder_clause,
capture_clause,
bound_generic_params,
fn_decl,
body: body_id,
fn_decl_span: lctx.lower_span(fn_decl_span),
movability: generator_option,
});
hir::ExprKind::Closure(c)
hir::ExprKind::Closure(c)
})
}
fn generator_movability_for_fn(
@ -948,23 +949,23 @@ impl<'hir> LoweringContext<'_, 'hir> {
body_id
});
let bound_generic_params = self.lower_lifetime_binder(closure_id, generic_params);
self.lower_lifetime_binder(closure_id, generic_params, |lctx, bound_generic_params| {
// We need to lower the declaration outside the new scope, because we
// have to conserve the state of being inside a loop condition for the
// closure argument types.
let fn_decl = lctx.lower_fn_decl(&outer_decl, None, FnDeclKind::Closure, None);
// We need to lower the declaration outside the new scope, because we
// have to conserve the state of being inside a loop condition for the
// closure argument types.
let fn_decl = self.lower_fn_decl(&outer_decl, None, FnDeclKind::Closure, None);
let c = self.arena.alloc(hir::Closure {
binder: binder_clause,
capture_clause,
bound_generic_params,
fn_decl,
body,
fn_decl_span: self.lower_span(fn_decl_span),
movability: None,
});
hir::ExprKind::Closure(c)
let c = lctx.arena.alloc(hir::Closure {
binder: binder_clause,
capture_clause,
bound_generic_params,
fn_decl,
body,
fn_decl_span: lctx.lower_span(fn_decl_span),
movability: None,
});
hir::ExprKind::Closure(c)
})
}
/// Destructure the LHS of complex assignments.