From 6041ed077556bf26bb429ba8bdff8708aff70d14 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Tue, 2 Aug 2022 15:27:46 -0300 Subject: [PATCH] No need to check binders to ignore on new_named_lifetime_with_res's LifetimeRes::Param --- compiler/rustc_ast_lowering/src/lib.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index 163c84ae57b9..0ee2ffd271e0 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -1907,16 +1907,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { debug!(?self.captured_lifetimes); let name = match res { - LifetimeRes::Param { mut param, binder } => { + LifetimeRes::Param { mut param, .. } => { let p_name = ParamName::Plain(ident); if let Some(mut captured_lifetimes) = self.captured_lifetimes.take() { - if !captured_lifetimes.binders_to_ignore.contains(&binder) { - match captured_lifetimes.captures.entry(param) { - Entry::Occupied(o) => param = self.local_def_id(o.get().1), - Entry::Vacant(_) => { - panic!("Lifetime {:?} should have a def_id at this point", id); - } - } + if let Entry::Occupied(o) = captured_lifetimes.captures.entry(param) { + param = self.local_def_id(o.get().1); } self.captured_lifetimes = Some(captured_lifetimes);