@@ -7871,12 +7871,11 @@ ERROR(lifetime_dependence_only_on_function_method_init_result, none,
7871
7871
ERROR(lifetime_dependence_invalid_return_type, none,
7872
7872
" lifetime dependence can only be specified on ~Escapable results" , ())
7873
7873
ERROR(lifetime_dependence_cannot_infer_ambiguous_candidate, none,
7874
- " cannot infer lifetime dependence, multiple ~Escapable or ~Copyable "
7875
- " parameters with ownership modifiers, specify explicit lifetime "
7876
- " dependence" , ())
7877
- ERROR(lifetime_dependence_cannot_infer_no_candidates, none,
7878
- " cannot infer lifetime dependence, no parameters with ownership "
7879
- " modifiers present" , ())
7874
+ " cannot infer lifetime dependence, multiple parameters qualifiy as a candidate" , ())
7875
+ ERROR(lifetime_dependence_cannot_infer_no_candidates, none,
7876
+ " cannot infer lifetime dependence, no parameters found that are "
7877
+ " ~Escapable or Escapable with a borrowing ownership" ,
7878
+ ())
7880
7879
ERROR(lifetime_dependence_ctor_non_self_or_nil_return, none,
7881
7880
" expected nil or self as return values in an initializer with "
7882
7881
" lifetime dependent specifiers" , ())
0 commit comments