temp commit

Author: lengyijun

clippy_lints/src/borrow_deref_ref.rs

@@ -1,8 +1,10 @@
 use crate::reference::DEREF_ADDROF;
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::snippet_opt;
+use clippy_utils::source::snippet_with_context;
 use clippy_utils::ty::implements_trait;
 use clippy_utils::{get_parent_expr, is_lint_allowed};
+use rustc_errors::Applicability;
 use rustc_hir::{ExprKind, UnOp};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::mir::Mutability;
@@ -43,6 +45,7 @@ declare_clippy_lint! {
     ///
     /// fn foo(_: &str){ }
     /// ```
+    #[clippy::version = "1.59.0"]
     pub BORROW_DEREF_REF,
     complexity,
     "deref on an immutable reference returns the same type as itself"
@@ -55,19 +58,26 @@ impl LateLintPass<'_> for BorrowDerefRef {
         if_chain! {
             if !e.span.from_expansion();
             if let ExprKind::AddrOf(_, Mutability::Not, addrof_target) = e.kind;
+            if !addrof_target.span.from_expansion();
             if let ExprKind::Unary(UnOp::Deref, deref_target) = addrof_target.kind;
             if !deref_target.span.from_expansion();
+            let mut app = Applicability::MachineApplicable;
+            if let (_, false) =snippet_with_context(cx, deref_target.span , e.span.ctxt() , "..", &mut app);
+            if let (_, false) =snippet_with_context(cx, deref_target.span , addrof_target.span.ctxt() , "..", &mut app);
+            if let (_, false) =snippet_with_context(cx, addrof_target.span , e.span.ctxt() , "..", &mut app);
             if !matches!(deref_target.kind, ExprKind::Unary(UnOp::Deref, ..) );
             let ref_ty = cx.typeck_results().expr_ty(deref_target);
             if let ty::Ref(_, inner_ty, Mutability::Not) = ref_ty.kind();
             then{
 
                 if let Some(parent_expr) = get_parent_expr(cx, e){
-                    let map = cx.tcx.hir();
-                    let span = map.span(parent_expr.hir_id);
-                    if span.from_expansion() {
-                        return;
-                    }
+
+                    // let map = cx.tcx.hir();
+                    // let span = map.span(parent_expr.hir_id);
+                    // if span.from_expansion() {
+                        // return;
+                    // }
+
                     if matches!(deref_target.kind, ExprKind::Path(..) | ExprKind::Field(..)) {
                         if matches!(parent_expr.kind, ExprKind::AddrOf(_, Mutability::Mut, _)) {
                             return;

clippy_lints/src/lib.register_all.rs

@@ -208,7 +208,7 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
     LintId::of(needless_bool::NEEDLESS_BOOL),
     LintId::of(needless_borrowed_ref::NEEDLESS_BORROWED_REFERENCE),
     LintId::of(needless_late_init::NEEDLESS_LATE_INIT),
-    LintId::of(needless_deref::NEEDLESS_DEREF),
+    LintId::of(borrow_deref_ref::BORROW_DEREF_REF),
     LintId::of(needless_option_as_deref::NEEDLESS_OPTION_AS_DEREF),
     LintId::of(needless_question_mark::NEEDLESS_QUESTION_MARK),
     LintId::of(needless_update::NEEDLESS_UPDATE),