Factor out repeated code in suggestion.

Author: nnethercote

compiler/rustc_hir/src/hir.rs

@@ -305,32 +305,29 @@ impl Lifetime {
 
         debug_assert!(new_lifetime.starts_with('\''));
 
-        match (self.syntax, self.source) {
+        let s = match (self.syntax, self.source) {
             // The user wrote `'a` or `'_`.
-            (Named | Anonymous, _) => (self.ident.span, format!("{new_lifetime}")),
+            (Named | Anonymous, _) => format!("{new_lifetime}"),
 
             // The user wrote `Path<T>`, and omitted the `'_,`.
-            (Hidden, Path { angle_brackets: AngleBrackets::Full }) => {
-                (self.ident.span, format!("{new_lifetime}, "))
-            }
+            (Hidden, Path { angle_brackets: AngleBrackets::Full }) => format!("{new_lifetime}, "),
 
             // The user wrote `Path<>`, and omitted the `'_`..
-            (Hidden, Path { angle_brackets: AngleBrackets::Empty }) => {
-                (self.ident.span, format!("{new_lifetime}, "))
-            }
+            (Hidden, Path { angle_brackets: AngleBrackets::Empty }) => format!("{new_lifetime}, "),
 
             // The user wrote `Path` and omitted the `<'_>`.
             (Hidden, Path { angle_brackets: AngleBrackets::Missing }) => {
-                (self.ident.span, format!("<{new_lifetime}>"))
+                format!("<{new_lifetime}>")
             }
 
             // The user wrote `&type` or `&mut type`.
-            (Hidden, Reference) => (self.ident.span, format!("{new_lifetime} ")),
+            (Hidden, Reference) => format!("{new_lifetime} "),
 
             (Hidden, source) => {
                 unreachable!("can't suggest for a hidden lifetime of {source:?}")
             }
-        }
+        };
+        (self.ident.span, s)
     }
 }