rm bitflag

Author: lengyijun

clippy_lints/src/borrow_deref_ref.rs

@@ -1,5 +1,5 @@
 use crate::reference::DEREF_ADDROF;
-use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_then};
+use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::is_lint_allowed;
 use clippy_utils::source::snippet_opt;
 use clippy_utils::ty::implements_trait;
@@ -25,7 +25,7 @@ declare_clippy_lint! {
     /// let x = &12;
     /// let addr_x = &x as *const _ as usize;
     /// let addr_y = &&*x as *const _ as usize; // assert ok now, and lint triggerd.
-    ///                                         // But if we apply it, it will assert fail.
+    ///                                         // But if we fix it, assert will fail.
     /// assert_ne!(addr_x, addr_y);
     /// ```
     ///
@@ -80,51 +80,36 @@ impl LateLintPass<'_> for BorrowDerefRef {
                     }
                 }
 
-                let mut give_2_help = true;
+                span_lint_and_then(
+                    cx,
+                    BORROW_DEREF_REF,
+                    e.span,
+                    "deref on an immutable reference",
+                    |diag| {
+                        diag.help(
+                            &format!(
+                                "consider using `{}` if you would like to reborrow",
+                                &snippet_opt(cx, deref_expr.span).unwrap(),
+                             )
+                        );
 
-                // has deref trait -> give 2 help
-                // doesn't have deref trait -> give 1 help
-                if let Some(deref_trait_id) = cx.tcx.lang_items().deref_trait(){
-                    if !implements_trait(cx, inner_ty, deref_trait_id, &[]) {
-                         give_2_help = false;
-                    }
-                }
-
-                if give_2_help {
-                    span_lint_and_then(
-                        cx,
-                        BORROW_DEREF_REF,
-                        e.span,
-                        "deref on an immutable reference",
-                        |diag| {
-                            diag.help(
-                                &format!(
-                                    "consider using `{}` if you would like to deref",
-                                    "&**".to_owned() + &snippet_opt(cx, deref_expr.span).unwrap(),
-                                 )
-                            );
-                            diag.help(
-                                &format!(
-                                    "consider using `{}` if you would like to reborrow",
-                                    &snippet_opt(cx, deref_expr.span).unwrap(),
-                                 )
-                            );
+                        // has deref trait -> give 2 help
+                        // doesn't have deref trait -> give 1 help
+                        if let Some(deref_trait_id) = cx.tcx.lang_items().deref_trait(){
+                            if !implements_trait(cx, inner_ty, deref_trait_id, &[]) {
+                                return;
+                            }
                         }
-                    );
-                }else {
-                    span_lint_and_help(
-                        cx,
-                        BORROW_DEREF_REF,
-                        e.span,
-                        "deref on an immutable reference",
-                        None,
-                        &format!(
-                            "consider using `{}` if you would like to reborrow",
-                            &snippet_opt(cx, deref_expr.span).unwrap(),
-                        )
-                    );
-                }
 
+                        diag.help(
+                            &format!(
+                                "consider using `{}` if you would like to deref",
+                                "&**".to_owned() + &snippet_opt(cx, deref_expr.span).unwrap(),
+                             )
+                        );
+
+                    }
+                );
 
             }
         }

tests/ui/borrow_deref_ref.stderr

@@ -13,8 +13,8 @@ error: deref on an immutable reference
 LL |         let x: &str = &*s;
    |                       ^^^
    |
-   = help: consider using `&**s` if you would like to deref
    = help: consider using `s` if you would like to reborrow
+   = help: consider using `&**s` if you would like to deref
 
 error: deref on an immutable reference
   --> $DIR/borrow_deref_ref.rs:11:22