@@ -554,8 +554,7 @@ impl<'tcx> Predicate<'tcx> {
554554 | PredicateKind :: Coerce ( _)
555555 | PredicateKind :: Clause ( ClauseKind :: ConstEvaluatable ( _) )
556556 | PredicateKind :: ConstEquate ( _, _)
557- | PredicateKind :: Ambiguous
558- | PredicateKind :: Clause ( ClauseKind :: TypeWellFormedFromEnv ( _) ) => true ,
557+ | PredicateKind :: Ambiguous => true ,
559558 }
560559 }
561560}
@@ -661,11 +660,6 @@ pub enum ClauseKind<'tcx> {
661660
662661 /// Constant initializer must evaluate successfully.
663662 ConstEvaluatable ( ty:: Const < ' tcx > ) ,
664-
665- /// Represents a type found in the environment that we can use for implied bounds.
666- ///
667- /// Only used for Chalk.
668- TypeWellFormedFromEnv ( Ty < ' tcx > ) ,
669663}
670664
671665#[ derive( Clone , Copy , PartialEq , Eq , Hash , TyEncodable , TyDecodable ) ]
@@ -1424,8 +1418,7 @@ impl<'tcx> Predicate<'tcx> {
14241418 | PredicateKind :: Clause ( ClauseKind :: TypeOutlives ( ..) )
14251419 | PredicateKind :: Clause ( ClauseKind :: ConstEvaluatable ( ..) )
14261420 | PredicateKind :: ConstEquate ( ..)
1427- | PredicateKind :: Ambiguous
1428- | PredicateKind :: Clause ( ClauseKind :: TypeWellFormedFromEnv ( ..) ) => None ,
1421+ | PredicateKind :: Ambiguous => None ,
14291422 }
14301423 }
14311424
@@ -1445,8 +1438,7 @@ impl<'tcx> Predicate<'tcx> {
14451438 | PredicateKind :: Clause ( ClauseKind :: TypeOutlives ( ..) )
14461439 | PredicateKind :: Clause ( ClauseKind :: ConstEvaluatable ( ..) )
14471440 | PredicateKind :: ConstEquate ( ..)
1448- | PredicateKind :: Ambiguous
1449- | PredicateKind :: Clause ( ClauseKind :: TypeWellFormedFromEnv ( ..) ) => None ,
1441+ | PredicateKind :: Ambiguous => None ,
14501442 }
14511443 }
14521444
@@ -1466,8 +1458,7 @@ impl<'tcx> Predicate<'tcx> {
14661458 | PredicateKind :: ClosureKind ( ..)
14671459 | PredicateKind :: Clause ( ClauseKind :: ConstEvaluatable ( ..) )
14681460 | PredicateKind :: ConstEquate ( ..)
1469- | PredicateKind :: Ambiguous
1470- | PredicateKind :: Clause ( ClauseKind :: TypeWellFormedFromEnv ( ..) ) => None ,
1461+ | PredicateKind :: Ambiguous => None ,
14711462 }
14721463 }
14731464
0 commit comments