Minor cleanup of needless_borrow

Author: Jarcho

clippy_lints/src/needless_borrow.rs

@@ -13,7 +13,7 @@ use rustc_lint::{LateContext, LateLintPass, LintContext};
 use rustc_middle::lint::in_external_macro;
 use rustc_middle::ty;
 use rustc_middle::ty::adjustment::{Adjust, Adjustment};
-use rustc_session::{declare_tool_lint, impl_lint_pass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
 
 declare_clippy_lint! {
     /// **What it does:** Checks for address of operations (`&`) that are going to
@@ -37,8 +37,7 @@ declare_clippy_lint! {
     "taking a reference that is going to be automatically dereferenced"
 }
 
-pub struct NeedlessBorrow;
-impl_lint_pass!(NeedlessBorrow => [NEEDLESS_BORROW]);
+declare_lint_pass!(NeedlessBorrow => [NEEDLESS_BORROW]);
 
 impl<'tcx> LateLintPass<'tcx> for NeedlessBorrow {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
@@ -108,12 +107,11 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessBorrow {
                 ];
 
                 foreach_local_usage(cx, id, search_loc, |e| {
-                    if matches!(
+                    // Check for auto-deref
+                    if !matches!(
                         cx.typeck_results().expr_adjustments(e),
                         [Adjustment { kind: Adjust::Deref(_), .. }, Adjustment { kind: Adjust::Deref(_), .. }, ..]
                     ) {
-                        // Compiler inserted deref, nothing to change here
-                    } else {
                         match get_parent_expr(cx, e) {
                             Some(&Expr { span, kind: ExprKind::Unary(UnOp::Deref, _), .. })
                             if span.ctxt() == ctxt => {