@@ -1051,31 +1051,35 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
1051
1051
// For each method in the chain, see if this is `Result::map_err` or
1052
1052
// `Option::ok_or_else` and if it is, see if the closure passed to it has an incorrect
1053
1053
// trailing `;`.
1054
- // Ideally we would instead use `FnCtxt::lookup_method_for_diagnostic` for 100%
1055
- // accurate check, but we are in the wrong stage to do that and looking for
1056
- // `Result::map_err` by checking the Self type and the path segment is enough.
1057
- // sym::ok_or_else
1058
1054
if let Some ( ty) = get_e_type ( prev_ty)
1059
1055
&& let Some ( found_ty) = found_ty
1056
+ // Ideally we would instead use `FnCtxt::lookup_method_for_diagnostic` for 100%
1057
+ // accurate check, but we are in the wrong stage to do that and looking for
1058
+ // `Result::map_err` by checking the Self type and the path segment is enough.
1059
+ // sym::ok_or_else
1060
1060
&& (
1061
- (
1061
+ ( // Result::map_err
1062
1062
path_segment. ident . name == sym:: map_err
1063
1063
&& is_diagnostic_item ( sym:: Result , next_ty)
1064
- ) || (
1064
+ ) || ( // Option::ok_or_else
1065
1065
path_segment. ident . name == sym:: ok_or_else
1066
1066
&& is_diagnostic_item ( sym:: Option , next_ty)
1067
1067
)
1068
1068
)
1069
- && [ sym :: map_err , sym :: ok_or_else ] . contains ( & path_segment . ident . name )
1069
+ // Found `Result<_, ()>?`
1070
1070
&& let ty:: Tuple ( tys) = found_ty. kind ( )
1071
1071
&& tys. is_empty ( )
1072
+ // The current method call returns `Result<_, ()>`
1072
1073
&& self . can_eq ( obligation. param_env , ty, found_ty)
1074
+ // There's a single argument in the method call and it is a closure
1073
1075
&& args. len ( ) == 1
1074
1076
&& let Some ( arg) = args. get ( 0 )
1075
1077
&& let hir:: ExprKind :: Closure ( closure) = arg. kind
1078
+ // The closure has a block for its body with no tail expression
1076
1079
&& let body = self . tcx . hir ( ) . body ( closure. body )
1077
1080
&& let hir:: ExprKind :: Block ( block, _) = body. value . kind
1078
1081
&& let None = block. expr
1082
+ // The last statement is of a type that can be converted to the return error type
1079
1083
&& let [ .., stmt] = block. stmts
1080
1084
&& let hir:: StmtKind :: Semi ( expr) = stmt. kind
1081
1085
&& let expr_ty = self . resolve_vars_if_possible (
0 commit comments