Skip to content

fix: allow check-rust to complete without cargo hack #2588

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
hippietrail wants to merge 6 commits into
base: master
Choose a base branch
from
+43 −5
Open

fix: allow check-rust to complete without cargo hack #2588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1489fb
fix: allow `check-rust` to complete without `cargo hack`
hippietrail Jan 25, 2026
6c8ab9b
fix: change the check for `cargo hack`
hippietrail Jan 25, 2026
07827db
refactor: `DISABLE_CARGO_HACK` approach as per PR feedback
hippietrail Jan 27, 2026
afea6a9
Merge branch 'master' of http://github.com/Automattic/harper into war…
hippietrail Jan 28, 2026
021ceaf
fix: fail if `cargo-hack` is missing and `DISABLE_CARGO_HACK` not spe…
hippietrail Jan 28, 2026
5e3ffd9
feat: flash in the pans→flashes in the pan
hippietrail Jan 28, 2026
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
39 changes: 35 additions & 4 deletions harper-core/src/linting/plural_wrong_word_of_phrase.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ pub struct PluralWrongWordOfPhrase {
// If a noun needs other than an -s suffix to be pluralized, include it as the 2nd array element.
const PATTERNS: &[(&[&str], &str, &[&str])] = &[
(&["body", "bodies"], "in", &["white"]),
(&["flash", "flashes"], "in the", &["pan"]),
(&["flash", "flashes"], "in-the", &["pan"]),
(&["line"], "of", &["code"]),
(&["part"], "of", &["speech", "speeches"]),
(&["point"], "of", &["view"]),
Expand All @@ -33,7 +35,7 @@ impl Default for PluralWrongWordOfPhrase {

let mut mistakes = vec![];

for &(main_noun, prep, last_noun) in PATTERNS {
for &(main_noun, mid, last_noun) in PATTERNS {
let main_pl = if main_noun.len() == 2 {
main_noun[1].to_string()
} else {
Expand All @@ -51,7 +53,7 @@ impl Default for PluralWrongWordOfPhrase {
Box::new(word_string(main_pl)),
])
.t_ws_h()
.t_aco(prep)
.then_fixed_phrase(mid)
.t_ws_h()
.then(word_string(last_pl)),
) as Box<dyn Expr>);
Expand Down Expand Up @@ -82,7 +84,7 @@ impl ExprLinter for PluralWrongWordOfPhrase {
last_noun_span.get_content(src),
);

let (main_noun, prep, last_noun) = PATTERNS.iter().find(|(main, _, last)| {
let (main_noun, mid, last_noun) = PATTERNS.iter().find(|(main, _, last)| {
main_noun_chars.starts_with_ignore_ascii_case_str(main[0])
&& last_noun_chars.starts_with_ignore_ascii_case_str(last[0])
})?;
Expand All @@ -97,7 +99,7 @@ impl ExprLinter for PluralWrongWordOfPhrase {
lint_kind: LintKind::Usage,
span: toks.span()?,
suggestions: vec![Suggestion::replace_with_match_case(
format!("{} {} {}", main_noun_pl, prep, last_noun[0])
format!("{} {} {}", main_noun_pl, mid, last_noun[0])
.chars()
.collect::<Vec<char>>(),
toks.span()?.get_content(src),
Expand Down Expand Up @@ -232,4 +234,33 @@ mod tests {
"I'm not sure, but just having seen a lot of bodies in white, I know normally they try to spot weld it.",
);
}

// FlashesInThePan

#[test]
fn correct_flash_in_the_pans() {
assert_suggestion_result(
"I wish they do more flash in the pans, like the suggestions they do on ERB2 could be such a good way to see if these suggestions are worthy.",
PluralWrongWordOfPhrase::default(),
"I wish they do more flashes in the pan, like the suggestions they do on ERB2 could be such a good way to see if these suggestions are worthy.",
);
}

#[test]
fn correct_flash_in_the_pans_hyphenated() {
assert_suggestion_result(
"what makes 'Super Hexagon' rise above other nostalgic flash-in-the-pans is that there is a game to be learned here",
PluralWrongWordOfPhrase::default(),
"what makes 'Super Hexagon' rise above other nostalgic flashes in the pan is that there is a game to be learned here",
);
}

#[test]
fn correct_flashes_in_the_pans() {
assert_suggestion_result(
"Who are some of the biggest flashes in the pans in wrestling history?",
PluralWrongWordOfPhrase::default(),
"Who are some of the biggest flashes in the pan in wrestling history?",
);
}
}
9 changes: 8 additions & 1 deletion justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,14 @@ check-rust: auditdictionary
cargo fmt -- --check
cargo clippy -- -Dwarnings -D clippy::dbg_macro -D clippy::needless_raw_string_hashes

cargo hack check --each-feature
if cargo --list | grep -q '^ *hack$'; then
cargo hack check --each-feature
elif [[ "${DISABLE_CARGO_HACK:-0}" -eq 1 ]]; then
echo "ℹ️ cargo-hack disabled via DISABLE_CARGO_HACK=1"
else
echo "\n❌ cargo-hack not found. Install with 'cargo install cargo-hack' or set DISABLE_CARGO_HACK=1 to skip.\n" >&2
exit 1
fi

# Perform format and type checking.
check: check-rust check-js build-web
Expand Down
Loading