File tree 3 files changed +6
-11
lines changed
3 files changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -980,12 +980,9 @@ pub enum CodegenObligationError {
980
980
/// overflow bug, since I believe this is the only case
981
981
/// where ambiguity can result.
982
982
Ambiguity ,
983
- /// This can trigger when we probe for the source of a `'static` lifetime requirement
984
- /// on a trait object: `impl Foo for dyn Trait {}` has an implicit `'static` bound.
985
- /// This can also trigger when we have a global bound that is not actually satisfied,
986
- /// but was included during typeck due to the trivial_bounds feature.
983
+ /// This can trigger when we have a global bound that is not actually satisfied
984
+ /// due to trivial bounds.
987
985
Unimplemented ,
988
- FulfillmentError ,
989
986
/// The selected impl has unconstrained generic parameters. This will emit an error
990
987
/// during impl WF checking.
991
988
UnconstrainedParam ( ErrorGuaranteed ) ,
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ pub(crate) fn codegen_select_candidate<'tcx>(
70
70
infcx. err_ctxt ( ) . report_overflow_obligation_cycle ( & cycle) ;
71
71
}
72
72
}
73
- return Err ( CodegenObligationError :: FulfillmentError ) ;
73
+ return Err ( CodegenObligationError :: Unimplemented ) ;
74
74
}
75
75
76
76
let impl_source = infcx. resolve_vars_if_possible ( impl_source) ;
Original file line number Diff line number Diff line change @@ -107,11 +107,9 @@ fn resolve_associated_item<'tcx>(
107
107
let input = typing_env. as_query_input ( trait_ref) ;
108
108
let vtbl = match tcx. codegen_select_candidate ( input) {
109
109
Ok ( vtbl) => vtbl,
110
- Err (
111
- CodegenObligationError :: Ambiguity
112
- | CodegenObligationError :: Unimplemented
113
- | CodegenObligationError :: FulfillmentError ,
114
- ) => return Ok ( None ) ,
110
+ Err ( CodegenObligationError :: Ambiguity | CodegenObligationError :: Unimplemented ) => {
111
+ return Ok ( None ) ;
112
+ }
115
113
Err ( CodegenObligationError :: UnconstrainedParam ( guar) ) => return Err ( guar) ,
116
114
} ;
117
115
You can’t perform that action at this time.
0 commit comments