user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pre intern the Self parameter type

Browse source 
Use this to simplify the object safety code a bit.
This commit is contained in:
Matthew Jasper 2019-08-12 22:15:12 +01:00
parent 165e460c92
commit 24587d20df
10 changed files with 35 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/clean/mod.rs
View file

@ -2303,7 +2303,7 @@ impl Clean<Item> for ty::AssocItem {
ty::ImplContainer(def_id) => {
cx.tcx.type_of(def_id)
}
ty::TraitContainer(_) => cx.tcx.mk_self_type()
ty::TraitContainer(_) => cx.tcx.types.self_param,
};
let self_arg_ty = *sig.input(0).skip_binder();
if self_arg_ty == self_ty {

2
src/librustdoc/clean/simplify.rs
View file

@ -150,7 +150,7 @@ fn trait_is_same_or_supertrait(cx: &DocContext<'_>, child: DefId,
}
let predicates = cx.tcx.super_predicates_of(child);
debug_assert!(cx.tcx.generics_of(child).has_self);
let self_ty = cx.tcx.mk_self_type();
let self_ty = cx.tcx.types.self_param;
predicates.predicates.iter().filter_map(|(pred, _)| {
if let ty::Predicate::Trait(ref pred) = *pred {
if pred.skip_binder().trait_ref.self_ty() == self_ty {