fix the order of emitting ref_as_ptr and borrow_as_ptr

Author: cyrgani

clippy_lints/src/casts/mod.rs

@@ -806,10 +806,13 @@ impl<'tcx> LateLintPass<'tcx> for Casts {
 
             as_underscore::check(cx, expr, cast_to_hir);
 
-            if self.msrv.meets(msrvs::PTR_FROM_REF) {
-                ref_as_ptr::check(cx, expr, cast_from_expr, cast_to_hir);
-            } else if self.msrv.meets(msrvs::BORROW_AS_PTR) {
-                borrow_as_ptr::check(cx, expr, cast_from_expr, cast_to_hir);
+            let was_ptr_from_ref_emitted = if self.msrv.meets(msrvs::PTR_FROM_REF) {
+                ref_as_ptr::check(cx, expr, cast_from_expr, cast_to_hir)
+            } else {
+                false
+            };
+            if self.msrv.meets(msrvs::BORROW_AS_PTR) && !was_ptr_from_ref_emitted {
+                borrow_as_ptr::check(cx, expr, cast_from_expr, cast_to_hir, &self.msrv);
             }
         }
 

clippy_lints/src/casts/ref_as_ptr.rs

@@ -14,7 +14,7 @@ pub(super) fn check<'tcx>(
     expr: &'tcx Expr<'_>,
     cast_expr: &'tcx Expr<'_>,
     cast_to_hir_ty: &Ty<'_>,
-) {
+) -> bool {
     let (cast_from, cast_to) = (
         cx.typeck_results().expr_ty(cast_expr),
         cx.typeck_results().expr_ty(expr),
@@ -45,7 +45,7 @@ pub(super) fn check<'tcx>(
                     )
                 }
             },
-            _ => return,
+            _ => return false,
         };
 
         let cast_expr_sugg = Sugg::hir_with_applicability(cx, cast_expr, "_", &mut app);
@@ -59,5 +59,7 @@ pub(super) fn check<'tcx>(
             format!("{std_or_core}::ptr::{fn_name}{turbofish}({cast_expr_sugg})"),
             app,
         );
+        return true;
     }
+    false
 }

tests/ui/borrow_and_ref_as_ptr.fixed

@@ -0,0 +1,11 @@
+// Make sure that `borrow_as_ptr` is not emitted when `ref_as_ptr` is.
+
+#![warn(clippy::ref_as_ptr, clippy::borrow_as_ptr)]
+
+fn f<T>(_: T) {}
+
+fn main() {
+    let mut val = 0;
+    f(std::ptr::from_ref(&val));
+    f(std::ptr::from_mut::<i32>(&mut val));
+}

tests/ui/borrow_and_ref_as_ptr.rs

@@ -0,0 +1,11 @@
+// Make sure that `borrow_as_ptr` is not emitted when `ref_as_ptr` is.
+
+#![warn(clippy::ref_as_ptr, clippy::borrow_as_ptr)]
+
+fn f<T>(_: T) {}
+
+fn main() {
+    let mut val = 0;
+    f(&val as *const _);
+    f(&mut val as *mut i32);
+}

tests/ui/borrow_and_ref_as_ptr.stderr

@@ -0,0 +1,17 @@
+error: reference as raw pointer
+  --> tests/ui/borrow_and_ref_as_ptr.rs:9:7
+   |
+LL |     f(&val as *const _);
+   |       ^^^^^^^^^^^^^^^^ help: try: `std::ptr::from_ref(&val)`
+   |
+   = note: `-D clippy::ref-as-ptr` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(clippy::ref_as_ptr)]`
+
+error: reference as raw pointer
+  --> tests/ui/borrow_and_ref_as_ptr.rs:10:7
+   |
+LL |     f(&mut val as *mut i32);
+   |       ^^^^^^^^^^^^^^^^^^^^ help: try: `std::ptr::from_mut::<i32>(&mut val)`
+
+error: aborting due to 2 previous errors
+