Avoid parsing the root configuration twice #10625
Merged
Conversation
This file contains 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
|
MichaReiser
commented
Mar 27, 2024
| @@ -207,6 +207,15 @@ impl RuleSet { | |||
| *self = set.union(&RuleSet::from_rule(rule)); | |||
| } | |||
|
|
|||
| #[inline] | |||
| pub fn set(&mut self, rule: Rule, enabled: bool) { | |||
There was a problem hiding this comment.
This is kind of unrelated but I noticed that we can simplify configuration.rs a bit
Comment on lines
+1083
to
+1100
| let mut rule_selections = config.rule_selections; | ||
| rule_selections.extend(self.rule_selections); | ||
|
|
||
| let mut extend_safe_fixes = config.extend_safe_fixes; | ||
| extend_safe_fixes.extend(self.extend_safe_fixes); | ||
|
|
||
| let mut extend_unsafe_fixes = config.extend_unsafe_fixes; | ||
| extend_unsafe_fixes.extend(self.extend_unsafe_fixes); | ||
|
|
||
| let mut extend_per_file_ignores = config.extend_per_file_ignores; | ||
| extend_per_file_ignores.extend(self.extend_per_file_ignores); |
There was a problem hiding this comment.
Another unrelated config change. It avoids allocating a new Vec and instead reuses the existing vector.
MichaReiser
force-pushed
the
avoid-parsing-root-configuration-twice
branch
from
a6331cc
to
088771e
Compare
charliermarsh
approved these changes
Mar 27, 2024
MichaReiser
force-pushed
the
avoid-parsing-root-configuration-twice
branch
from
088771e
to
926ac20
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
I debugged #10622 and noticed that the root configuration is always resolved twice. This PR changes
python_files_in_pathto stop searching for configurations if it reached the root-configuration directory (because we can't find any more specific configuration).Test Plan
I added debug statements to verify that
into_settingsis no longer called twice for the root configuration.I see a 4% speedup when running the CPython all cached benchmarks with the default rule selection