rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
IQuant
2023-03-09 21:59:40 +03:00
parent fd18d9a584
commit 6a05cd85ad
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_infer/src/errors/mod.rs
View File

@@ -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>>,
},
}