Replace _ with /* Type */ in let binding type suggestion

rust-lang · Aug 8, 2024 · a158bbc · a158bbc
1 parent 1c57b0f
commit a158bbc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs
@@ -749,7 +749,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
                     let ty = header.trait_ref.skip_binder().args.type_at(1);
                     if ty == self_ty {
                         if target_type {
-                            paths.push(format!("{target}"));
+                            let mut ty_str = format!("{target}");
+                            if &ty_str == "_" {
+                                ty_str = "/* Type */".to_string();
+                            }
+                            paths.push(ty_str);
                         } else {
                             paths.push(format!("<{self_ty} as Into<{target}>>::into"));
                         }
@@ -777,8 +781,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
             let identity_method = args.rebase_onto(tcx, def_id, trait_assoc_substs);
             if target_type {
                 let fn_sig = tcx.fn_sig(def_id).instantiate(tcx, identity_method);
-                let ret = fn_sig.skip_binder().output();
-                paths.push(format!("{ret}"));
+                let mut ret = format!("{}", fn_sig.skip_binder().output());
+                if &ret == "_" {
+                    ret = "/* Type */".to_string();
+                }
+                paths.push(ret);
             } else {
                 paths.push(self.tcx.value_path_str_with_args(def_id, identity_method));
             }

diff --git a/tests/ui/pattern/slice-pattern-refutable.stderr b/tests/ui/pattern/slice-pattern-refutable.stderr
@@ -6,8 +6,8 @@ LL |     let [a, b, c] = Zeroes.into() else {
    |
 help: consider giving this pattern a type
    |
-LL |     let [a, b, c]: _ = Zeroes.into() else {
-   |                  +++
+LL |     let [a, b, c]: /* Type */ = Zeroes.into() else {
+   |                  ++++++++++++
 help: consider giving this pattern a type
    |
 LL |     let [a, b, c]: [usize; 3] = Zeroes.into() else {