bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Extract create_and_capture_lifetime_defs function

Browse source
This commit is contained in:
Santiago Pastorino 2022-07-26 14:49:24 -03:00
parent fac763168f
commit 25825cd4fa
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 81 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

155
compiler/rustc_ast_lowering/src/lib.rs
View file

@ -1392,80 +1392,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
debug!(?lifetimes_in_bounds); debug!(?lifetimes_in_bounds);
debug!(?binders_to_ignore); debug!(?binders_to_ignore);
for lifetime in &lifetimes_in_bounds { lctx.create_and_capture_lifetime_defs(&lifetimes_in_bounds, &binders_to_ignore);
let ident = lifetime.ident;
let span = ident.span;
let res =
lctx.resolver.get_lifetime_res(lifetime.id).unwrap_or(LifetimeRes::Error);
debug!(?res);
if let Some(mut captured_lifetimes) = lctx.captured_lifetimes.take() {
match res {
LifetimeRes::Param { param, binder } => {
if !captured_lifetimes.binders_to_ignore.contains(&binder)
&& !binders_to_ignore
.get(&lifetime.id)
.unwrap_or(&Vec::new())
.contains(&binder)
{
match captured_lifetimes.captures.entry(param) {
Entry::Occupied(_) => {}
Entry::Vacant(v) => {
let node_id = lctx.next_node_id();
let name = ParamName::Plain(ident);
lctx.create_def(
captured_lifetimes.parent_def_id,
node_id,
DefPathData::LifetimeNs(name.ident().name),
);
v.insert((span, node_id, name, res));
}
}
}
}
LifetimeRes::Fresh { param, binder } => {
debug_assert_eq!(ident.name, kw::UnderscoreLifetime);
if !captured_lifetimes.binders_to_ignore.contains(&binder)
&& !binders_to_ignore
.get(&lifetime.id)
.unwrap_or(&Vec::new())
.contains(&binder)
{
let param = lctx.local_def_id(param);
match captured_lifetimes.captures.entry(param) {
Entry::Occupied(_) => {}
Entry::Vacant(v) => {
let node_id = lctx.next_node_id();
let name = ParamName::Fresh;
lctx.create_def(
captured_lifetimes.parent_def_id,
node_id,
DefPathData::LifetimeNs(kw::UnderscoreLifetime),
);
v.insert((span, node_id, name, res));
}
}
}
}
LifetimeRes::Infer | LifetimeRes::Static | LifetimeRes::Error => {}
res => panic!(
"Unexpected lifetime resolution {:?} for {:?} at {:?}",
res, lifetime.ident, lifetime.ident.span
),
}
lctx.captured_lifetimes = Some(captured_lifetimes);
}
}
let ret = lctx.lower_param_bounds(bounds, itctx, false); let ret = lctx.lower_param_bounds(bounds, itctx, false);
@ -1554,6 +1481,86 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
hir::OwnerNode::Item(self.arena.alloc(opaque_ty_item)) hir::OwnerNode::Item(self.arena.alloc(opaque_ty_item))
} }
fn create_and_capture_lifetime_defs(
&mut self,
lifetimes_in_bounds: &[&Lifetime],
binders_to_ignore: &FxHashMap<NodeId, Vec<NodeId>>,
) {
for lifetime in lifetimes_in_bounds {
let ident = lifetime.ident;
let span = ident.span;
let res = self.resolver.get_lifetime_res(lifetime.id).unwrap_or(LifetimeRes::Error);
debug!(?res);
if let Some(mut captured_lifetimes) = self.captured_lifetimes.take() {
match res {
LifetimeRes::Param { param, binder } => {
if !captured_lifetimes.binders_to_ignore.contains(&binder)
&& !binders_to_ignore
.get(&lifetime.id)
.unwrap_or(&Vec::new())
.contains(&binder)
{
match captured_lifetimes.captures.entry(param) {
Entry::Occupied(_) => {}
Entry::Vacant(v) => {
let node_id = self.next_node_id();
let name = ParamName::Plain(ident);
self.create_def(
captured_lifetimes.parent_def_id,
node_id,
DefPathData::LifetimeNs(name.ident().name),
);
v.insert((span, node_id, name, res));
}
}
}
}
LifetimeRes::Fresh { param, binder } => {
debug_assert_eq!(ident.name, kw::UnderscoreLifetime);
if !captured_lifetimes.binders_to_ignore.contains(&binder)
&& !binders_to_ignore
.get(&lifetime.id)
.unwrap_or(&Vec::new())
.contains(&binder)
{
let param = self.local_def_id(param);
match captured_lifetimes.captures.entry(param) {
Entry::Occupied(_) => {}
Entry::Vacant(v) => {
let node_id = self.next_node_id();
let name = ParamName::Fresh;
self.create_def(
captured_lifetimes.parent_def_id,
node_id,
DefPathData::LifetimeNs(kw::UnderscoreLifetime),
);
v.insert((span, node_id, name, res));
}
}
}
}
LifetimeRes::Infer | LifetimeRes::Static | LifetimeRes::Error => {}
res => panic!(
"Unexpected lifetime resolution {:?} for {:?} at {:?}",
res, lifetime.ident, lifetime.ident.span
),
}
self.captured_lifetimes = Some(captured_lifetimes);
}
}
}
fn lower_fn_params_to_names(&mut self, decl: &FnDecl) -> &'hir [Ident] { fn lower_fn_params_to_names(&mut self, decl: &FnDecl) -> &'hir [Ident] {
// Skip the `...` (`CVarArgs`) trailing arguments from the AST, // Skip the `...` (`CVarArgs`) trailing arguments from the AST,
// as they are not explicit in HIR/Ty function signatures. // as they are not explicit in HIR/Ty function signatures.