2 files changed, 6 insertions, 10 deletions
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index bed4c4994..f6e6cdbe2 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
@@ -690,9 +690,7 @@ impl ExprCollector<'_> {
                }
            }
            ast::Stmt::Item(item) => {
-                if self.check_cfg(&item).is_none() {
+                self.check_cfg(&item);
-                    return;
-                }
            }
        }
    }
@@ -717,7 +715,8 @@ impl ExprCollector<'_> {
        block.statements().for_each(|s| self.collect_stmt(s));
        block.tail_expr().and_then(|e| {
            let expr = self.maybe_collect_expr(e)?;
-            Some(self.statements_in_scope.push(Statement::Expr { expr, has_semi: false }))
+            self.statements_in_scope.push(Statement::Expr { expr, has_semi: false });
+            Some(())
        });
        let mut tail = None;
diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs
index 27d837d47..673a75386 100644
--- a/crates/hir_def/src/body/tests.rs
+++ b/crates/hir_def/src/body/tests.rs
@@ -15,12 +15,9 @@ fn lower(ra_fixture: &str) -> Arc<Body> {
    let mut fn_def = None;
    'outer: for (_, module) in def_map.modules() {
        for decl in module.scope.declarations() {
-            match decl {
+            if let ModuleDefId::FunctionId(it) = decl {
-                ModuleDefId::FunctionId(it) => {
+                fn_def = Some(it);
-                    fn_def = Some(it);
+                break 'outer;
-                    break 'outer;
-                }
-                _ => {}
            }
        }
    }