From e556fb4c77cc4bdc4a2994cbb95b741c5ec1ea2c Mon Sep 17 00:00:00 2001 From: tomecki Date: Sat, 25 Feb 2023 12:59:13 +0100 Subject: [PATCH] Update crates/ruff/src/rules/pylint/rules/useless_return.rs Co-authored-by: Jeong YunWon <69878+youknowone@users.noreply.github.com> --- .../src/rules/pylint/rules/useless_return.rs | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/crates/ruff/src/rules/pylint/rules/useless_return.rs b/crates/ruff/src/rules/pylint/rules/useless_return.rs index 23ba361e92..52292a93e8 100644 --- a/crates/ruff/src/rules/pylint/rules/useless_return.rs +++ b/crates/ruff/src/rules/pylint/rules/useless_return.rs @@ -62,25 +62,26 @@ pub fn useless_return(checker: &mut Checker, stmt: &Stmt) { None => true, Some(loc_expr) => is_const_none(loc_expr), }; - if is_bare_return_or_none { - let mut diagnostic = Diagnostic::new(UselessReturn, Range::from_located(stmt)); - if checker.patch(diagnostic.kind.rule()) { - match delete_stmt( - stmt, - None, - &[], - checker.locator, - checker.indexer, - checker.stylist, - ) { - Ok(fix) => { - diagnostic.amend(fix); - } - Err(e) => { - error!("Failed to delete `return` statement: {}", e); - } - }; - } - checker.diagnostics.push(diagnostic); + if !is_bare_return_or_none { + return; } + let mut diagnostic = Diagnostic::new(UselessReturn, Range::from_located(stmt)); + if !checker.patch(diagnostic.kind.rule()) { + match delete_stmt( + stmt, + None, + &[], + checker.locator, + checker.indexer, + checker.stylist, + ) { + Ok(fix) => { + diagnostic.amend(fix); + } + Err(e) => { + error!("Failed to delete `return` statement: {}", e); + } + }; + } + checker.diagnostics.push(diagnostic); }