Skip to content

Commit 1dc4d1c

Browse files
Merge #10185
10185: minor: include `ImplLoc` in panic context r=jonas-schievink a=jonas-schievink cc #10084 bors r+ Co-authored-by: Jonas Schievink <[email protected]>
2 parents 22162aa + 8599317 commit 1dc4d1c

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

crates/hir_ty/src/lower.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -1421,8 +1421,13 @@ pub(crate) fn value_ty_query(db: &dyn HirDatabase, def: ValueTyDefId) -> Binders
14211421
}
14221422

14231423
pub(crate) fn impl_self_ty_query(db: &dyn HirDatabase, impl_id: ImplId) -> Binders<Ty> {
1424+
let impl_loc = impl_id.lookup(db.upcast());
14241425
let impl_data = db.impl_data(impl_id);
14251426
let resolver = impl_id.resolver(db.upcast());
1427+
let _cx = stdx::panic_context::enter(format!(
1428+
"impl_self_ty_query({:?} -> {:?} -> {:?})",
1429+
impl_id, impl_loc, impl_data
1430+
));
14261431
let generics = generics(db.upcast(), impl_id.into());
14271432
let ctx =
14281433
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
@@ -1448,10 +1453,13 @@ pub(crate) fn impl_self_ty_recover(
14481453
}
14491454

14501455
pub(crate) fn impl_trait_query(db: &dyn HirDatabase, impl_id: ImplId) -> Option<Binders<TraitRef>> {
1456+
let impl_loc = impl_id.lookup(db.upcast());
14511457
let impl_data = db.impl_data(impl_id);
14521458
let resolver = impl_id.resolver(db.upcast());
1453-
let _cx =
1454-
stdx::panic_context::enter(format!("impl_trait_query({:?} -> {:?})", impl_id, impl_data));
1459+
let _cx = stdx::panic_context::enter(format!(
1460+
"impl_trait_query({:?} -> {:?} -> {:?})",
1461+
impl_id, impl_loc, impl_data
1462+
));
14551463
let ctx =
14561464
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
14571465
let (self_ty, binders) = db.impl_self_ty(impl_id).into_value_and_skipped_binders();

0 commit comments

Comments
 (0)