fix rust-lang#10776

Author: Centri3

clippy_lints/src/mixed_read_write_in_expression.rs

@@ -1,7 +1,7 @@
 use clippy_utils::diagnostics::{span_lint, span_lint_and_note};
 use clippy_utils::{get_parent_expr, path_to_local, path_to_local_id};
 use if_chain::if_chain;
-use rustc_hir::intravisit::{walk_expr, Visitor};
+use rustc_hir::intravisit::{walk_block, walk_expr, Visitor};
 use rustc_hir::{BinOpKind, Block, Expr, ExprKind, Guard, HirId, Local, Node, Stmt, StmtKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty;
@@ -171,6 +171,7 @@ impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
                     self.report_diverging_sub_expr(e);
                 }
             },
+            ExprKind::Block(block, ..) => walk_block(self, block),
             _ => {
                 // do not lint expressions referencing objects of type `!`, as that required a
                 // diverging expression
@@ -179,9 +180,6 @@ impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
         }
         self.maybe_walk_expr(e);
     }
-    fn visit_block(&mut self, _: &'tcx Block<'_>) {
-        // don't continue over blocks, LateLintPass already does that
-    }
 }
 
 /// Walks up the AST from the given write expression (`vis.write_expr`) looking

tests/ui/diverging_sub_expression.stderr

@@ -1,84 +0,0 @@
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:20:10
-   |
-LL |     b || diverge();
-   |          ^^^^^^^^^
-   |
-   = note: `-D clippy::diverging-sub-expression` implied by `-D warnings`
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:21:10
-   |
-LL |     b || A.foo();
-   |          ^^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:31:26
-   |
-LL |             6 => true || return,
-   |                          ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:32:26
-   |
-LL |             7 => true || continue,
-   |                          ^^^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:35:26
-   |
-LL |             3 => true || diverge(),
-   |                          ^^^^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:38:30
-   |
-LL |                 _ => true || panic!("boo"),
-   |                              ^^^^^^^^^^^^^
-   |
-   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:41:29
-   |
-LL |             15 => true || { return; },
-   |                             ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:42:30
-   |
-LL |             16 => false || { return; },
-   |                              ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:44:29
-   |
-LL |             17 => true || { return },
-   |                             ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:45:30
-   |
-LL |             18 => false || { return },
-   |                              ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:47:36
-   |
-LL |             19 => true || { _ = 1; return },
-   |                                    ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:48:37
-   |
-LL |             20 => false || { _ = 1; return },
-   |                                     ^^^^^^
-
-error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:52:26
-   |
-LL |             _ => true || break,
-   |                          ^^^^^
-
-error: aborting due to 13 previous errors
-