Format

Author: blyxyas

clippy_lints/src/methods/option_map_unwrap_or.rs

@@ -59,10 +59,10 @@ pub(super) fn check<'tcx>(
             };
 
             let map = cx.tcx.hir();
-            let body = map.body_owned_by(map.enclosing_body_owner(expr.hir_id));
-            reference_visitor.visit_body(body);
+            let body = map.body(map.body_owned_by(map.enclosing_body_owner(expr.hir_id)));
 
-            if reference_visitor.visit_body(body);.is_break() {
+            // Visit the body, and return if we've found a reference
+            if reference_visitor.visit_body(body).is_break() {
                 return;
             };
         }

clippy_lints/src/unconditional_recursion.rs

@@ -293,7 +293,7 @@ where
     }
 
     fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) -> ControlFlow<()> {
-        walk_expr(self, expr);
+        walk_expr(self, expr)?;
 
         if let ExprKind::Call(f, _) = expr.kind
             && let ExprKind::Path(qpath) = f.kind