bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use DefIdTree instead of open-coding it.

Browse source
This commit is contained in:
Camille GILLOT 2022-07-27 22:06:30 +02:00
parent 421bb6ac62
commit 48bae9360f
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_resolve/src/late/lifetimes.rs
View file

@ -1437,13 +1437,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
// Figure out if this is a type/trait segment, // Figure out if this is a type/trait segment,
// which requires object lifetime defaults. // which requires object lifetime defaults.
let parent_def_id = |this: &mut Self, def_id: DefId| {
let def_key = this.tcx.def_key(def_id);
DefId { krate: def_id.krate, index: def_key.parent.expect("missing parent") }
};
let type_def_id = match res { let type_def_id = match res {
Res::Def(DefKind::AssocTy, def_id) if depth == 1 => Some(parent_def_id(self, def_id)), Res::Def(DefKind::AssocTy, def_id) if depth == 1 => Some(self.tcx.parent(def_id)),
Res::Def(DefKind::Variant, def_id) if depth == 0 => Some(parent_def_id(self, def_id)), Res::Def(DefKind::Variant, def_id) if depth == 0 => Some(self.tcx.parent(def_id)),
Res::Def( Res::Def(
DefKind::Struct DefKind::Struct
| DefKind::Union | DefKind::Union