simplify is_early_return function

Author: J-ZhengLi

clippy_lints/src/question_mark.rs

@@ -152,23 +152,16 @@ fn is_early_return(smbl: Symbol, cx: &LateContext<'_>, if_block: &IfBlockType<'_
                     sym::Option => {
                         // We only need to check `if let Some(x) = option` not `if let None = option`,
                         // because the later one will be suggested as `if option.is_none()` thus causing conflict.
-                        if if_else.is_none() {
-                            return false;
-                        };
-                        expr_return_none_or_err(smbl, cx, if_else.unwrap(), let_expr, None)
-                            && is_lang_ctor(cx, qpath, OptionSome)
+                        is_lang_ctor(cx, qpath, OptionSome)
+                            && if_else.is_some()
+                            && expr_return_none_or_err(smbl, cx, if_else.unwrap(), let_expr, None)
                     },
                     sym::Result => {
-                        if is_lang_ctor(cx, qpath, ResultOk) {
-                            if if_else.is_none() {
-                                return false;
-                            };
-                            expr_return_none_or_err(smbl, cx, if_else.unwrap(), let_expr, Some(let_pat_sym))
-                        } else if is_lang_ctor(cx, qpath, ResultErr) {
-                            expr_return_none_or_err(smbl, cx, if_then, let_expr, Some(let_pat_sym))
-                        } else {
-                            false
-                        }
+                        (is_lang_ctor(cx, qpath, ResultOk)
+                            && if_else.is_some()
+                            && expr_return_none_or_err(smbl, cx, if_else.unwrap(), let_expr, Some(let_pat_sym)))
+                            || is_lang_ctor(cx, qpath, ResultErr)
+                                && expr_return_none_or_err(smbl, cx, if_then, let_expr, Some(let_pat_sym))
                     },
                     _ => false,
                 }