Skip to content

Commit 4f37482

Browse files
committed
fix never_loop
1 parent a73edc0 commit 4f37482

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

clippy_lints/src/attrs.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,16 +184,15 @@ fn is_relevant_trait(tcx: ty::TyCtxt, item: &TraitItem) -> bool {
184184
}
185185

186186
fn is_relevant_block(tcx: ty::TyCtxt, tables: &ty::TypeckTables, block: &Block) -> bool {
187-
for stmt in &block.stmts {
187+
if let Some(stmt) = block.stmts.first() {
188188
match stmt.node {
189-
StmtDecl(_, _) => return true,
189+
StmtDecl(_, _) => true,
190190
StmtExpr(ref expr, _) |
191-
StmtSemi(ref expr, _) => {
192-
return is_relevant_expr(tcx, tables, expr);
193-
},
191+
StmtSemi(ref expr, _) => is_relevant_expr(tcx, tables, expr),
194192
}
193+
} else {
194+
block.expr.as_ref().map_or(false, |e| is_relevant_expr(tcx, tables, e))
195195
}
196-
block.expr.as_ref().map_or(false, |e| is_relevant_expr(tcx, tables, e))
197196
}
198197

199198
fn is_relevant_expr(tcx: ty::TyCtxt, tables: &ty::TypeckTables, expr: &Expr) -> bool {

0 commit comments

Comments
 (0)