Skip to content

Commit 8b15c4b

Browse files
committed
rustc: remove type information from TraitDef.
1 parent 80b1a6f commit 8b15c4b

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

clean/inline.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,13 @@ pub fn record_extern_fqn(cx: &DocContext, did: DefId, kind: clean::TypeKind) {
151151
}
152152

153153
pub fn build_external_trait(cx: &DocContext, did: DefId) -> clean::Trait {
154-
let def = cx.tcx.lookup_trait_def(did);
155154
let trait_items = cx.tcx.associated_items(did).map(|item| item.clean(cx)).collect();
156155
let predicates = cx.tcx.item_predicates(did);
157-
let generics = (def.generics, &predicates).clean(cx);
156+
let generics = (cx.tcx.item_generics(did), &predicates).clean(cx);
158157
let generics = filter_non_trait_generics(did, generics);
159158
let (generics, supertrait_bounds) = separate_supertrait_bounds(generics);
160159
clean::Trait {
161-
unsafety: def.unsafety,
160+
unsafety: cx.tcx.lookup_trait_def(did).unsafety,
162161
generics: generics,
163162
items: trait_items,
164163
bounds: supertrait_bounds,

clean/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,9 +1407,8 @@ impl<'tcx> Clean<Item> for ty::AssociatedItem {
14071407
// are actually located on the trait/impl itself, so we need to load
14081408
// all of the generics from there and then look for bounds that are
14091409
// applied to this associated type in question.
1410-
let def = cx.tcx.lookup_trait_def(did);
14111410
let predicates = cx.tcx.item_predicates(did);
1412-
let generics = (def.generics, &predicates).clean(cx);
1411+
let generics = (cx.tcx.item_generics(did), &predicates).clean(cx);
14131412
generics.where_predicates.iter().filter_map(|pred| {
14141413
let (name, self_type, trait_, bounds) = match *pred {
14151414
WherePredicate::BoundPredicate {

0 commit comments

Comments
 (0)