@@ -417,7 +417,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
417
417
where
418
418
I : IntoIterator < Item = PredicateObligation < ' tcx > > + std:: fmt:: Debug ,
419
419
{
420
- let mut result = EvaluatedToOk ;
420
+ let mut result = EvaluatedToOkModuloRegions ;
421
421
debug ! ( ?predicates, "evaluate_predicates_recursively" ) ;
422
422
for obligation in predicates {
423
423
let eval = self . evaluate_predicate_recursively ( stack, obligation. clone ( ) ) ?;
@@ -499,7 +499,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
499
499
500
500
ty:: PredicateKind :: ObjectSafe ( trait_def_id) => {
501
501
if self . tcx ( ) . is_object_safe ( trait_def_id) {
502
- Ok ( EvaluatedToOk )
502
+ Ok ( EvaluatedToOkModuloRegions )
503
503
} else {
504
504
Ok ( EvaluatedToErr )
505
505
}
@@ -530,7 +530,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
530
530
match self . infcx . closure_kind ( closure_substs) {
531
531
Some ( closure_kind) => {
532
532
if closure_kind. extends ( kind) {
533
- Ok ( EvaluatedToOk )
533
+ Ok ( EvaluatedToOkModuloRegions )
534
534
} else {
535
535
Ok ( EvaluatedToErr )
536
536
}
@@ -547,7 +547,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
547
547
obligation. param_env ,
548
548
obligation. cause . span ,
549
549
) {
550
- Ok ( ( ) ) => Ok ( EvaluatedToOk ) ,
550
+ Ok ( ( ) ) => Ok ( EvaluatedToOkModuloRegions ) ,
551
551
Err ( NotConstEvaluatable :: MentionsInfer ) => Ok ( EvaluatedToAmbig ) ,
552
552
Err ( NotConstEvaluatable :: MentionsParam ) => Ok ( EvaluatedToErr ) ,
553
553
Err ( _) => Ok ( EvaluatedToErr ) ,
@@ -578,7 +578,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
578
578
. at ( & obligation. cause , obligation. param_env )
579
579
. eq ( c1, c2)
580
580
{
581
- Ok ( _) => Ok ( EvaluatedToOk ) ,
581
+ Ok ( _) => Ok ( EvaluatedToOkModuloRegions ) ,
582
582
Err ( _) => Ok ( EvaluatedToErr ) ,
583
583
}
584
584
}
@@ -736,7 +736,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
736
736
cycle. map ( |stack| stack. obligation . predicate . without_const ( ) . to_predicate ( tcx) ) ;
737
737
if self . coinductive_match ( cycle) {
738
738
debug ! ( "evaluate_stack --> recursive, coinductive" ) ;
739
- Some ( EvaluatedToOk )
739
+ Some ( EvaluatedToOkModuloRegions )
740
740
} else {
741
741
debug ! ( "evaluate_stack --> recursive, inductive" ) ;
742
742
Some ( EvaluatedToRecur )
0 commit comments