Replace .type_of() calls with .bound_type_of()

Author: GuillaumeGomez

compiler/rustc_infer/src/infer/outlives/components.rs

@@ -169,8 +169,10 @@ fn compute_components<'tcx>(
                 out.push(Component::UnresolvedInferenceVariable(infer_ty));
             }
 
-            ty::TyAlias(def_id, _) => {
-                compute_components(tcx, tcx.type_of(def_id), out, visited);
+            ty::TyAlias(def_id, substs) => {
+                let binder_ty = tcx.bound_type_of(def_id);
+                let ty = binder_ty.subst(tcx, substs);
+                compute_components(tcx, ty, out, visited);
             }
 
             // Most types do not introduce any region binders, nor

compiler/rustc_lint/src/types.rs

@@ -8,7 +8,9 @@ use rustc_hir::{is_range_literal, Expr, ExprKind, Node};
 use rustc_macros::LintDiagnostic;
 use rustc_middle::ty::layout::{IntegerExt, LayoutOf, SizeSkeleton};
 use rustc_middle::ty::subst::SubstsRef;
-use rustc_middle::ty::{self, AdtKind, DefIdTree, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable};
+use rustc_middle::ty::{
+    self, AdtKind, DefIdTree, Subst, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
+};
 use rustc_span::source_map;
 use rustc_span::symbol::sym;
 use rustc_span::{Span, Symbol, DUMMY_SP};
@@ -1135,14 +1137,8 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
             }
 
             ty::TyAlias(def_id, substs) => {
-                for ty in substs.types() {
-                    let ty = self.cx.tcx.normalize_erasing_regions(self.cx.param_env, ty);
-                    match self.check_type_for_ffi(cache, ty) {
-                        FfiSafe => {}
-                        r => return r,
-                    };
-                }
-                let ty = tcx.type_of(def_id);
+                let binder_ty = tcx.bound_type_of(def_id);
+                let ty = binder_ty.subst(tcx, substs);
                 let ty = self.cx.tcx.normalize_erasing_regions(self.cx.param_env, ty);
                 self.check_type_for_ffi(cache, ty)
             }

compiler/rustc_middle/src/ty/layout.rs

@@ -365,6 +365,12 @@ impl<'tcx> SizeSkeleton<'tcx> {
                 }
             }
 
+            ty::TyAlias(def_id, substs) => {
+                let generic_ty = tcx.bound_type_of(def_id);
+                let concrete_ty = generic_ty.subst(tcx, substs);
+                SizeSkeleton::compute(concrete_ty, tcx, param_env)
+            }
+
             _ => Err(err),
         }
     }

compiler/rustc_middle/src/ty/util.rs

@@ -1050,7 +1050,11 @@ impl<'tcx> Ty<'tcx> {
             | ty::Placeholder(_)
             | ty::Infer(_) => false,
 
-            ty::TyAlias(def_id, _) => tcx.type_of(def_id).is_structural_eq_shallow(tcx),
+            ty::TyAlias(def_id, substs) => {
+                let binder_ty = tcx.bound_type_of(*def_id);
+                let ty = binder_ty.subst(tcx, substs);
+                ty.is_structural_eq_shallow(tcx)
+            }
 
             ty::Foreign(_) | ty::GeneratorWitness(..) | ty::Error(_) => false,
         }