Combine projection and opaque into alias

2022-11-26 21:51:55 +00:00
parent c13bd83528
commit 61adaf8187
104 changed files with 387 additions and 381 deletions
--- a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
+++ b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
@@ -697,7 +697,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                    .map_bound(|p| p.predicates),
                None,
            ),
-            ty::Opaque(ty::AliasTy { def_id, substs }) => {
+            ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => {
                find_fn_kind_from_did(tcx.bound_explicit_item_bounds(*def_id), Some(*substs))
            }
            ty::Closure(_, substs) => match substs.as_closure().kind() {