Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoids unnecessary overhead for `TC004`, when `TC001-003` are disabled (#14657)

This commit is contained in:
David Salvisberg 2024-11-28 16:28:24 +01:00 committed by GitHub
parent 3f6c65e78c
commit d9cbf2fe44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
View File

@ -52,16 +52,13 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
// Identify any valid runtime imports. If a module is imported at runtime, and // Identify any valid runtime imports. If a module is imported at runtime, and
// used at runtime, then by default, we avoid flagging any other // used at runtime, then by default, we avoid flagging any other
// imports from that model as typing-only. // imports from that model as typing-only.
// FIXME: This does not seem quite right, if only TC004 is enabled let enforce_typing_only_imports = !checker.source_type.is_stub()
// then we don't need to collect the runtime imports
let enforce_typing_imports = !checker.source_type.is_stub()
&& checker.any_enabled(&[ && checker.any_enabled(&[
Rule::RuntimeImportInTypeCheckingBlock,
Rule::TypingOnlyFirstPartyImport, Rule::TypingOnlyFirstPartyImport,
Rule::TypingOnlyStandardLibraryImport, Rule::TypingOnlyStandardLibraryImport,
Rule::TypingOnlyThirdPartyImport, Rule::TypingOnlyThirdPartyImport,
]); ]);
let runtime_imports: Vec<Vec<&Binding>> = if enforce_typing_imports { let runtime_imports: Vec<Vec<&Binding>> = if enforce_typing_only_imports {
checker checker
.semantic .semantic
.scopes .scopes
@ -377,9 +374,16 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
} }
if matches!(scope.kind, ScopeKind::Function(_) | ScopeKind::Module) { if matches!(scope.kind, ScopeKind::Function(_) | ScopeKind::Module) {
// FIXME: This does not seem quite right, if only TC004 is enabled if !checker.source_type.is_stub()
// then we don't need to collect the runtime imports && checker.enabled(Rule::RuntimeImportInTypeCheckingBlock)
if enforce_typing_imports { {
flake8_type_checking::rules::runtime_import_in_type_checking_block(
checker,
scope,
&mut diagnostics,
);
}
if enforce_typing_only_imports {
let runtime_imports: Vec<&Binding> = checker let runtime_imports: Vec<&Binding> = checker
.semantic .semantic
.scopes .scopes
@ -388,26 +392,12 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
.copied() .copied()
.collect(); .collect();
if checker.enabled(Rule::RuntimeImportInTypeCheckingBlock) { flake8_type_checking::rules::typing_only_runtime_import(
flake8_type_checking::rules::runtime_import_in_type_checking_block( checker,
checker, scope,
scope, &runtime_imports,
&mut diagnostics, &mut diagnostics,
); );
}
if checker.any_enabled(&[
Rule::TypingOnlyFirstPartyImport,
Rule::TypingOnlyStandardLibraryImport,
Rule::TypingOnlyThirdPartyImport,
]) {
flake8_type_checking::rules::typing_only_runtime_import(
checker,
scope,
&runtime_imports,
&mut diagnostics,
);
}
} }
if checker.enabled(Rule::UnusedImport) { if checker.enabled(Rule::UnusedImport) {