From 1befb0bac0310b8585a244eb009e7f795c293c53 Mon Sep 17 00:00:00 2001 From: Scott Schafer Date: Thu, 13 Nov 2025 03:50:17 -0700 Subject: [PATCH] fix: Only add extra padding to the first group's last file --- compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs | 2 ++ tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs index 5b1fffd21d18..f26bf31a1aea 100644 --- a/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs +++ b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs @@ -213,6 +213,7 @@ impl AnnotateSnippetEmitter { file_ann.swap(0, pos); } + let file_ann_len = file_ann.len(); for (file_idx, (file, annotations)) in file_ann.into_iter().enumerate() { if should_show_source_code(&self.ignored_directories_in_source_blocks, sm, &file) { if let Some(snippet) = self.annotated_snippet(annotations, &file.name, sm) { @@ -240,6 +241,7 @@ impl AnnotateSnippetEmitter { // ╰ warning: this was previously accepted if let Some(c) = children.first() && (!c.span.has_primary_spans() && !c.span.has_span_labels()) + && file_idx == file_ann_len - 1 { group = group.element(Padding); } diff --git a/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout b/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout index 1048db07ae95..65989a8ef47c 100644 --- a/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout +++ b/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout @@ -19,7 +19,6 @@ LL | println!(); error: macro expansion ignores `{` and any tokens following --> $SRC_DIR/std/src/macros.rs:LL:COL | - | ::: $DIR/main-alongside-macro-calls.rs:30:1 | LL | println!(); @@ -42,7 +41,6 @@ LL | println!(); error: macro expansion ignores `{` and any tokens following --> $SRC_DIR/std/src/macros.rs:LL:COL | - | ::: $DIR/main-alongside-macro-calls.rs:34:1 | LL | println!();