A more general implementation of `IntoDiagnosticArg` for `Binder` (Also removes `DiagArg`, as it's no longer necessary)

1 files changed, 2 insertions, 10 deletions

diff --git a/compiler/rustc_infer/src/errors/mod.rs b/compiler/rustc_infer/src/errors/mod.rs
index 2a5d3516c28..b129621130d 100644
--- a/compiler/rustc_infer/src/errors/mod.rs
+++ b/compiler/rustc_infer/src/errors/mod.rs
@@ -1146,14 +1146,6 @@ pub struct OpaqueCapturesLifetime<'tcx> {
     pub opaque_ty: Ty<'tcx>,
 }
 
-pub struct DiagArg<T>(pub T);
-
-impl<T: ToString> IntoDiagnosticArg for DiagArg<T> {
-    fn into_diagnostic_arg(self) -> rustc_errors::DiagnosticArgValue<'static> {
-        self.0.to_string().into_diagnostic_arg()
-    }
-}
-
 #[derive(Subdiagnostic)]
 pub enum FunctionPointerSuggestion<'a> {
     #[suggestion(
@@ -1221,7 +1213,7 @@ pub enum FunctionPointerSuggestion<'a> {
         fn_name: String,
         #[skip_arg]
         found_sig: Binder<'a, FnSig<'a>>,
-        expected_sig: DiagArg<Binder<'a, FnSig<'a>>>,
+        expected_sig: Binder<'a, FnSig<'a>>,
     },
     #[suggestion(
         infer_fps_cast_both,
@@ -1236,7 +1228,7 @@ pub enum FunctionPointerSuggestion<'a> {
         fn_name: String,
         #[skip_arg]
         found_sig: Binder<'a, FnSig<'a>>,
-        expected_sig: DiagArg<Binder<'a, FnSig<'a>>>,
+        expected_sig: Binder<'a, FnSig<'a>>,
     },
 }