refactor: Emit -Ztrack-diagnostics in emit_messages_default

Author: Muscraft

compiler/rustc_errors/src/emitter.rs

@@ -1468,7 +1468,6 @@ impl HumanEmitter {
         level: &Level,
         max_line_num_len: usize,
         is_secondary: bool,
-        emitted_at: Option<&DiagLocation>,
         is_cont: bool,
     ) -> io::Result<()> {
         let mut buffer = StyledBuffer::new();
@@ -1960,12 +1959,6 @@ impl HumanEmitter {
             trace!("buffer: {:#?}", buffer.render());
         }
 
-        if let Some(tracked) = emitted_at {
-            let track = format!("-Ztrack-diagnostics: created at {tracked}");
-            let len = buffer.num_lines();
-            buffer.append(len, &track, Style::NoStyle);
-        }
-
         // final step: take our styled buffer, render it, then output it
         emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
 
@@ -2477,34 +2470,46 @@ impl HumanEmitter {
             level,
             max_line_num_len,
             false,
-            emitted_at,
             !children.is_empty()
                 || suggestions.iter().any(|s| s.style != SuggestionStyle::CompletelyHidden),
         ) {
             Ok(()) => {
+                let mut buffer = StyledBuffer::new();
+                let primary_span = span.primary_span().unwrap_or_default();
+                if let (Some(tracked), false) = (emitted_at, primary_span.is_dummy()) {
+                    if !self.short_message {
+                        let track = format!("-Ztrack-diagnostics: created at {tracked}");
+                        buffer.append(0, &track, Style::NoStyle);
+                    }
+                }
                 if !children.is_empty()
                     || suggestions.iter().any(|s| s.style != SuggestionStyle::CompletelyHidden)
                 {
-                    let mut buffer = StyledBuffer::new();
+                    let line_offest = buffer.num_lines();
                     if !self.short_message {
                         if let Some(child) = children.iter().next()
                             && child.span.primary_spans().is_empty()
                         {
                             // We'll continue the vertical bar to point into the next note.
-                            self.draw_col_separator_no_space(&mut buffer, 0, max_line_num_len + 1);
+                            self.draw_col_separator_no_space(
+                                &mut buffer,
+                                line_offest,
+                                max_line_num_len + 1,
+                            );
                         } else {
                             // We'll close the vertical bar to visually end the code window.
-                            self.draw_col_separator_end(&mut buffer, 0, max_line_num_len + 1);
+                            self.draw_col_separator_end(
+                                &mut buffer,
+                                line_offest,
+                                max_line_num_len + 1,
+                            );
                         }
                     }
-                    if let Err(e) = emit_to_destination(
-                        &buffer.render(),
-                        level,
-                        &mut self.dst,
-                        self.short_message,
-                    ) {
-                        panic!("failed to emit error: {e}")
-                    }
+                }
+                if let Err(e) =
+                    emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)
+                {
+                    panic!("failed to emit error: {e}")
                 }
                 if !self.short_message {
                     for (i, child) in children.iter().enumerate() {
@@ -2523,7 +2528,6 @@ impl HumanEmitter {
                             &child.level,
                             max_line_num_len,
                             true,
-                            None,
                             !should_close,
                         ) {
                             panic!("failed to emit error: {err}");
@@ -2543,7 +2547,6 @@ impl HumanEmitter {
                                     &Level::Help,
                                     max_line_num_len,
                                     true,
-                                    None,
                                     // FIXME: this needs to account for the suggestion type,
                                     //        some don't take any space.
                                     i + 1 != suggestions.len(),