bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #139807 - Kobzol:post-merge-report-wording, r=marcoieni

Browse source 
Improve wording of post-merge report

Slight changes to improve the rendered output e.g. [here](https://github.com/rust-lang/rust/pull/139241#issuecomment-2801733750) if only doctest changes were found.

r? `@marcoieni`
This commit is contained in:
Matthias Krüger 2025-04-14 18:15:34 +02:00 • committed by GitHub
commit 47e5b18f33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ci/citool/src/analysis.rs
View file

@ -520,23 +520,27 @@ fn report_test_diffs(
}
if doctest_count > 0 {
let prefix =
if doctest_count < original_diff_count { "Additionally, " } else { "" };
println!(
"\nAdditionally, {doctest_count} doctest {} were found. These are ignored, as they are noisy.",
"\n{prefix}{doctest_count} doctest {} were found. These are ignored, as they are noisy.",
pluralize("diff", doctest_count)
);
}
// Now print the job group index
println!("\n**Job group index**\n");
for (group, jobs) in job_index.into_iter().enumerate() {
println!(
"- {}: {}",
format_job_group(group as u64),
jobs.iter()
.map(|j| format_job_link(job_info_resolver, job_metrics, j))
.collect::<Vec<_>>()
.join(", ")
);
if !job_index.is_empty() {
println!("\n**Job group index**\n");
for (group, jobs) in job_index.into_iter().enumerate() {
println!(
"- {}: {}",
format_job_group(group as u64),
jobs.iter()
.map(|j| format_job_link(job_info_resolver, job_metrics, j))
.collect::<Vec<_>>()
.join(", ")
);
}
}
},
);