clean-up transmute_int_to_non_zero (rust-lang#15521)

changelog: none

Author: samueltardieu

clippy_lints/src/transmute/transmute_int_to_non_zero.rs

@@ -1,6 +1,6 @@
 use super::TRANSMUTE_INT_TO_NON_ZERO;
-use clippy_utils::diagnostics::span_lint_and_then;
-use clippy_utils::sugg;
+use clippy_utils::diagnostics::span_lint_and_sugg;
+use clippy_utils::sugg::Sugg;
 use rustc_errors::Applicability;
 use rustc_hir::Expr;
 use rustc_lint::LateContext;
@@ -16,35 +16,24 @@ pub(super) fn check<'tcx>(
  to_ty: Ty<'tcx>,
  arg: &'tcx Expr<'_>,
 ) -> bool {
- let tcx = cx.tcx;
-
- let (ty::Int(_) | ty::Uint(_), ty::Adt(adt, substs)) = (&from_ty.kind(), to_ty.kind()) else {
- return false;
- };
-
- if !tcx.is_diagnostic_item(sym::NonZero, adt.did()) {
- return false;
+ if let ty::Int(_) | ty::Uint(_) = from_ty.kind()
+ && let ty::Adt(adt, substs) = to_ty.kind()
+ && cx.tcx.is_diagnostic_item(sym::NonZero, adt.did())
+ && let int_ty = substs.type_at(0)
+ && from_ty == int_ty
+ {
+ let arg = Sugg::hir(cx, arg, "..");
+ span_lint_and_sugg(
+ cx,
+ TRANSMUTE_INT_TO_NON_ZERO,
+ e.span,
+ format!("transmute from a `{from_ty}` to a `{}<{int_ty}>`", sym::NonZero),
+ "consider using",
+ format!("{}::{}({arg})", sym::NonZero, sym::new_unchecked),
+ Applicability::Unspecified,
+ );
+ true
+ } else {
+ false
  }
-
- let int_ty = substs.type_at(0);
- if from_ty != int_ty {
- return false;
- }
-
- span_lint_and_then(
- cx,
- TRANSMUTE_INT_TO_NON_ZERO,
- e.span,
- format!("transmute from a `{from_ty}` to a `{}<{int_ty}>`", sym::NonZero),
- |diag| {
- let arg = sugg::Sugg::hir(cx, arg, "..");
- diag.span_suggestion(
- e.span,
- "consider using",
- format!("{}::{}({arg})", sym::NonZero, sym::new_unchecked),
- Applicability::Unspecified,
- );
- },
- );
- true
 }