refactor: Move drawing seconday messages to a function

Author: Muscraft

compiler/rustc_errors/src/emitter.rs

@@ -1475,33 +1475,15 @@ impl HumanEmitter {
 
         if !msp.has_primary_spans() && !msp.has_span_labels() && is_secondary && !self.short_message
         {
-            // This is a secondary message with no span info
-            for _ in 0..max_line_num_len {
-                buffer.prepend(0, " ", Style::NoStyle);
-            }
-            self.draw_note_separator(&mut buffer, 0, max_line_num_len + 1, is_cont);
-            if *level != Level::FailureNote {
-                buffer.append(0, level.to_str(), Style::MainHeaderMsg);
-                buffer.append(0, ": ", Style::NoStyle);
-            }
-            let printed_lines =
-                self.msgs_to_buffer(&mut buffer, msgs, args, max_line_num_len, "note", None);
-            if is_cont && matches!(self.theme, OutputTheme::Unicode) {
-                // There's another note after this one, associated to the subwindow above.
-                // We write additional vertical lines to join them:
-                //   ╭▸ test.rs:3:3
-                //   │
-                // 3 │   code
-                //   │   ━━━━
-                //   │
-                //   ├ note: foo
-                //   │       bar
-                //   ╰ note: foo
-                //           bar
-                for i in 1..=printed_lines {
-                    self.draw_col_separator_no_space(&mut buffer, i, max_line_num_len + 1);
-                }
-            }
+            self.draw_secondary_message(
+                &mut buffer,
+                msgs,
+                args,
+                0,
+                level,
+                max_line_num_len,
+                is_cont,
+            );
         } else {
             let mut label_width = 0;
             // The failure note level itself does not provide any useful diagnostic information
@@ -2740,6 +2722,44 @@ impl HumanEmitter {
         *row_num += 1;
     }
 
+    fn draw_secondary_message(
+        &self,
+        buffer: &mut StyledBuffer,
+        msgs: &[(DiagMessage, Style)],
+        args: &FluentArgs<'_>,
+        line: usize,
+        level: &Level,
+        max_line_num_len: usize,
+        is_cont: bool,
+    ) {
+        // This is a secondary message with no sphan info
+        for _ in 0..max_line_num_len {
+            buffer.prepend(line, " ", Style::NoStyle);
+        }
+        self.draw_note_separator(buffer, line, max_line_num_len + 1, is_cont);
+        if *level != Level::FailureNote {
+            buffer.append(line, level.to_str(), Style::MainHeaderMsg);
+            buffer.append(line, ": ", Style::NoStyle);
+        }
+        let printed_lines = self.msgs_to_buffer(buffer, msgs, args, max_line_num_len, "note", None);
+        if is_cont && matches!(self.theme, OutputTheme::Unicode) {
+            // There's another note after this one, associated to the subwindow above.
+            // We write additional vertical lines to join them:
+            //   ╭▸ test.rs:3:3
+            //   │
+            // 3 │   code
+            //   │   ━━━━
+            //   │
+            //   ├ note: foo
+            //   │       bar
+            //   ╰ note: foo
+            //           bar
+            for i in 1 + line..=printed_lines + line {
+                self.draw_col_separator_no_space(buffer, i, max_line_num_len + 1);
+            }
+        }
+    }
+
     fn underline(&self, is_primary: bool) -> UnderlineParts {
         //               X0 Y0
         // label_start > ┯━━━━ < underline