followups

Author: andrewpollack

clippy_lints/src/match_result_ok.rs

@@ -1,10 +1,11 @@
 use clippy_utils::diagnostics::span_lint_and_sugg;
+use clippy_utils::higher;
 use clippy_utils::method_chain_args;
 use clippy_utils::source::snippet_with_applicability;
 use clippy_utils::ty::is_type_diagnostic_item;
 use if_chain::if_chain;
 use rustc_errors::Applicability;
-use rustc_hir::{Expr, ExprKind, MatchSource, PatKind, QPath};
+use rustc_hir::{Expr, ExprKind, PatKind, QPath};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 use rustc_span::sym;
@@ -47,21 +48,21 @@ declare_lint_pass!(MatchResultOk => [MATCH_RESULT_OK]);
 impl<'tcx> LateLintPass<'tcx> for MatchResultOk {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
         if_chain! {
-            if let ExprKind::Match(op, body, MatchSource::IfLetDesugar { .. }
-                | MatchSource::WhileLetDesugar { .. }) = expr.kind;
-            if let ExprKind::MethodCall(_, ok_span, result_types, _) = op.kind;
-            if let PatKind::TupleStruct(QPath::Resolved(_, x), y, _)  = body[0].pat.kind; // get operation
-            if method_chain_args(op, &["ok"]).is_some(); // test to see if using ok() methoduse std::marker::Sized;
-            if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&result_types[0]), sym::result_type);
+            if let Some(higher::IfLet { let_pat, let_expr, .. }) = higher::IfLet::hir(cx, expr) | 
+            if let Some(higher::WhileLet { let_pat, let_expr, .. }) = higher::WhileLet::hir(cx, expr);
+            if let ExprKind::MethodCall(_, ok_span, [ref result_types_0, ..], _) = let_expr.kind; //check is expr.ok() has type Result<T,E>.ok(, _)
+            if let PatKind::TupleStruct(QPath::Resolved(_, x), y, _)  = let_pat.kind; //get operation
+            if method_chain_args(let_expr, &["ok"]).is_some(); //test to see if using ok() methoduse std::marker::Sized;
+            if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(result_types_0), sym::result_type);
             if rustc_hir_pretty::to_string(rustc_hir_pretty::NO_ANN, |s| s.print_path(x, false)) == "Some";
 
             then {
 
                 let mut applicability = Applicability::MachineApplicable;
                 let some_expr_string = snippet_with_applicability(cx, y[0].span, "", &mut applicability);
-                let trimmed_ok = snippet_with_applicability(cx, op.span.until(ok_span), "", &mut applicability);
+                let trimmed_ok = snippet_with_applicability(cx, let_expr.span.until(ok_span), "", &mut applicability);
 
-                if let ExprKind::Match(op, _, MatchSource::IfLetDesugar { .. }) = expr.kind {
+                if let Some(higher::IfLet { let_pat, let_expr, .. }) = higher::IfLet::hir(cx, expr) {
                     let sugg = format!(
                         "if let Ok({}) = {}",
                         some_expr_string,
@@ -70,13 +71,13 @@ impl<'tcx> LateLintPass<'tcx> for MatchResultOk {
                     span_lint_and_sugg(
                         cx,
                         MATCH_RESULT_OK,
-                        expr.span.with_hi(op.span.hi()),
+                        expr.span.with_hi(let_expr.span.hi()),
                         "matching on `Some` with `ok()` is redundant",
                         &format!("consider matching on `Ok({})` and removing the call to `ok` instead", some_expr_string),
                         sugg,
                         applicability,
                     );
-                } else if let ExprKind::Match(op, _, MatchSource::WhileLetDesugar { .. }) = expr.kind {
+                } else if let Some(higher::WhileLet { let_pat, let_expr, .. }) = higher::WhileLet::hir(cx, expr) |  {
                     let sugg = format!(
                         "while let Ok({}) = {}",
                         some_expr_string,
@@ -85,7 +86,7 @@ impl<'tcx> LateLintPass<'tcx> for MatchResultOk {
                     span_lint_and_sugg(
                         cx,
                         MATCH_RESULT_OK,
-                        expr.span.with_hi(op.span.hi()),
+                        expr.span.with_hi(let_expr.span.hi()),
                         "matching on `Some` with `ok()` is redundant",
                         &format!("consider matching on `Ok({})` and removing the call to `ok` instead", some_expr_string),
                         sugg,