File tree 2 files changed +17
-1
lines changed
rustc_next_trait_solver/src/solve
rustc_trait_selection/src
2 files changed +17
-1
lines changed Original file line number Diff line number Diff line change @@ -274,6 +274,22 @@ where
274
274
return Err ( NoSolution ) ;
275
275
}
276
276
277
+ // TODO:
278
+ if let ty:: CoroutineWitness ( def_id, _) = goal. predicate . self_ty ( ) . kind ( ) {
279
+ match ecx. typing_mode ( ) {
280
+ TypingMode :: Analysis { stalled_generators, defining_opaque_types : _ } => {
281
+ if def_id. as_local ( ) . is_some_and ( |def_id| stalled_generators. contains ( & def_id) )
282
+ {
283
+ return ecx. forced_ambiguity ( MaybeCause :: Ambiguity ) ;
284
+ }
285
+ }
286
+ TypingMode :: Coherence
287
+ | TypingMode :: PostAnalysis
288
+ | TypingMode :: Borrowck { defining_opaque_types : _ }
289
+ | TypingMode :: PostBorrowckAnalysis { defined_opaque_types : _ } => { }
290
+ }
291
+ }
292
+
277
293
ecx. probe_and_evaluate_goal_for_constituent_tys (
278
294
CandidateSource :: BuiltinImpl ( BuiltinImplSource :: Misc ) ,
279
295
goal,
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ impl<'tcx> InferCtxt<'tcx> {
34
34
35
35
// FIXME(#132279): This should be removed as it causes us to incorrectly
36
36
// handle opaques in their defining scope.
37
- if !( param_env, ty) . has_infer ( ) {
37
+ if !self . next_trait_solver ( ) && ! ( param_env, ty) . has_infer ( ) {
38
38
return self . tcx . type_is_copy_modulo_regions ( self . typing_env ( param_env) , ty) ;
39
39
}
40
40
You can’t perform that action at this time.
0 commit comments