Introduce SolverRelating

Author: compiler-errors

compiler/rustc_infer/src/infer/context.rs

@@ -136,6 +136,10 @@ impl<'tcx> rustc_type_ir::InferCtxtLike for InferCtxt<'tcx> {
 self.enter_forall(value, f)
 }
 
+fnequate_ty_vids_raw(&self,a: rustc_type_ir::TyVid,b: rustc_type_ir::TyVid){
+self.inner.borrow_mut().type_variables().equate(a, b);
+}
+
 fnequate_int_vids_raw(&self,a: rustc_type_ir::IntVid,b: rustc_type_ir::IntVid){
 self.inner.borrow_mut().int_unification_table().union(a, b);
 }
@@ -152,6 +156,23 @@ impl<'tcx> rustc_type_ir::InferCtxtLike for InferCtxt<'tcx> {
 self.inner.borrow_mut().effect_unification_table().union(a, b);
 }
 
+fninstantiate_ty_var_raw<R:PredicateEmittingRelation<Self>>(
+&self,
+relation:&mutR,
+target_is_expected:bool,
+target_vid: rustc_type_ir::TyVid,
+instantiation_variance: rustc_type_ir::Variance,
+source_ty:Ty<'tcx>,
+) -> RelateResult<'tcx,()>{
+self.instantiate_ty_var(
+ relation,
+ target_is_expected,
+ target_vid,
+ instantiation_variance,
+ source_ty,
+)
+}
+
 fninstantiate_int_var_raw(
 &self,
 vid: rustc_type_ir::IntVid,
@@ -228,7 +249,19 @@ impl<'tcx> rustc_type_ir::InferCtxtLike for InferCtxt<'tcx> {
 }
 
 fnsub_regions(&self,sub: ty::Region<'tcx>,sup: ty::Region<'tcx>){
-self.sub_regions(SubregionOrigin::RelateRegionParamBound(DUMMY_SP,None), sub, sup)
+self.inner.borrow_mut().unwrap_region_constraints().make_subregion(
+SubregionOrigin::RelateRegionParamBound(DUMMY_SP,None),
+ sub,
+ sup,
+);
+}
+
+fnequate_regions(&self,a: ty::Region<'tcx>,b: ty::Region<'tcx>){
+self.inner.borrow_mut().unwrap_region_constraints().make_eqregion(
+SubregionOrigin::RelateRegionParamBound(DUMMY_SP,None),
+ a,
+ b,
+);
 }
 
 fnregister_ty_outlives(&self,ty:Ty<'tcx>,r: ty::Region<'tcx>){

compiler/rustc_middle/src/ty/context.rs

@@ -698,6 +698,12 @@ impl<'tcx> rustc_type_ir::inherent::Features<TyCtxt<'tcx>> for &'tcx rustc_featu
 }
 }
 
+impl<'tcx> rustc_type_ir::inherent::Span<TyCtxt<'tcx>>forSpan{
+fndummy() -> Self{
+DUMMY_SP
+}
+}
+
 typeInternedSet<'tcx,T> = ShardedHashMap<InternedInSet<'tcx,T>,()>;
 
 pubstructCtxtInterners<'tcx>{

compiler/rustc_type_ir/src/infer_ctxt.rs

@@ -67,11 +67,20 @@ pub trait InferCtxtLike: Sized {
 f:implFnOnce(T) -> U,
 ) -> U;
 
+fnequate_ty_vids_raw(&self,a: ty::TyVid,b: ty::TyVid);
 fnequate_int_vids_raw(&self,a: ty::IntVid,b: ty::IntVid);
 fnequate_float_vids_raw(&self,a: ty::FloatVid,b: ty::FloatVid);
 fnequate_const_vids_raw(&self,a: ty::ConstVid,b: ty::ConstVid);
 fnequate_effect_vids_raw(&self,a: ty::EffectVid,b: ty::EffectVid);
 
+fninstantiate_ty_var_raw<R:PredicateEmittingRelation<Self>>(
+&self,
+relation:&mutR,
+target_is_expected:bool,
+target_vid: ty::TyVid,
+instantiation_variance: ty::Variance,
+source_ty: <Self::InternerasInterner>::Ty,
+) -> RelateResult<Self::Interner,()>;
 fninstantiate_int_var_raw(&self,vid: ty::IntVid,value: ty::IntVarValue);
 fninstantiate_float_var_raw(&self,vid: ty::FloatVid,value: ty::FloatVarValue);
 fninstantiate_effect_var_raw(
@@ -125,6 +134,12 @@ pub trait InferCtxtLike: Sized {
 sup: <Self::InternerasInterner>::Region,
 );
 
+fnequate_regions(
+&self,
+a: <Self::InternerasInterner>::Region,
+b: <Self::InternerasInterner>::Region,
+);
+
 fnregister_ty_outlives(
 &self,
 ty: <Self::InternerasInterner>::Ty,

compiler/rustc_type_ir/src/inherent.rs

@@ -565,6 +565,10 @@ pub trait BoundExistentialPredicates<I: Interner>:
 ) -> implIntoIterator<Item = ty::Binder<I, ty::ExistentialProjection<I>>>;
 }
 
+pubtraitSpan<I:Interner>:Copy + Debug + Hash + Eq + TypeFoldable<I>{
+fndummy() -> Self;
+}
+
 pubtraitSliceLike:Sized + Copy{
 typeItem:Copy;
 typeIntoIter:Iterator<Item = Self::Item>;

compiler/rustc_type_ir/src/interner.rs

@@ -36,7 +36,7 @@ pub trait Interner:
 {
 typeDefId:DefId<Self>;
 typeLocalDefId:Copy + Debug + Hash + Eq + Into<Self::DefId> + TypeFoldable<Self>;
-typeSpan:Copy + Debug + Hash + Eq + TypeFoldable<Self>;
+typeSpan:Span<Self>;
 
 typeGenericArgs:GenericArgs<Self>;
 typeGenericArgsSlice:Copy + Debug + Hash + Eq + SliceLike<Item = Self::GenericArg>;

compiler/rustc_type_ir/src/lib.rs

@@ -206,8 +206,8 @@ pub fn debug_bound_var<T: std::fmt::Write>(
 }
 }
 
-#[derive(Copy,Clone,PartialEq,Eq)]
-#[cfg_attr(feature = "nightly", derive(Decodable,Encodable,Hash,HashStable_NoContext))]
+#[derive(Copy,Clone,PartialEq,Eq,Hash)]
+#[cfg_attr(feature = "nightly", derive(Decodable,Encodable,HashStable_NoContext))]
 #[cfg_attr(feature = "nightly", rustc_pass_by_value)]
 pubenumVariance{
 Covariant,// T<A> <: T<B> iff A <: B -- e.g., function return type

compiler/rustc_type_ir/src/relate.rs

@@ -10,6 +10,7 @@ use crate::inherent::*;
 usecrate::{selfas ty,Interner};
 
 pubmod combine;
+pubmod solver_relating;
 
 pubtypeRelateResult<I,T> = Result<T,TypeError<I>>;