refactor

clippy_lints/src/mixed_read_write_in_expression.rs

@@ -138,19 +138,13 @@ impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
     fn visit_expr(&mut self, e: &'tcx Expr<'_>) {
         match e.kind {
             // fix #10776
-            ExprKind::Block(block, ..) => {
-                if let Some(e) = block.expr && block.stmts.is_empty() {
-                    self.visit_expr(e);
-
-                    return;
-                }
-
-                if let [stmt, rest @ ..] = block.stmts && rest.is_empty() {
-                    match stmt.kind {
-                        StmtKind::Expr(e) | StmtKind::Semi(e) => self.visit_expr(e),
-                        _ => {},
-                    }
-                }
+            ExprKind::Block(block, ..) => match (block.stmts, block.expr) {
+                ([], Some(e)) => self.visit_expr(e),
+                ([stmt], None) => match stmt.kind {
+                    StmtKind::Expr(e) | StmtKind::Semi(e) => self.visit_expr(e),
+                    _ => {},
+                },
+                _ => {},
             },
             ExprKind::Continue(_) | ExprKind::Break(_, _) | ExprKind::Ret(_) => self.report_diverging_sub_expr(e),
             ExprKind::Call(func, _) => {

tests/ui/diverging_sub_expression.rs

@@ -49,6 +49,8 @@ fn foobar() {
             // ... or multiple statements
             21 => true || { _ = 1; return; },
             22 => false || { _ = 1; return; },
+            23 => true || { return; true },
+            24 => true || { return; true },
             _ => true || break,
         };
     }

tests/ui/diverging_sub_expression.stderr

@@ -63,7 +63,7 @@ LL |             18 => false || { return },
    |                              ^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:52:26
+  --> $DIR/diverging_sub_expression.rs:54:26
    |
 LL |             _ => true || break,
    |                          ^^^^^