bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Test generalization during coherence

Browse source
This commit is contained in:
Oli Scherer 2022-11-17 10:40:35 +00:00
parent 11adf03790
commit c16a90f5e3
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_infer/src/infer/combine.rs
View file

@ -548,7 +548,7 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
}
fn mark_ambiguous(&mut self) {
self.infcx.tcx.sess.delay_span_bug(self.cause.span, "we only generalize opaque types in situations where we already error for them elsewhere in coherence");
span_bug!(self.cause.span, "opaque types are handled in `tys`");
}
fn binders<T>(
@ -675,6 +675,10 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
// relatable.
Ok(t)
}
ty::Opaque(def_id, substs) => {
let s = self.relate(substs, substs)?;
Ok(if s == substs { t } else { self.infcx.tcx.mk_opaque(def_id, s) })
}
_ => relate::super_relate_tys(self, t, t),
}?;