Use SolverRelating in favor of TypeRelating in the old solver where possible
This commit is contained in:
parent
30a2ecddb4
commit
a4cd2202ef
4 changed files with 92 additions and 39 deletions
|
@ -27,11 +27,14 @@
|
|||
|
||||
use relate::lattice::{LatticeOp, LatticeOpKind};
|
||||
use rustc_middle::bug;
|
||||
use rustc_middle::ty::relate::solver_relating::RelateExt as NextSolverRelate;
|
||||
use rustc_middle::ty::{Const, ImplSubject};
|
||||
|
||||
use super::*;
|
||||
use crate::infer::relate::type_relating::TypeRelating;
|
||||
use crate::infer::relate::{Relate, TypeRelation};
|
||||
use crate::traits::Obligation;
|
||||
use crate::traits::solve::Goal;
|
||||
|
||||
/// Whether we should define opaque types or just treat them opaquely.
|
||||
///
|
||||
|
@ -109,15 +112,26 @@ impl<'a, 'tcx> At<'a, 'tcx> {
|
|||
where
|
||||
T: ToTrace<'tcx>,
|
||||
{
|
||||
let mut op = TypeRelating::new(
|
||||
self.infcx,
|
||||
ToTrace::to_trace(self.cause, expected, actual),
|
||||
self.param_env,
|
||||
define_opaque_types,
|
||||
ty::Contravariant,
|
||||
);
|
||||
op.relate(expected, actual)?;
|
||||
Ok(InferOk { value: (), obligations: op.into_obligations() })
|
||||
if self.infcx.next_trait_solver {
|
||||
NextSolverRelate::relate(
|
||||
self.infcx,
|
||||
self.param_env,
|
||||
expected,
|
||||
ty::Contravariant,
|
||||
actual,
|
||||
)
|
||||
.map(|goals| self.goals_to_obligations(goals))
|
||||
} else {
|
||||
let mut op = TypeRelating::new(
|
||||
self.infcx,
|
||||
ToTrace::to_trace(self.cause, expected, actual),
|
||||
self.param_env,
|
||||
define_opaque_types,
|
||||
ty::Contravariant,
|
||||
);
|
||||
op.relate(expected, actual)?;
|
||||
Ok(InferOk { value: (), obligations: op.into_obligations() })
|
||||
}
|
||||
}
|
||||
|
||||
/// Makes `expected <: actual`.
|
||||
|
@ -130,15 +144,20 @@ impl<'a, 'tcx> At<'a, 'tcx> {
|
|||
where
|
||||
T: ToTrace<'tcx>,
|
||||
{
|
||||
let mut op = TypeRelating::new(
|
||||
self.infcx,
|
||||
ToTrace::to_trace(self.cause, expected, actual),
|
||||
self.param_env,
|
||||
define_opaque_types,
|
||||
ty::Covariant,
|
||||
);
|
||||
op.relate(expected, actual)?;
|
||||
Ok(InferOk { value: (), obligations: op.into_obligations() })
|
||||
if self.infcx.next_trait_solver {
|
||||
NextSolverRelate::relate(self.infcx, self.param_env, expected, ty::Covariant, actual)
|
||||
.map(|goals| self.goals_to_obligations(goals))
|
||||
} else {
|
||||
let mut op = TypeRelating::new(
|
||||
self.infcx,
|
||||
ToTrace::to_trace(self.cause, expected, actual),
|
||||
self.param_env,
|
||||
define_opaque_types,
|
||||
ty::Covariant,
|
||||
);
|
||||
op.relate(expected, actual)?;
|
||||
Ok(InferOk { value: (), obligations: op.into_obligations() })
|
||||
}
|
||||
}
|
||||
|
||||
/// Makes `expected == actual`.
|
||||
|
@ -170,15 +189,20 @@ impl<'a, 'tcx> At<'a, 'tcx> {
|
|||
where
|
||||
T: Relate<TyCtxt<'tcx>>,
|
||||
{
|
||||
let mut op = TypeRelating::new(
|
||||
self.infcx,
|
||||
trace,
|
||||
self.param_env,
|
||||
define_opaque_types,
|
||||
ty::Invariant,
|
||||
);
|
||||
op.relate(expected, actual)?;
|
||||
Ok(InferOk { value: (), obligations: op.into_obligations() })
|
||||
if self.infcx.next_trait_solver {
|
||||
NextSolverRelate::relate(self.infcx, self.param_env, expected, ty::Invariant, actual)
|
||||
.map(|goals| self.goals_to_obligations(goals))
|
||||
} else {
|
||||
let mut op = TypeRelating::new(
|
||||
self.infcx,
|
||||
trace,
|
||||
self.param_env,
|
||||
define_opaque_types,
|
||||
ty::Invariant,
|
||||
);
|
||||
op.relate(expected, actual)?;
|
||||
Ok(InferOk { value: (), obligations: op.into_obligations() })
|
||||
}
|
||||
}
|
||||
|
||||
pub fn relate<T>(
|
||||
|
@ -223,6 +247,26 @@ impl<'a, 'tcx> At<'a, 'tcx> {
|
|||
let value = op.relate(expected, actual)?;
|
||||
Ok(InferOk { value, obligations: op.into_obligations() })
|
||||
}
|
||||
|
||||
fn goals_to_obligations(
|
||||
&self,
|
||||
goals: Vec<Goal<'tcx, ty::Predicate<'tcx>>>,
|
||||
) -> InferOk<'tcx, ()> {
|
||||
InferOk {
|
||||
value: (),
|
||||
obligations: goals
|
||||
.into_iter()
|
||||
.map(|goal| {
|
||||
Obligation::new(
|
||||
self.infcx.tcx,
|
||||
self.cause.clone(),
|
||||
goal.param_env,
|
||||
goal.predicate,
|
||||
)
|
||||
})
|
||||
.collect(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'tcx> ToTrace<'tcx> for ImplSubject<'tcx> {
|
||||
|
|
|
@ -58,6 +58,7 @@ impl<'infcx, 'tcx> TypeRelating<'infcx, 'tcx> {
|
|||
define_opaque_types: DefineOpaqueTypes,
|
||||
ambient_variance: ty::Variance,
|
||||
) -> TypeRelating<'infcx, 'tcx> {
|
||||
assert!(!infcx.next_trait_solver);
|
||||
TypeRelating {
|
||||
infcx,
|
||||
trace,
|
||||
|
@ -190,9 +191,7 @@ impl<'tcx> TypeRelation<TyCtxt<'tcx>> for TypeRelating<'_, 'tcx> {
|
|||
|
||||
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }), _)
|
||||
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }))
|
||||
if self.define_opaque_types == DefineOpaqueTypes::Yes
|
||||
&& def_id.is_local()
|
||||
&& !infcx.next_trait_solver() =>
|
||||
if self.define_opaque_types == DefineOpaqueTypes::Yes && def_id.is_local() =>
|
||||
{
|
||||
self.register_goals(infcx.handle_opaque_type(
|
||||
a,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue