diff --git a/crates/ruff_linter/src/rules/pep8_naming/mod.rs b/crates/ruff_linter/src/rules/pep8_naming/mod.rs index 15aa305e0d..0f315ada00 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/mod.rs +++ b/crates/ruff_linter/src/rules/pep8_naming/mod.rs @@ -89,7 +89,6 @@ mod tests { Ok(()) } - #[test_case(Rule::InvalidArgumentName, Path::new("N803.py"))] #[test_case(Rule::InvalidArgumentName, Path::new("N804.py"))] fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> { let snapshot = format!( diff --git a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs index dd0a83a9a3..d2445e8c39 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs +++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_argument_name.rs @@ -23,7 +23,7 @@ use crate::checkers::ast::Checker; /// > mixedCase is allowed only in contexts where that’s already the /// > prevailing style (e.g. threading.py), to retain backwards compatibility. /// -/// In [preview], overridden methods are ignored. +/// Methods decorated with `@typing.override` are ignored. /// /// ## Example /// ```python @@ -61,8 +61,7 @@ pub(crate) fn invalid_argument_name_function(checker: &Checker, function_def: &S let semantic = checker.semantic(); let scope = semantic.current_scope(); - if checker.settings.preview.is_enabled() - && matches!(scope.kind, ScopeKind::Class(_)) + if matches!(scope.kind, ScopeKind::Class(_)) && is_override(&function_def.decorator_list, semantic) { return; diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N803_N803.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N803_N803.py.snap index 7af2a22d2e..d8f2c61cd6 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N803_N803.py.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N803_N803.py.snap @@ -16,14 +16,6 @@ N803.py:6:28: N803 Argument name `A` should be lowercase 7 | return _, a, A | -N803.py:18:28: N803 Argument name `A` should be lowercase - | -16 | class Extended(Class): -17 | @override -18 | def method(self, _, a, A): ... - | ^ N803 - | - N803.py:22:16: N803 Argument name `A` should be lowercase | 21 | @override # Incorrect usage diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__preview__N803_N803.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__preview__N803_N803.py.snap deleted file mode 100644 index d8f2c61cd6..0000000000 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__preview__N803_N803.py.snap +++ /dev/null @@ -1,37 +0,0 @@ ---- -source: crates/ruff_linter/src/rules/pep8_naming/mod.rs ---- -N803.py:1:16: N803 Argument name `A` should be lowercase - | -1 | def func(_, a, A): - | ^ N803 -2 | return _, a, A - | - -N803.py:6:28: N803 Argument name `A` should be lowercase - | -5 | class Class: -6 | def method(self, _, a, A): - | ^ N803 -7 | return _, a, A - | - -N803.py:22:16: N803 Argument name `A` should be lowercase - | -21 | @override # Incorrect usage -22 | def func(_, a, A): ... - | ^ N803 - | - -N803.py:25:21: N803 Argument name `A` should be lowercase - | -25 | func = lambda _, a, A: ... - | ^ N803 - | - -N803.py:29:42: N803 Argument name `A` should be lowercase - | -28 | class Extended(Class): -29 | method = override(lambda self, _, a, A: ...) # Incorrect usage - | ^ N803 - |