diff options
| author | Michael Goulet <michael@errs.io> | 2022-11-26 21:21:20 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2022-12-13 17:34:44 +0000 |
| commit | 5c6afb850c29f5604f685bf4d4fea85a2deb7197 (patch) | |
| tree | b89915de1c6af256c67a1c2fe1fbdba8cb68cf70 /compiler/rustc_hir_analysis/src/variance/mod.rs | |
| parent | 7f3af726065d9eaabf93d87f22d97f60cca7a5f1 (diff) | |
| download | rust-5c6afb850c29f5604f685bf4d4fea85a2deb7197.tar.gz rust-5c6afb850c29f5604f685bf4d4fea85a2deb7197.zip | |
ProjectionTy.item_def_id -> ProjectionTy.def_id
Diffstat (limited to 'compiler/rustc_hir_analysis/src/variance/mod.rs')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/variance/mod.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compiler/rustc_hir_analysis/src/variance/mod.rs b/compiler/rustc_hir_analysis/src/variance/mod.rs index 8b2719c2f8a..9f8baa55bed 100644 --- a/compiler/rustc_hir_analysis/src/variance/mod.rs +++ b/compiler/rustc_hir_analysis/src/variance/mod.rs @@ -110,12 +110,13 @@ fn variance_of_opaque(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Varianc #[instrument(level = "trace", skip(self), ret)] fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> { - match t.kind() { - ty::Opaque(def_id, substs) => self.visit_opaque(*def_id, substs), + // FIXME(alias): merge these + match t.kind() { + ty::Opaque(ty::OpaqueTy { def_id, substs }) => self.visit_opaque(*def_id, substs), ty::Projection(proj) - if self.tcx.def_kind(proj.item_def_id) == DefKind::ImplTraitPlaceholder => + if self.tcx.def_kind(proj.def_id) == DefKind::ImplTraitPlaceholder => { - self.visit_opaque(proj.item_def_id, proj.substs) + self.visit_opaque(proj.def_id, proj.substs) } _ => t.super_visit_with(self), } @@ -167,7 +168,7 @@ fn variance_of_opaque(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Varianc } } ty::PredicateKind::Clause(ty::Clause::Projection(ty::ProjectionPredicate { - projection_ty: ty::ProjectionTy { substs, item_def_id: _ }, + projection_ty: ty::ProjectionTy { substs, def_id: _ }, term, })) => { for subst in &substs[1..] { |