Auto merge of #4243 - mikerite:fix-4058, r=flip1995

Fix `never_loop` false positive Closes #4058 changelog: none
rust-lang · Jul 1, 2019 · 47ada9a · 47ada9a
2 parents ad638a3 + 7c98915
commit 47ada9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
@@ -727,8 +727,7 @@ fn never_loop_expr(expr: &Expr, main_loop_id: HirId) -> NeverLoopResult {
                 NeverLoopResult::AlwaysBreak
             }
         },
-        ExprKind::Break(_, _) => NeverLoopResult::AlwaysBreak,
-        ExprKind::Ret(ref e) => {
+        ExprKind::Break(_, ref e) | ExprKind::Ret(ref e) => {
             if let Some(ref e) = *e {
                 combine_seq(never_loop_expr(e, main_loop_id), NeverLoopResult::AlwaysBreak)
             } else {

diff --git a/tests/ui/never_loop.rs b/tests/ui/never_loop.rs
@@ -175,6 +175,17 @@ pub fn test15() {
     }
 }
 
+// Issue #4058: `continue` in `break` expression
+pub fn test16() {
+    let mut n = 1;
+    loop {
+        break if n != 5 {
+            n += 1;
+            continue;
+        };
+    }
+}
+
 fn main() {
     test1();
     test2();