Use EarlyBinder in rustc_type_ir, simplify imports

Author: compiler-errors

compiler/rustc_middle/src/ty/context.rs

@@ -151,8 +151,8 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 self.generics_of(def_id)
 }
 
-fntype_of_instantiated(self,def_id:DefId,args: ty::GenericArgsRef<'tcx>) -> Ty<'tcx>{
-self.type_of(def_id).instantiate(self, args)
+fntype_of(self,def_id:DefId) -> ty::EarlyBinder<'tcx,Ty<'tcx>>{
+self.type_of(def_id)
 }
 
 fnalias_ty_kind(self,alias: ty::AliasTy<'tcx>) -> ty::AliasTyKind{

compiler/rustc_type_ir/src/interner.rs

@@ -7,26 +7,22 @@ use crate::inherent::*;
 usecrate::ir_print::IrPrint;
 usecrate::solve::inspect::CanonicalGoalEvaluationStep;
 usecrate::visit::{Flags,TypeSuperVisitable,TypeVisitable};
-usecrate::{
-AliasTerm,AliasTermKind,AliasTy,AliasTyKind,CanonicalVarInfo,CoercePredicate,
-DebugWithInfcx,ExistentialProjection,ExistentialTraitRef,FnSig,GenericArgKind,
-NormalizesTo,ProjectionPredicate,SubtypePredicate,TermKind,TraitPredicate,TraitRef,
-};
+usecrate::{selfas ty,DebugWithInfcx};
 
 pubtraitInterner:
 Sized
  + Copy
- + IrPrint<AliasTy<Self>>
- + IrPrint<AliasTerm<Self>>
- + IrPrint<TraitRef<Self>>
- + IrPrint<TraitPredicate<Self>>
- + IrPrint<ExistentialTraitRef<Self>>
- + IrPrint<ExistentialProjection<Self>>
- + IrPrint<ProjectionPredicate<Self>>
- + IrPrint<NormalizesTo<Self>>
- + IrPrint<SubtypePredicate<Self>>
- + IrPrint<CoercePredicate<Self>>
- + IrPrint<FnSig<Self>>
+ + IrPrint<ty::AliasTy<Self>>
+ + IrPrint<ty::AliasTerm<Self>>
+ + IrPrint<ty::TraitRef<Self>>
+ + IrPrint<ty::TraitPredicate<Self>>
+ + IrPrint<ty::ExistentialTraitRef<Self>>
+ + IrPrint<ty::ExistentialProjection<Self>>
+ + IrPrint<ty::ProjectionPredicate<Self>>
+ + IrPrint<ty::NormalizesTo<Self>>
+ + IrPrint<ty::SubtypePredicate<Self>>
+ + IrPrint<ty::CoercePredicate<Self>>
+ + IrPrint<ty::FnSig<Self>>
 {
 typeDefId:Copy + Debug + Hash + Eq + TypeVisitable<Self>;
 typeAdtDef:Copy + Debug + Hash + Eq;
@@ -39,9 +35,9 @@ pub trait Interner:
  + DebugWithInfcx<Self>
  + Hash
  + Eq
- + IntoKind<Kind = GenericArgKind<Self>>
+ + IntoKind<Kind = ty::GenericArgKind<Self>>
  + TypeVisitable<Self>;
-typeTerm:Copy + Debug + Hash + Eq + IntoKind<Kind = TermKind<Self>> + TypeVisitable<Self>;
+typeTerm:Copy + Debug + Hash + Eq + IntoKind<Kind = ty::TermKind<Self>> + TypeVisitable<Self>;
 
 typeBoundVarKinds:Copy
  + Debug
@@ -51,7 +47,7 @@ pub trait Interner:
  + Default;
 typeBoundVarKind:Copy + Debug + Hash + Eq;
 
-typeCanonicalVars:Copy + Debug + Hash + Eq + IntoIterator<Item = CanonicalVarInfo<Self>>;
+typeCanonicalVars:Copy + Debug + Hash + Eq + IntoIterator<Item = ty::CanonicalVarInfo<Self>>;
 typePredefinedOpaques:Copy + Debug + Hash + Eq;
 typeDefiningOpaqueTypes:Copy + Debug + Hash + Default + Eq + TypeVisitable<Self>;
 typeExternalConstraints:Copy + Debug + Hash + Eq;
@@ -99,23 +95,23 @@ pub trait Interner:
 typeClause:Clause<Self>;
 typeClauses:Copy + Debug + Hash + Eq + TypeSuperVisitable<Self> + Flags;
 
-fnmk_canonical_var_infos(self,infos:&[CanonicalVarInfo<Self>]) -> Self::CanonicalVars;
+fnmk_canonical_var_infos(self,infos:&[ty::CanonicalVarInfo<Self>]) -> Self::CanonicalVars;
 
 typeGenericsOf:GenericsOf<Self>;
 fngenerics_of(self,def_id:Self::DefId) -> Self::GenericsOf;
 
 // FIXME: Remove after uplifting `EarlyBinder`
-fntype_of_instantiated(self,def_id:Self::DefId,args:Self::GenericArgs) -> Self::Ty;
+fntype_of(self,def_id:Self::DefId) -> ty::EarlyBinder<Self,Self::Ty>;
 
-fnalias_ty_kind(self,alias:AliasTy<Self>) -> AliasTyKind;
+fnalias_ty_kind(self,alias:ty::AliasTy<Self>) -> ty::AliasTyKind;
 
-fnalias_term_kind(self,alias:AliasTerm<Self>) -> AliasTermKind;
+fnalias_term_kind(self,alias:ty::AliasTerm<Self>) -> ty::AliasTermKind;
 
 fntrait_ref_and_own_args_for_alias(
 self,
 def_id:Self::DefId,
 args:Self::GenericArgs,
-) -> (TraitRef<Self>,Self::OwnItemArgs);
+) -> (ty::TraitRef<Self>,Self::OwnItemArgs);
 
 fnmk_args(self,args:&[Self::GenericArg]) -> Self::GenericArgs;
 

compiler/rustc_type_ir/src/predicate.rs

@@ -567,7 +567,7 @@ impl<I: Interner> AliasTerm<I> {
 I::Const::new_unevaluated(
  interner,
  ty::UnevaluatedConst::new(self.def_id,self.args),
- interner.type_of_instantiated(self.def_id,self.args),
+ interner.type_of(self.def_id).instantiate(interner,&self.args),
 )
 .into()
 }