Minor refactoring

astral-sh · Jan 23, 2025 · 1bb4bab · 1bb4bab
1 parent 6b57e3a
commit 1bb4bab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -947,11 +947,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 }
             }
             if checker.enabled(Rule::PytestUnittestRaisesAssertion) {
-                if let Some(diagnostic) =
-                    flake8_pytest_style::rules::unittest_raises_assertion_call(checker, call)
-                {
-                    checker.diagnostics.push(diagnostic);
-                }
+                flake8_pytest_style::rules::unittest_raises_assertion_call(checker, call);
             }
             if checker.enabled(Rule::SubprocessPopenPreexecFn) {
                 pylint::rules::subprocess_popen_preexec_fn(checker, call);

diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
@@ -366,21 +366,20 @@ impl Violation for PytestUnittestRaisesAssertion {
 }
 
 /// PT027
-pub(crate) fn unittest_raises_assertion_call(
-    checker: &Checker,
-    call: &ast::ExprCall,
-) -> Option<Diagnostic> {
+pub(crate) fn unittest_raises_assertion_call(checker: &mut Checker, call: &ast::ExprCall) {
     // Bindings in `with` statements are handled by `unittest_raises_assertion_with`.
     if let Stmt::With(ast::StmtWith { items, .. }) = checker.semantic().current_statement() {
         if items
             .iter()
             .any(|item| item.context_expr.range() == call.range && item.optional_vars.is_some())
         {
-            return None;
+            return;
         }
     }
 
-    unittest_raises_assertion(call, [], checker)
+    if let Some(diagnostic) = unittest_raises_assertion(call, [], checker) {
+        checker.diagnostics.push(diagnostic);
+    }
 }
 
 /// PT027