Skip to content

Commit

Permalink
Move gate
Browse files Browse the repository at this point in the history
  • Loading branch information
charliermarsh committed Jul 9, 2024
1 parent b9438eb commit 40d891e
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions crates/ruff_linter/src/rules/flake8_return/rules/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,7 @@ impl Violation for SuperfluousElseBreak {
}

/// RET501
fn unnecessary_return_none(checker: &mut Checker, decorator_list: &[Decorator], stack: &Stack) {
// Skip properties.
let semantic = checker.semantic();
if decorator_list
.iter()
.any(|decorator| semantic.match_builtin_expr(&decorator.expression, "property"))
{
return;
}

fn unnecessary_return_none(checker: &mut Checker, stack: &Stack) {
for stmt in &stack.returns {
let Some(expr) = stmt.value.as_deref() else {
continue;
Expand Down Expand Up @@ -801,7 +792,16 @@ pub(crate) fn function(
if checker.enabled(Rule::UnnecessaryReturnNone) {
// Skip functions that have a return annotation that is not `None`.
if returns.map_or(true, Expr::is_none_literal_expr) {
unnecessary_return_none(checker, decorator_list, &stack);
// Skip properties.
if decorator_list.iter().any(|decorator| {
checker
.semantic()
.match_builtin_expr(&decorator.expression, "property")
}) {
return;
}

unnecessary_return_none(checker, &stack);
}
}
}
Expand Down

0 comments on commit 40d891e

Please sign in to comment.