From 23b8567a78bd3899dd963e83ed2d698c044c877f Mon Sep 17 00:00:00 2001
From: IQuant <quant3234@gmail.com>
Date: Fri, 3 Mar 2023 17:49:51 +0300
Subject: Migrate SuggestBoxingForReturnImplTrait, Fix typo in
 infer_fn_consider_casting

---
 compiler/rustc_infer/src/errors/mod.rs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'compiler/rustc_infer/src/errors/mod.rs')

diff --git a/compiler/rustc_infer/src/errors/mod.rs b/compiler/rustc_infer/src/errors/mod.rs
index 25c4e9a55f8..5d72ad6fa05 100644
--- a/compiler/rustc_infer/src/errors/mod.rs
+++ b/compiler/rustc_infer/src/errors/mod.rs
@@ -1261,7 +1261,7 @@ pub struct FnItemsAreDistinct;
 pub struct FnUniqTypes;
 
 #[derive(Subdiagnostic)]
-#[help(infer_fn_uniq_types)]
+#[help(infer_fn_consider_casting)]
 pub struct FnConsiderCasting {
     pub casting: String,
 }
@@ -1317,3 +1317,21 @@ pub enum SuggestAccessingField<'a> {
         ty: Ty<'a>,
     },
 }
+
+#[derive(Subdiagnostic)]
+pub enum SuggestBoxingForReturnImplTrait {
+    #[multipart_suggestion(infer_sbfrit_change_return_type, applicability = "maybe-incorrect")]
+    ChangeReturnType {
+        #[suggestion_part(code = "Box<dyn")]
+        start_sp: Span,
+        #[suggestion_part(code = ">")]
+        end_sp: Span,
+    },
+    #[multipart_suggestion(infer_sbfrit_box_return_expr, applicability = "maybe-incorrect")]
+    BoxReturnExpr {
+        #[suggestion_part(code = "Box::new(")]
+        starts: Vec<Span>,
+        #[suggestion_part(code = ")")]
+        ends: Vec<Span>,
+    },
+}
-- 
cgit 1.4.1-3-g733a5