bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Collapse placeholders to root universe in canonicalizer if not preserving universes

Browse source
This commit is contained in:
Michael Goulet 2023-02-17 21:15:18 +00:00
parent f4a4a31479
commit ec40b1a393
3 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_infer/src/infer/canonical/canonicalizer.rs
View file

@ -418,10 +418,15 @@ impl<'cx, 'tcx> TypeFolder<TyCtxt<'tcx>> for Canonicalizer<'cx, 'tcx> {
bug!("encountered a fresh type during canonicalization")
}
ty::Placeholder(placeholder) => self.canonicalize_ty_var(
CanonicalVarInfo { kind: CanonicalVarKind::PlaceholderTy(placeholder) },
t,
),
ty::Placeholder(mut placeholder) => {
if !self.canonicalize_mode.preserve_universes() {
placeholder.universe = ty::UniverseIndex::ROOT;
}
self.canonicalize_ty_var(
CanonicalVarInfo { kind: CanonicalVarKind::PlaceholderTy(placeholder) },
t,
)
}
ty::Bound(debruijn, _) => {
if debruijn >= self.binder_index {