fix review

Author: Lallapallooza

clippy_lints/src/disallowed_methods.rs

@@ -5,14 +5,14 @@ use clippy_utils::disallowed_profiles::{ProfileEntry, ProfileResolver};
 use clippy_utils::paths::PathNS;
 use clippy_utils::sym;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::smallvec::SmallVec;
 use rustc_hir::def::{CtorKind, DefKind, Res};
 use rustc_hir::def_id::DefIdMap;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::impl_lint_pass;
 use rustc_span::{Span, Symbol};
-use smallvec::SmallVec;
 
 declare_clippy_lint! {
     /// ### What it does
@@ -204,20 +204,22 @@ impl<'tcx> LateLintPass<'tcx> for DisallowedMethods {
                 .get(symbol)
                 .and_then(|map| map.get(&id).map(|info| (*symbol, info)))
         }) {
+            let diag_amendment = disallowed_path.diag_amendment(span);
             span_lint_and_then(
                 cx,
                 DISALLOWED_METHODS,
                 span,
                 format!("use of a disallowed method `{path}` (profile: {profile})"),
-                disallowed_path.diag_amendment(span),
+                |diag| diag_amendment(diag),
             );
         } else if let Some(&(path, disallowed_path)) = self.default.get(&id) {
+            let diag_amendment = disallowed_path.diag_amendment(span);
             span_lint_and_then(
                 cx,
                 DISALLOWED_METHODS,
                 span,
                 format!("use of a disallowed method `{path}`"),
-                disallowed_path.diag_amendment(span),
+                |diag| diag_amendment(diag),
             );
         }
     }

clippy_lints/src/disallowed_types.rs

@@ -5,14 +5,14 @@ use clippy_utils::disallowed_profiles::{ProfileEntry, ProfileResolver};
 use clippy_utils::paths::PathNS;
 use clippy_utils::sym;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::smallvec::SmallVec;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::DefIdMap;
 use rustc_hir::{AmbigArg, Item, ItemKind, PolyTraitRef, PrimTy, Ty, TyKind, UseKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::impl_lint_pass;
 use rustc_span::{Span, Symbol};
-use smallvec::SmallVec;
 
 declare_clippy_lint! {
     /// ### What it does
@@ -179,20 +179,22 @@ impl DisallowedTypes {
                 .get(symbol)
                 .and_then(|lookup| lookup.find(res).map(|info| (*symbol, info)))
         }) {
+            let diag_amendment = disallowed_path.diag_amendment(span);
             span_lint_and_then(
                 cx,
                 DISALLOWED_TYPES,
                 span,
                 format!("use of a disallowed type `{path}` (profile: {profile})"),
-                disallowed_path.diag_amendment(span),
+                |diag| diag_amendment(diag),
             );
         } else if let Some((path, disallowed_path)) = self.default.find(res) {
+            let diag_amendment = disallowed_path.diag_amendment(span);
             span_lint_and_then(
                 cx,
                 DISALLOWED_TYPES,
                 span,
                 format!("use of a disallowed type `{path}`"),
-                disallowed_path.diag_amendment(span),
+                |diag| diag_amendment(diag),
             );
         }
     }

clippy_utils/src/disallowed_profiles.rs

@@ -1,10 +1,10 @@
 use crate::sym;
 use rustc_ast::ast::{LitKind, MetaItemInner};
 use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::smallvec::SmallVec;
 use rustc_hir::{Attribute, HirId};
 use rustc_lint::LateContext;
 use rustc_span::{Span, Symbol};
-use smallvec::SmallVec;
 
 #[derive(Clone)]
 pub struct ProfileEntry {