Skip to content

Commit 62f17a7

Browse files
committed
[WIP] Always use EvaluatedToOkModuloRegions instead of EvaluatedToOk
1 parent a5029ac commit 62f17a7

File tree

1 file changed

+6
-6
lines changed
  • compiler/rustc_trait_selection/src/traits/select

1 file changed

+6
-6
lines changed

compiler/rustc_trait_selection/src/traits/select/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
417417
where
418418
I: IntoIterator<Item = PredicateObligation<'tcx>> + std::fmt::Debug,
419419
{
420-
let mut result = EvaluatedToOk;
420+
let mut result = EvaluatedToOkModuloRegions;
421421
debug!(?predicates, "evaluate_predicates_recursively");
422422
for obligation in predicates {
423423
let eval = self.evaluate_predicate_recursively(stack, obligation.clone())?;
@@ -499,7 +499,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
499499

500500
ty::PredicateKind::ObjectSafe(trait_def_id) => {
501501
if self.tcx().is_object_safe(trait_def_id) {
502-
Ok(EvaluatedToOk)
502+
Ok(EvaluatedToOkModuloRegions)
503503
} else {
504504
Ok(EvaluatedToErr)
505505
}
@@ -530,7 +530,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
530530
match self.infcx.closure_kind(closure_substs) {
531531
Some(closure_kind) => {
532532
if closure_kind.extends(kind) {
533-
Ok(EvaluatedToOk)
533+
Ok(EvaluatedToOkModuloRegions)
534534
} else {
535535
Ok(EvaluatedToErr)
536536
}
@@ -547,7 +547,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
547547
obligation.param_env,
548548
obligation.cause.span,
549549
) {
550-
Ok(()) => Ok(EvaluatedToOk),
550+
Ok(()) => Ok(EvaluatedToOkModuloRegions),
551551
Err(NotConstEvaluatable::MentionsInfer) => Ok(EvaluatedToAmbig),
552552
Err(NotConstEvaluatable::MentionsParam) => Ok(EvaluatedToErr),
553553
Err(_) => Ok(EvaluatedToErr),
@@ -578,7 +578,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
578578
.at(&obligation.cause, obligation.param_env)
579579
.eq(c1, c2)
580580
{
581-
Ok(_) => Ok(EvaluatedToOk),
581+
Ok(_) => Ok(EvaluatedToOkModuloRegions),
582582
Err(_) => Ok(EvaluatedToErr),
583583
}
584584
}
@@ -736,7 +736,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
736736
cycle.map(|stack| stack.obligation.predicate.without_const().to_predicate(tcx));
737737
if self.coinductive_match(cycle) {
738738
debug!("evaluate_stack --> recursive, coinductive");
739-
Some(EvaluatedToOk)
739+
Some(EvaluatedToOkModuloRegions)
740740
} else {
741741
debug!("evaluate_stack --> recursive, inductive");
742742
Some(EvaluatedToRecur)

0 commit comments

Comments
 (0)