squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Compare Tys directly instead of their TyKinds

Browse source
This commit is contained in:
flip1995 2019-04-03 16:08:04 +02:00
parent 076abfa0f3
commit c81ce069b4
No known key found for this signature in database
GPG key ID: 693086869D506637
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_typeck/astconv.rs
View file

@ -591,7 +591,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o {
);
let is_object = self_ty.map_or(false, |ty| {
ty.sty == self.tcx().types.trait_object_dummy_self.sty
ty == self.tcx().types.trait_object_dummy_self
});
let default_needs_object_self = |param: &ty::GenericParamDef| {
if let GenericParamDefKind::Type { has_default, .. } = param.kind {
@ -956,7 +956,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o {
/// removing the dummy `Self` type (`trait_object_dummy_self`).
fn trait_ref_to_existential(&self, trait_ref: ty::TraitRef<'tcx>)
-> ty::ExistentialTraitRef<'tcx> {
if trait_ref.self_ty().sty != self.tcx().types.trait_object_dummy_self.sty {
if trait_ref.self_ty() != self.tcx().types.trait_object_dummy_self {
bug!("trait_ref_to_existential called on {:?} with non-dummy Self", trait_ref);
}
ty::ExistentialTraitRef::erase_self_ty(self.tcx(), trait_ref)