Code deduplication in tool_only_multipart_suggestion

compiler/rustc_errors/src/diagnostic.rs

@@ -686,19 +686,12 @@ impl Diagnostic {
         suggestion: Vec<(Span, String)>,
         applicability: Applicability,
     ) -> &mut Self {
-        assert!(!suggestion.is_empty());
+        self.multipart_suggestion_with_style(
-        self.push_suggestion(CodeSuggestion {
+            msg,
-            substitutions: vec![Substitution {
+            suggestion,
-                parts: suggestion
-                    .into_iter()
-                    .map(|(span, snippet)| SubstitutionPart { snippet, span })
-                    .collect(),
-            }],
-            msg: self.subdiagnostic_message_to_diagnostic_message(msg),
-            style: SuggestionStyle::CompletelyHidden,
             applicability,
-        });
+            SuggestionStyle::CompletelyHidden,
-        self
+        )
     }
 
     /// Prints out a message with a suggested edit of the code.