diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-04-14 18:15:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-14 18:15:34 +0200 |
| commit | 47e5b18f33550ee3db479748650e93291fdec6eb (patch) | |
| tree | 4fc929f26945ae4ce2785d6b7519a2615d873227 | |
| parent | b70e119e37cf39c4efb1392e81d9f0fbceba457b (diff) | |
| parent | 3da0a19a291e62d1bb315b233a5fb74bcccb12ad (diff) | |
| download | rust-47e5b18f33550ee3db479748650e93291fdec6eb.tar.gz rust-47e5b18f33550ee3db479748650e93291fdec6eb.zip | |
Rollup merge of #139807 - Kobzol:post-merge-report-wording, r=marcoieni
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`
| -rw-r--r-- | src/ci/citool/src/analysis.rs | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/ci/citool/src/analysis.rs b/src/ci/citool/src/analysis.rs index 208a494183c..9fc7c309bfb 100644 --- a/src/ci/citool/src/analysis.rs +++ b/src/ci/citool/src/analysis.rs @@ -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(", ") + ); + } } }, ); |
