Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always allow PEP 585 and PEP 604 rewrites in stub files #5653

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Always allow PEP 585 and PEP 604 rewrites in stub files #5653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60f3a28
Skip flake8-future-annotations checks in stub files
charliermarsh Jul 10, 2023
7fe95f3
Always allow PEP 585 and PEP 604 rewrites in stub files
charliermarsh Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions crates/ruff/src/checkers/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,8 @@ where
if let Some(operator) = typing::to_pep604_operator(value, slice, &self.semantic)
{
if self.enabled(Rule::FutureRewritableTypeAnnotation) {
if self.settings.target_version < PythonVersion::Py310
if !self.is_stub
&& self.settings.target_version < PythonVersion::Py310
&& self.settings.target_version >= PythonVersion::Py37
&& !self.semantic.future_annotations()
&& self.semantic.in_annotation()
Expand All @@ -2160,7 +2161,8 @@ where
}
}
if self.enabled(Rule::NonPEP604Annotation) {
if self.settings.target_version >= PythonVersion::Py310
if self.is_stub
|| self.settings.target_version >= PythonVersion::Py310
|| (self.settings.target_version >= PythonVersion::Py37
&& self.semantic.future_annotations()
&& self.semantic.in_annotation()
Expand All @@ -2176,7 +2178,8 @@ where

// Ex) list[...]
if self.enabled(Rule::FutureRequiredTypeAnnotation) {
if self.settings.target_version < PythonVersion::Py39
if !self.is_stub
&& self.settings.target_version < PythonVersion::Py39
&& !self.semantic.future_annotations()
&& self.semantic.in_annotation()
&& typing::is_pep585_generic(value, &self.semantic)
Expand Down Expand Up @@ -2274,19 +2277,21 @@ where
typing::to_pep585_generic(expr, &self.semantic)
{
if self.enabled(Rule::FutureRewritableTypeAnnotation) {
if self.settings.target_version < PythonVersion::Py39
if !self.is_stub
&& self.settings.target_version < PythonVersion::Py39
&& self.settings.target_version >= PythonVersion::Py37
&& !self.semantic.future_annotations()
&& self.semantic.in_annotation()
&& !self.settings.pyupgrade.keep_runtime_typing
{
flake8_future_annotations::rules::future_rewritable_type_annotation(
self, expr,
);
self, expr,
);
}
}
if self.enabled(Rule::NonPEP585Annotation) {
if self.settings.target_version >= PythonVersion::Py39
if self.is_stub
|| self.settings.target_version >= PythonVersion::Py39
|| (self.settings.target_version >= PythonVersion::Py37
&& self.semantic.future_annotations()
&& self.semantic.in_annotation()
Expand Down Expand Up @@ -2351,7 +2356,8 @@ where
]) {
if let Some(replacement) = typing::to_pep585_generic(expr, &self.semantic) {
if self.enabled(Rule::FutureRewritableTypeAnnotation) {
if self.settings.target_version < PythonVersion::Py39
if !self.is_stub
&& self.settings.target_version < PythonVersion::Py39
&& self.settings.target_version >= PythonVersion::Py37
&& !self.semantic.future_annotations()
&& self.semantic.in_annotation()
Expand All @@ -2363,7 +2369,8 @@ where
}
}
if self.enabled(Rule::NonPEP585Annotation) {
if self.settings.target_version >= PythonVersion::Py39
if self.is_stub
|| self.settings.target_version >= PythonVersion::Py39
|| (self.settings.target_version >= PythonVersion::Py37
&& self.semantic.future_annotations()
&& self.semantic.in_annotation()
Expand Down Expand Up @@ -2536,10 +2543,10 @@ where
if self.enabled(Rule::OSErrorAlias) {
pyupgrade::rules::os_error_alias_call(self, func);
}
if self.enabled(Rule::NonPEP604Isinstance)
&& self.settings.target_version >= PythonVersion::Py310
{
pyupgrade::rules::use_pep604_isinstance(self, expr, func, args);
if self.enabled(Rule::NonPEP604Isinstance) {
if self.settings.target_version >= PythonVersion::Py310 {
pyupgrade::rules::use_pep604_isinstance(self, expr, func, args);
}
}
if self.enabled(Rule::BlockingHttpCallInAsyncFunction) {
flake8_async::rules::blocking_http_call(self, expr);
Expand Down Expand Up @@ -3143,7 +3150,8 @@ where
}) => {
// Ex) `str | None`
if self.enabled(Rule::FutureRequiredTypeAnnotation) {
if self.settings.target_version < PythonVersion::Py310
if !self.is_stub
&& self.settings.target_version < PythonVersion::Py310
&& !self.semantic.future_annotations()
&& self.semantic.in_annotation()
{
Expand All @@ -3154,7 +3162,6 @@ where
);
}
}

if self.is_stub {
if self.enabled(Rule::DuplicateUnionMember)
&& self.semantic.in_type_definition()
Expand All @@ -3166,7 +3173,6 @@ where
{
flake8_pyi::rules::duplicate_union_member(self, expr);
}

if self.enabled(Rule::UnnecessaryLiteralUnion)
// Avoid duplicate checks if the parent is an `|`
&& !matches!(
Expand Down
6 changes: 5 additions & 1 deletion crates/ruff/src/rules/tryceratops/rules/raise_within_try.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ pub(crate) fn raise_within_try(checker: &mut Checker, body: &[Stmt], handlers: &
.collect();

for stmt in raises {
let Stmt::Raise(ast::StmtRaise { exc: Some(exception), .. }) = stmt else {
let Stmt::Raise(ast::StmtRaise {
exc: Some(exception),
..
}) = stmt
else {
continue;
};

Expand Down
Loading