eager_diag issue on diag struct

Author: AndyJado

compiler/rustc_borrowck/messages.ftl

@@ -24,37 +24,37 @@ borrowck_assign_part_due_to_use_generator =
     assign to part occurs due to use in generator
 
 borrowck_assign_place_behind_const_pointer =
-    cannot assign to {$place}, which is behind a `*const` pointer
+    cannot assign to `{$place}`, which is behind a `*const` pointer
 
 borrowck_assign_place_behind_deref =
-    cannot assign to {$place}, which is behind {$name}
+    cannot assign to `{$place}`, which is behind {$name}
 
 borrowck_assign_place_behind_index =
-    cannot assign to {$place}, which is behind an index of {$ty}
+    cannot assign to `{$place}`, which is behind an index of {$ty}
 
 borrowck_assign_place_behind_ref =
-    cannot assign to {$place}, which is behind a `&` reference
+    cannot assign to `{$place}`, which is behind a `&` reference
 
 borrowck_assign_place_declared_immute =
-    cannot assign to {$place}, as it is not declared as mutable
+    cannot assign to `{$place}`, as it is not declared as mutable
 
 borrowck_assign_place_in_fn =
-    cannot assign to {$place}, as it is a captured variable in a `Fn` closure
+    cannot assign to `{$place}`, as it is a captured variable in a `Fn` closure
 
 borrowck_assign_place_in_pattern_guard_immute =
-    cannot assign to {$place}, as it is immutable for the pattern guard
+    cannot assign to `{$place}`, as it is immutable for the pattern guard
 
 borrowck_assign_place_static =
-    cannot assign to immutable static item {$place}
+    cannot assign to immutable static item `{$place}`
 
 borrowck_assign_symbol_declared_immute =
-    cannot assign to {$place}, as `{$name}` is not declared as mutable
+    cannot assign to `{$place}`, as `{$name}` is not declared as mutable
 
 borrowck_assign_symbol_static =
-    cannot assign to {$place}, as `{$static_name}` is an immutable static item
+    cannot assign to `{$place}`, as `{$static_name}` is an immutable static item
 
 borrowck_assign_upvar_in_fn =
-    cannot assign to {$place}, as `Fn` closures cannot mutate their captured variables
+    cannot assign to `{$place}`, as `Fn` closures cannot mutate their captured variables
 
 borrowck_borrow_due_to_use_closure =
     borrow occurs due to use in closure
@@ -396,37 +396,37 @@ borrowck_mut_borrow_data_behind_ref =
     cannot borrow data in a `&` reference as mutable
 
 borrowck_mut_borrow_place_declared_immute =
-    cannot borrow {$place} as mutable, as it is not declared as mutable
+    cannot borrow `{$place}` as mutable, as it is not declared as mutable
 
 borrowck_mut_borrow_place_in_pattern_guard_immute =
-    cannot borrow {$place} as mutable, as it is immutable for the pattern guard
+    cannot borrow `{$place}` as mutable, as it is immutable for the pattern guard
 
 borrowck_mut_borrow_place_static =
-    cannot borrow immutable static item {$place} as mutable
+    cannot borrow immutable static item `{$place}` as mutable
 
 borrowck_mut_borrow_self_behind_const_pointer =
-    cannot borrow {$place} as mutable, as it is behind a `*const` pointer
+    cannot borrow `{$place}` as mutable, as it is behind a `*const` pointer
 
 borrowck_mut_borrow_self_behind_deref =
-    cannot borrow {$place} as mutable, as it is behind {$name}
+    cannot borrow `{$place}` as mutable, as it is behind {$name}
 
 borrowck_mut_borrow_self_behind_index =
-    cannot borrow {$place} as mutable, as it is behind an index of {$name}
+    cannot borrow `{$place}` as mutable, as it is behind an index of {$name}
 
 borrowck_mut_borrow_self_behind_ref =
-    cannot borrow {$place} as mutable, as it is behind a `&` reference
+    cannot borrow `{$place}` as mutable, as it is behind a `&` reference
 
 borrowck_mut_borrow_self_in_fn =
-    cannot borrow {$place} as mutable, as it is a captured variable in a `Fn` closure
+    cannot borrow `{$place}` as mutable, as it is a captured variable in a `Fn` closure
 
 borrowck_mut_borrow_symbol_declared_immute =
-    cannot borrow {$place} as mutable, as `{$name}` is not declared as mutable
+    cannot borrow `{$place}` as mutable, as `{$name}` is not declared as mutable
 
 borrowck_mut_borrow_symbol_static =
-    cannot borrow {$place} as mutable, as `{$static_name}` is an immutable static item
+    cannot borrow `{$place}` as mutable, as `{$static_name}` is an immutable static item
 
 borrowck_mut_borrow_upvar_in_fn =
-    cannot borrow {$place} as mutable, as `Fn` closures cannot mutate their captured variables
+    cannot borrow `{$place}` as mutable, as `Fn` closures cannot mutate their captured variables
 
 borrowck_mutably_borrow_multiply_loop_label =
     {$is_place_empty ->

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -67,14 +67,7 @@ pub(super) struct DescribedPlace(pub(super) Option<String>);
 
 impl IntoDiagnosticArg for DescribedPlace {
     fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
-        let mut desc = self.0;
-        desc.as_mut().map(|s| {
-            s.reserve(2);
-            s.insert(0, '`');
-            s.push('`');
-            s
-        });
-        match desc {
+        match self.0 {
             Some(descr) => descr.into_diagnostic_arg(),
             None => "value".into_diagnostic_arg(),
         }