Add Mutability::mutably_str

compiler/rustc_ast/src/ast.rs

@@ -804,6 +804,14 @@ impl Mutability {
         }
     }
 
+    /// Returns `""` (empty string) or `"mutably "` depending on the mutability.
+    pub fn mutably_str(self) -> &'static str {
+        match self {
+            Mutability::Not => "",
+            Mutability::Mut => "mutably ",
+        }
+    }
+
     /// Return `true` if self is mutable
     pub fn is_mut(self) -> bool {
         matches!(self, Self::Mut)

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -576,10 +576,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             })
             .collect();
         err.multipart_suggestion_verbose(
-            &format!(
+            format!("consider {}borrowing {value_name}", borrow_level.mutably_str()),
-                "consider {}borrowing {value_name}",
-                if borrow_level.is_mut() { "mutably " } else { "" }
-            ),
             sugg,
             Applicability::MaybeIncorrect,
         );

compiler/rustc_hir_typeck/src/demand.rs

@@ -863,24 +863,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         }
 
                         let sugg_expr = if needs_parens { format!("({src})") } else { src };
-                        return Some(match mutability {
+                        return Some((
-                            hir::Mutability::Mut => (
                             sp,
-                                "consider mutably borrowing here".to_string(),
+                            format!("consider {}borrowing here", mutability.mutably_str()),
-                                format!("{prefix}&mut {sugg_expr}"),
+                            format!("{prefix}{}{sugg_expr}", mutability.ref_prefix_str()),
                             Applicability::MachineApplicable,
                             false,
                             false,
-                            ),
+                        ));
-                            hir::Mutability::Not => (
-                                sp,
-                                "consider borrowing here".to_string(),
-                                format!("{prefix}&{sugg_expr}"),
-                                Applicability::MachineApplicable,
-                                false,
-                                false,
-                            ),
-                        });
                     }
                 }
             }