refactor(linter): store severity separately, remove RuleWithSeverity
#11051
+129
−197
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
CodSpeed Instrumentation Performance ReportMerging #11051 will not alter performanceComparing Summary
|
a1a44e8 to
096e5f0
Compare
RuleWithSeverityRuleWithSeverity
RuleWithSeverityRuleWithSeverity
There was a problem hiding this comment.
Pull Request Overview
This PR removes the RuleWithSeverity struct in favor of storing each rule’s severity separately (as (RuleEnum, AllowWarnDeny)) and cleans up all related code paths.
- Eliminate
RuleWithSeverityand switch to aFxHashMap<RuleEnum, AllowWarnDeny>or tuples in all modules - Update builder, store, override logic, linter, context spawning, and tests to use the new representation
- Adjust imports and
clippy.tomlto reflect the removal
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| crates/oxc_linter/src/tester.rs | Updated with_rule invocation to accept (rule, severity) |
| crates/oxc_linter/src/rule.rs | Removed the RuleWithSeverity struct and related trait impls |
| crates/oxc_linter/src/lib.rs | Switched Linter fields and methods to tuple-based severity |
| crates/oxc_linter/src/context/host.rs | Changed spawn to take RuleEnum and AllowWarnDeny separately |
| crates/oxc_linter/src/config/rules.rs | Migrated RuleSet from FxHashSet to FxHashMap |
| crates/oxc_linter/src/config/mod.rs | Updated test setup to use FxHashMap for rules |
| crates/oxc_linter/src/config/config_store.rs | Refactored ResolvedLinterState and config store to tuples |
| crates/oxc_linter/src/config/config_builder.rs | Refactored builder storage and rule filter methods |
| .clippy.toml | Adjusted ignore-interior-mutability entry for RuleEnum |
Comments suppressed due to low confidence (1)
crates/oxc_linter/src/lib.rs:66
- [nitpick] Remove the commented-out
rules: Vec<RuleWithSeverity>field fromLintersince the struct has been removed and the comment is now stale.
// rules: Vec<RuleWithSeverity>,
Merge activity
|
#11051) Originally I thought this might improve performance by storing the `AllowWarnDeny` separately, since it only occupies 1 byte, while the struct needs to be aligned to 8 bytes (I think?). But it didn't really make any difference. However, I think it's still worth merging as removing the `RuleWithSeverity` struct makes it conceptually simpler, since we don't have yet another rule-like struct in the codebase.
096e5f0 to
7ad6cf8
Compare
camc314
added a commit
that referenced
this pull request
May 16, 2025
## [0.16.11] - 2025-05-16 ### Features - 078bf0b language_server: Better fallback handling when passing invalid `Options` values (#10930) (Sysix) - be7f7e1 language_server/editor: Support multi workspace folders (#10875) (Sysix) - eef93b4 linter: Add import/no-unassigned-import (#10970) (yefan) - cc0112f linter: No-unused-vars add setting for `reportVarsOnlyUsedAsTypes` (#11009) (camc314) - 17e49c3 linter: Implement configuration and checking loops for `eslint/no_constant_condition` (#10949) (Ulrich Stark) - 21117ac linter: Implement react/forbid-elements (#10928) (Thomas BOCQUEZ) - 466c24a linter: Add gitlab reporter output format (#10927) (Connor Pearson) - a064082 linter: Add import/consistent-type-specifier-style rule (#10858) (yefan) - 4733b52 linter/no-extraneous-class: Add conditional fixer (#10798) (DonIsaac) ### Bug Fixes - 87bf2a8 editor: Send only `workspace/didChangeConfiguration` when some workspace configuration is effected (#11017) (Sysix) - ed5708d editor: Detect all workspaces config path changes (#11016) (Sysix) - 89cc21b language_server: Normalize oxlintrc config path (#10982) (Sysix) - c52a9ba linter: Fix plugins inside overrides not being applied (#11057) (camc314) - b12bd48 linter: Fix rule config not being correctly applied (#11055) (camc314) - 9a368be linter: False negative in no-restriced-imports with `patterns` and side effects (#11027) (camc314) - 8c2cfbc linter: False negative in no-restricted-imports (#11026) (camc314) - 8956870 linter: False positive in no-unused-vars (#11002) (camc314) - 33a60d2 linter: Skip eslint/no-redeclare when running on modules (#11004) (camc314) - 39063ce linter: Reword diagnostic message for no-control-regex (#10993) (camc314) - 9eedb58 linter: False positive with negative matches in no-restricted-imports (#10976) (camc314) - 10e77d7 linter: Improve diagnostics for no-control-regex (#10959) (camc314) - 0961296 linter: Add `gitlab` to linter `--help` docs (#10932) (camc314) - 82889ae linter/no-extraneous-class: Improve docs, reporting and code refactor (#10797) (DonIsaac) - 11c34e7 linter/no-img-element: Improve diagnostic and docs (#10908) (DonIsaac) - 584d8b9 napi: Enable mimalloc `no_opt_arch` feature on linux aarch64 (#11053) (Boshen) - 126ae75 semantic: Distinguish class private elements (#11044) (magic-akari) - 773d0de semantic: Correctly handle nested brackets in jsdoc parsing (#10922) (camc314) - b215b6c semantic: Dont parse `@` as jsdoc tags inside `[`/`]` (#10919) (camc314) ### Documentation - db6afb9 linter: Improve docs of no-debugger (#11033) (camc314) - 16541de linter: Improve docs of default-param-last (#11032) (camc314) - 2c2f3c4 linter: Improve docs of default-case-last (#11031) (camc314) - 56bb9ce linter: Improve docs of array-callback-return (#11030) (camc314) - 13dbcc6 linter: Correct docs for default config for no-redeclare (#10995) (camc314) - a86cbb3 linter: Fix incorrect backticks of fenced code blocks (#10947) (Ulrich Stark) ### Refactor - 3cc1466 language_server: New configuration structure for `initialize` and `workspace/didChangeConfiguration` (#10890) (Sysix) - bd2ef7d language_server: Use `Arc` for `diagnostic_report_map` (#10940) (Sysix) - bb999a3 language_server: Avoid cloning linter by taking reference in LintService (#10907) (Ulrich Stark) - d1b0c83 linter: Remove overrides index vec (#11058) (camc314) - 7ad6cf8 linter: Store severity separately, remove `RuleWithSeverity` (#11051) (camchenry) - e31c361 linter: Remove nested match statements in no-restricted-imports (#10975) (camc314) - 6ad9d4f linter: Tidy `eslint/func-names` (#10923) (camc314) - faf0a95 syntax: Rename `NameSpaceModule` to `NamespaceModule` (#10917) (Dunqing) ### Testing - 76b6b33 editor: Add tests for multi workspace folder setup (#10904) (Sysix) Co-authored-by: camc314 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Originally I thought this might improve performance by storing the
AllowWarnDenyseparately, since it only occupies 1 byte, while the struct needs to be aligned to 8 bytes (I think?). But it didn't really make any difference. However, I think it's still worth merging as removing theRuleWithSeveritystruct makes it conceptually simpler, since we don't have yet another rule-like struct in the codebase.