Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
fix: convert newer linters
hippietrail89efd0aa8583
diff --git a/harper-core/src/linting/all_intents_and_purposes.rs b/harper-core/src/linting/all_intents_and_purposes.rsindex 2dbde7ce5..c4fe5a33b 100644--- a/harper-core/src/linting/all_intents_and_purposes.rs+++ b/harper-core/src/linting/all_intents_and_purposes.rs@@ -34,9 +34,9 @@ impl Default for AllIntentsAndPurposes {])),]).t_ws()- .t_set(&["purposes", "purpose"])+ .t_set(["purposes", "purpose"]).but_not(- SequenceExpr::word_set(&["for", "to"])+ SequenceExpr::word_set(["for", "to"]).t_ws().then_word_seq(&["all", "intents", "and", "purposes"]),),diff --git a/harper-core/src/linting/chicken_and_egg.rs b/harper-core/src/linting/chicken_and_egg.rsindex e7d3de278..1f14d4412 100644--- a/harper-core/src/linting/chicken_and_egg.rs+++ b/harper-core/src/linting/chicken_and_egg.rs@@ -40,7 +40,7 @@ impl Default for ChickenAndEgg {Box::new(SequenceExpr::whitespace().t_aco("and").t_ws().t_aco("egg")),]);- let conj_word = Lrc::new(WordSet::new(&["and", "an", "or", "vs.", "versus"]));+ let conj_word = Lrc::new(WordSet::new(["and", "an", "or", "vs.", "versus"]));let conj_sym = |t: &Token, _: &[char]| t.kind.is_ampersand() || t.kind.is_slash();let separated_conj = SequenceExpr::default()@@ -68,12 +68,12 @@ impl Default for ChickenAndEgg {]);Self {- expr: SequenceExpr::word_set(&["chicken", "chickens"])+ expr: SequenceExpr::word_set(["chicken", "chickens"]).then_optional(LongestMatchOf::new([Box::new(conjunction) as Box<dyn Expr>,Box::new(separated_conj_det),]))- .t_set(&["egg", "eggs"])+ .t_set(["egg", "eggs"]).t_ws().t_set(HEAD_NOUNS).but_not(standard_idiom),diff --git a/harper-core/src/linting/on_the_fence.rs b/harper-core/src/linting/on_the_fence.rsindex 081dc5769..7a2635937 100644--- a/harper-core/src/linting/on_the_fence.rs+++ b/harper-core/src/linting/on_the_fence.rs@@ -17,24 +17,24 @@ impl Default for OnTheFence {fn default() -> Self {Self {expr: SequenceExpr::any_of([- Box::new(WordSet::new(&[+ Box::new(WordSet::new([// "it's" is intentionally omitted"i'm", "we're", "you're", "he's", "she's", "they're",])) as Box<dyn Expr>,- Box::new(SequenceExpr::aco("i").t_ws().t_set(&["am", "was"])),+ Box::new(SequenceExpr::aco("i").t_ws().t_set(["am", "was"])),Box::new(- SequenceExpr::word_set(&["we", "you", "they"])+ SequenceExpr::word_set(["we", "you", "they"]).t_ws()- .t_set(&["are", "were"]),+ .t_set(["are", "were"]),),Box::new(// "it" is intentionally omitted- SequenceExpr::word_set(&["he", "she", "anybody", "anyone"])+ SequenceExpr::word_set(["he", "she", "anybody", "anyone"]).t_ws()- .t_set(&["is", "was"]),+ .t_set(["is", "was"]),),])- .then_optional(SequenceExpr::whitespace().t_set(&["also", "still"]))+ .then_optional(SequenceExpr::whitespace().t_set(["also", "still"])).t_ws().then_word_seq(&["on", "a", "fence"]).then_any_of([diff --git a/harper-core/src/linting/waist_waste.rs b/harper-core/src/linting/waist_waste.rsindex 8306eb5c9..6ad2347d6 100644--- a/harper-core/src/linting/waist_waste.rs+++ b/harper-core/src/linting/waist_waste.rs@@ -24,7 +24,7 @@ impl Default for WaistWaste {.t_ws().then_word_seq(&["a", "waist", "of"]),),- Box::new(SequenceExpr::word_seq(&["waist", "of"]).t_ws().t_set(&[+ Box::new(SequenceExpr::word_seq(&["waist", "of"]).t_ws().t_set(["effort","money","resources",@@ -32,7 +32,7 @@ impl Default for WaistWaste {"time",])),Box::new(- SequenceExpr::word_set(&[+ SequenceExpr::word_set(["complete","confusing","great",@@ -51,7 +51,7 @@ impl Default for WaistWaste {.then_possessive_determiner(),),Box::new(- SequenceExpr::word_set(&[+ SequenceExpr::word_set(["definitely","just","mostly",