refactor: use directly Vec slices

biomejs · May 24, 2024 · 0221b06 · 0221b06
1 parent 3ba4a5f
commit 0221b06
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/crates/biome_analyze/src/lib.rs b/crates/biome_analyze/src/lib.rs
@@ -823,9 +823,10 @@ pub struct AnalysisFilter<'a> {
     /// Only allow rules with these categories to emit signals
     pub categories: RuleCategories,
     /// Only allow rules matching these names to emit signals
+    /// If `enabled_rules` is set to `None`, then all rules are enabled.
     pub enabled_rules: Option<&'a [RuleFilter<'a>]>,
     /// Do not allow rules matching these names to emit signals
-    pub disabled_rules: Option<&'a [RuleFilter<'a>]>,
+    pub disabled_rules: &'a [RuleFilter<'a>],
     /// Only emit signals matching this text range
     pub range: Option<TextRange>,
 }
@@ -850,20 +851,22 @@ impl<'analysis> AnalysisFilter<'analysis> {
             && self.enabled_rules.map_or(true, |enabled_rules| {
                 enabled_rules.iter().any(|filter| filter.match_group::<G>())
             })
-            && self.disabled_rules.map_or(true, |disabled_rules| {
-                !disabled_rules.iter().any(|filter| {
-                    matches!(filter, RuleFilter::Group(_)) && filter.match_group::<G>()
-                })
-            })
+            && !self
+                .disabled_rules
+                .iter()
+                .any(|filter| matches!(filter, RuleFilter::Group(_)) && filter.match_group::<G>())
     }
 
     /// Return `true` if the rule `R` matches this filter
     pub fn match_rule<R: Rule>(&self) -> bool {
-        self.enabled_rules.map_or(true, |enabled_rules| {
-            enabled_rules.iter().any(|filter| filter.match_rule::<R>())
-        }) && self.disabled_rules.map_or(true, |disabled_rules| {
-            !disabled_rules.iter().any(|filter| filter.match_rule::<R>())
-        })
+        self.match_category::<<R::Group as RuleGroup>::Category>()
+            && self.enabled_rules.map_or(true, |enabled_rules| {
+                enabled_rules.iter().any(|filter| filter.match_rule::<R>())
+            })
+            && !self
+                .disabled_rules
+                .iter()
+                .any(|filter| filter.match_rule::<R>())
     }
 }
 

diff --git a/crates/biome_service/src/file_handlers/css.rs b/crates/biome_service/src/file_handlers/css.rs
@@ -354,7 +354,7 @@ fn lint(params: LintParams) -> LintResults {
             let filter = AnalysisFilter {
                 categories: params.categories,
                 enabled_rules: Some(enabled_rules.as_slice()),
-                disabled_rules: (!disabled_rules.is_empty()).then_some(&disabled_rules),
+                disabled_rules: &disabled_rules,
                 range: None,
             };
 

diff --git a/crates/biome_service/src/file_handlers/javascript.rs b/crates/biome_service/src/file_handlers/javascript.rs
@@ -412,7 +412,7 @@ pub(crate) fn lint(params: LintParams) -> LintResults {
             let filter = AnalysisFilter {
                 categories: params.categories,
                 enabled_rules: Some(enabled_rules.as_slice()),
-                disabled_rules: (!disabled_rules.is_empty()).then_some(&disabled_rules),
+                disabled_rules: &disabled_rules,
                 range: None,
             };
 

diff --git a/crates/biome_service/src/file_handlers/json.rs b/crates/biome_service/src/file_handlers/json.rs
@@ -336,7 +336,7 @@ fn lint(params: LintParams) -> LintResults {
             let filter = AnalysisFilter {
                 categories: params.categories,
                 enabled_rules: Some(enabled_rules.as_slice()),
-                disabled_rules: (!disabled_rules.is_empty()).then_some(&disabled_rules),
+                disabled_rules: &disabled_rules,
                 range: None,
             };