Skip to content
/ rust Public
forked from rust-lang/rust

Commit 47e5b18

Browse files
authored
Rollup merge of rust-lang#139807 - Kobzol:post-merge-report-wording, r=marcoieni
Improve wording of post-merge report Slight changes to improve the rendered output e.g. [here](rust-lang#139241 (comment)) if only doctest changes were found. r? `@marcoieni`
2 parents b70e119 + 3da0a19 commit 47e5b18

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

Diff for: src/ci/citool/src/analysis.rs

+15-11
Original file line numberDiff line numberDiff line change
@@ -520,23 +520,27 @@ fn report_test_diffs(
520520
}
521521

522522
if doctest_count > 0 {
523+
let prefix =
524+
if doctest_count < original_diff_count { "Additionally, " } else { "" };
523525
println!(
524-
"\nAdditionally, {doctest_count} doctest {} were found. These are ignored, as they are noisy.",
526+
"\n{prefix}{doctest_count} doctest {} were found. These are ignored, as they are noisy.",
525527
pluralize("diff", doctest_count)
526528
);
527529
}
528530

529531
// Now print the job group index
530-
println!("\n**Job group index**\n");
531-
for (group, jobs) in job_index.into_iter().enumerate() {
532-
println!(
533-
"- {}: {}",
534-
format_job_group(group as u64),
535-
jobs.iter()
536-
.map(|j| format_job_link(job_info_resolver, job_metrics, j))
537-
.collect::<Vec<_>>()
538-
.join(", ")
539-
);
532+
if !job_index.is_empty() {
533+
println!("\n**Job group index**\n");
534+
for (group, jobs) in job_index.into_iter().enumerate() {
535+
println!(
536+
"- {}: {}",
537+
format_job_group(group as u64),
538+
jobs.iter()
539+
.map(|j| format_job_link(job_info_resolver, job_metrics, j))
540+
.collect::<Vec<_>>()
541+
.join(", ")
542+
);
543+
}
540544
}
541545
},
542546
);

0 commit comments

Comments
 (0)