Rollup merge of rust-lang#113096 - TaKO8Ki:remove-unused-struct, r=ol…

…i-obk Remove unused struct and tweak format macro uses This pul request removes an unused struct and tweaks `format!` uses.
TaKO8Ki · Jun 27, 2023 · 09c1ca2 · 09c1ca2
2 parents 0d0361f + 8352c02
commit 09c1ca2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/compiler/rustc_ast_passes/src/errors.rs b/compiler/rustc_ast_passes/src/errors.rs
@@ -77,13 +77,6 @@ pub struct ForbiddenLifetimeBound {
     pub spans: Vec<Span>,
 }
 
-#[derive(Diagnostic)]
-#[diag(ast_passes_forbidden_non_lifetime_param)]
-pub struct ForbiddenNonLifetimeParam {
-    #[primary_span]
-    pub spans: Vec<Span>,
-}
-
 #[derive(Diagnostic)]
 #[diag(ast_passes_fn_param_too_many)]
 pub struct FnParamTooMany {

diff --git a/compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs b/compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs
@@ -139,7 +139,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
                                     tcx,
                                     generics,
                                     diag,
-                                    &format!("{}", proj.self_ty()),
+                                    &proj.self_ty().to_string(),
                                     &path,
                                     None,
                                     matching_span,
@@ -153,7 +153,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
                                     tcx,
                                     generics,
                                     diag,
-                                    &format!("{}", proj.self_ty()),
+                                    &proj.self_ty().to_string(),
                                     &path,
                                     None,
                                     matching_span,