From 978a2cafd576b30fb3e72c4fa4b1dbb57244fd92 Mon Sep 17 00:00:00 2001
From: Francis Murillo <francis.murillo@protonmail.com>
Date: Mon, 5 Oct 2020 11:44:54 +0800
Subject: [PATCH] Inline is_mut_mutex_lock_call

---
 clippy_lints/src/mut_mutex_lock.rs | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/clippy_lints/src/mut_mutex_lock.rs b/clippy_lints/src/mut_mutex_lock.rs
index 0680e578537c..ca3371a5d75c 100644
--- a/clippy_lints/src/mut_mutex_lock.rs
+++ b/clippy_lints/src/mut_mutex_lock.rs
@@ -44,7 +44,11 @@ declare_lint_pass!(MutMutexLock => [MUT_MUTEX_LOCK]);
 impl<'tcx> LateLintPass<'tcx> for MutMutexLock {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, ex: &'tcx Expr<'tcx>) {
         if_chain! {
-            if is_mut_mutex_lock_call(cx, ex).is_some();
+            if let ExprKind::MethodCall(path, _span, args, _) = &ex.kind;
+            if path.ident.name == sym!(lock);
+            let ty = cx.typeck_results().expr_ty(&args[0]);
+            if let ty::Ref(_, inner_ty, Mutability::Mut) = ty.kind();
+            if is_type_diagnostic_item(cx, inner_ty, sym!(mutex_type));
             then {
                 span_lint_and_help(
                     cx,
@@ -58,18 +62,3 @@ impl<'tcx> LateLintPass<'tcx> for MutMutexLock {
         }
     }
 }
-
-fn is_mut_mutex_lock_call<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<&'tcx Expr<'tcx>> {
-    if_chain! {
-        if let ExprKind::MethodCall(path, _span, args, _) = &expr.kind;
-        if path.ident.name == sym!(lock);
-        let ty = cx.typeck_results().expr_ty(&args[0]);
-        if let ty::Ref(_, inner_ty, Mutability::Mut) = ty.kind();
-        if is_type_diagnostic_item(cx, inner_ty, sym!(mutex_type));
-        then {
-            Some(&args[0])
-        } else {
-            None
-        }
-    }
-}