Skip to content

fix(collect): say "1 binary", not "1 binaryy" #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cargo-affected-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(collect): say "1 binary", not "1 binaryy" #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/collect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ pub(crate) fn collect(
None,
)?;
eprintln!(
"found {} tests across {} binaries",
"found {} tests across {}",
listing.tests.len(),
listing.binaries.len()
binaries_phrase(listing.binaries.len())
);
let fingerprint = fingerprint::compute(&project)?;
let env_fingerprint = &fingerprint.hex;
Expand Down Expand Up @@ -259,8 +259,10 @@ pub(crate) fn collect(
// binaries this run will actually touch need a map — a `--diff` collect
// rerunning three tests shouldn't pay to export a whole workspace.
let mapped = binaries_for_run(&listing, diff_plan.as_ref());
let s = if mapped.len() == 1 { "y" } else { "ies" };
eprintln!("exporting coverage maps for {} binary{s}...", mapped.len());
eprintln!(
"exporting coverage maps for {}...",
binaries_phrase(mapped.len())
);
write_function_maps(
&function_maps_dir,
&mapped,
Expand Down Expand Up @@ -453,6 +455,13 @@ const STAGING_DIR_PREFIXES: &[&str] = &[
FUNCTION_MAPS_DIR_PREFIX,
];

/// "1 binary" / "2 binaries". The plural split lands mid-word, so this can't
/// be a suffix interpolated after the noun the way `{n} test{s}` can — doing
/// that is what produced "1 binaryy" in the map-export line.
fn binaries_phrase(n: usize) -> String {
format!("{n} binar{}", if n == 1 { "y" } else { "ies" })
}

/// The binaries whose tests this run will execute, and so the ones needing a
/// coverage map.
///
Expand Down Expand Up @@ -1324,6 +1333,13 @@ fn current_target() -> String {
mod tests {
use super::*;

#[test]
fn binaries_phrase_splits_the_noun_not_the_suffix() {
assert_eq!(binaries_phrase(0), "0 binaries");
assert_eq!(binaries_phrase(1), "1 binary");
assert_eq!(binaries_phrase(2), "2 binaries");
}

fn listing(binaries: &[(&str, &str)], tests: &[(&str, &str)]) -> Listing {
Listing {
tests: tests.iter().map(|(b, t)| TestId::new(*b, *t)).collect(),
Expand Down
Loading