Don't overlap with if_let_some_result

Author: JarredAllen

clippy_lints/src/option_if_let_else.rs

@@ -70,6 +70,19 @@ declare_clippy_lint! {
 
 declare_lint_pass!(OptionIfLetElse => [OPTION_IF_LET_ELSE]);
 
+fn is_result_ok(cx: &LateContext<'_, '_>, expr: &'_ Expr<'_>) -> bool {
+    if_chain! {
+        if let ExprKind::MethodCall(ref path, _, &[ref receiver]) = &expr.kind;
+        if path.ident.name.to_ident_string() == "ok";
+        if match_type(cx, &cx.tables.expr_ty(&receiver), &paths::RESULT);
+        then {
+            true
+        } else {
+            false
+        }
+    }
+}
+
 /// If this expression is the option if let/else construct we're detecting, then
 /// this function returns Some(Option<_> tested against, the method to call on
 /// the object (map_or or map_or_else), expression if Option is Some,
@@ -79,6 +92,7 @@ fn detect_option_if_let_else<'a>(cx: &LateContext<'_, '_>, expr: &'a Expr<'_>) -
         if let ExprKind::Match(let_body, arms, MatchSource::IfLetDesugar{contains_else_clause: true}) = &expr.kind;
         if arms.len() == 2;
         if match_type(cx, &cx.tables.expr_ty(let_body), &paths::OPTION);
+        if !is_result_ok(cx, let_body);
         if let PatKind::TupleStruct(path, &[inner_pat], _) = &arms[0].pat.kind;
         if let PatKind::Binding(_, _, id, _) = &inner_pat.kind;
         then {