fix: unnecessary_cast suggests extra brackets when in macro

Author: profetia

clippy_lints/src/casts/unnecessary_cast.rs

@@ -1,6 +1,7 @@
-use clippy_utils::diagnostics::span_lint_and_sugg;
+use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
 use clippy_utils::numeric_literal::NumericLiteral;
 use clippy_utils::source::{SpanRangeExt, snippet_opt};
+use clippy_utils::sugg::Sugg;
 use clippy_utils::visitors::{Visitable, for_each_expr_without_closures};
 use clippy_utils::{get_parent_expr, is_hir_ty_cfg_dependant, is_ty_alias, path_to_local};
 use rustc_ast::{LitFloatType, LitIntType, LitKind};
@@ -157,21 +158,20 @@ pub(super) fn check<'tcx>(
         // `*x.foo()`, which changes what the `*` applies on).
         // The same is true if the expression encompassing the cast expression is a unary
         // expression or an addressof expression.
-        let needs_block = matches!(cast_expr.kind, ExprKind::Unary(..) | ExprKind::AddrOf(..))
-            || get_parent_expr(cx, expr).is_some_and(|e| matches!(e.kind, ExprKind::Unary(..) | ExprKind::AddrOf(..)));
-
-        span_lint_and_sugg(
+        span_lint_and_then(
             cx,
             UNNECESSARY_CAST,
             expr.span,
             format!("casting to the same type is unnecessary (`{cast_from}` -> `{cast_to}`)"),
-            "try",
-            if needs_block {
-                format!("{{ {cast_str} }}")
-            } else {
-                cast_str
+            |diag| {
+                let mut applicability = Applicability::MachineApplicable;
+                let sugg = Sugg::hir_with_applicability(cx, cast_expr, "..", &mut applicability);
+                if applicability != Applicability::MachineApplicable {
+                    return;
+                }
+
+                diag.span_suggestion(expr.span, "try", sugg.maybe_paren().to_string(), applicability);
             },
-            Applicability::MachineApplicable,
         );
         return true;
     }

tests/ui/unnecessary_cast.fixed

@@ -224,7 +224,7 @@ mod fixable {
         let _ = &1 as &I32Alias;
 
         let x = 1i32;
-        let _ = &{ x };
+        let _ = &x;
         //~^ unnecessary_cast
     }
 
@@ -266,7 +266,18 @@ mod fixable {
     // Issue #11968: The suggestion for this lint removes the parentheses and leave the code as
     // `*x.pow(2)` which tries to dereference the return value rather than `x`.
     fn issue_11968(x: &usize) -> usize {
-        { *x }.pow(2)
+        (*x).pow(2)
+        //~^ unnecessary_cast
+    }
+
+    #[allow(clippy::cast_lossless)]
+    fn issue_14640() {
+        let x = 5usize;
+        let vec: Vec<u64> = vec![1, 2, 3, 4, 5];
+        assert_eq!(vec.len(), x);
+        //~^ unnecessary_cast
+
+        let _ = (5i32 as i64).abs();
         //~^ unnecessary_cast
     }
 }

tests/ui/unnecessary_cast.rs

@@ -269,4 +269,15 @@ mod fixable {
         (*x as usize).pow(2)
         //~^ unnecessary_cast
     }
+
+    #[allow(clippy::cast_lossless)]
+    fn issue_14640() {
+        let x = 5usize;
+        let vec: Vec<u64> = vec![1, 2, 3, 4, 5];
+        assert_eq!(vec.len(), x as usize);
+        //~^ unnecessary_cast
+
+        let _ = (5i32 as i64 as i64).abs();
+        //~^ unnecessary_cast
+    }
 }

tests/ui/unnecessary_cast.stderr

@@ -209,7 +209,7 @@ error: casting to the same type is unnecessary (`i32` -> `i32`)
   --> tests/ui/unnecessary_cast.rs:227:18
    |
 LL |         let _ = &(x as i32);
-   |                  ^^^^^^^^^^ help: try: `{ x }`
+   |                  ^^^^^^^^^^ help: try: `x`
 
 error: casting integer literal to `i32` is unnecessary
   --> tests/ui/unnecessary_cast.rs:234:22
@@ -245,7 +245,19 @@ error: casting to the same type is unnecessary (`usize` -> `usize`)
   --> tests/ui/unnecessary_cast.rs:269:9
    |
 LL |         (*x as usize).pow(2)
-   |         ^^^^^^^^^^^^^ help: try: `{ *x }`
+   |         ^^^^^^^^^^^^^ help: try: `(*x)`
 
-error: aborting due to 41 previous errors
+error: casting to the same type is unnecessary (`usize` -> `usize`)
+  --> tests/ui/unnecessary_cast.rs:277:31
+   |
+LL |         assert_eq!(vec.len(), x as usize);
+   |                               ^^^^^^^^^^ help: try: `x`
+
+error: casting to the same type is unnecessary (`i64` -> `i64`)
+  --> tests/ui/unnecessary_cast.rs:280:17
+   |
+LL |         let _ = (5i32 as i64 as i64).abs();
+   |                 ^^^^^^^^^^^^^^^^^^^^ help: try: `(5i32 as i64)`
+
+error: aborting due to 43 previous errors