Skip to content

Commit

Permalink
Auto merge of #9837 - DesmondWillowbrook:never_loop, r=dswij
Browse files Browse the repository at this point in the history
fix never_loop false positive

fixes #9831

changelog: [`never_loop`]: fixed false positive on unconditional break in internal labeled block
  • Loading branch information
bors committed Nov 13, 2022
2 parents 493b788 + 9899861 commit a599527
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
3 changes: 2 additions & 1 deletion clippy_lints/src/loops/never_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ fn never_loop_expr(expr: &Expr<'_>, main_loop_id: HirId) -> NeverLoopResult {
combine_seq(e, arms)
}
},
ExprKind::Block(b, _) => never_loop_block(b, main_loop_id),
ExprKind::Block(b, None) => never_loop_block(b, main_loop_id),
ExprKind::Block(b, Some(_label)) => absorb_break(never_loop_block(b, main_loop_id)),
ExprKind::Continue(d) => {
let id = d
.target_id
Expand Down
12 changes: 12 additions & 0 deletions tests/ui/never_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,18 @@ pub fn test18() {
};
}

// Issue #9831: unconditional break to internal labeled block
pub fn test19() {
fn thing(iter: impl Iterator) {
for _ in iter {
'b: {
// error goes away if we just have the block's value be ().
break 'b;
}
}
}
}

fn main() {
test1();
test2();
Expand Down

0 comments on commit a599527

Please sign in to comment.