From e9dffa391085f4b3c84f90e8ab82bdd568d1f17e Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 14 Feb 2023 09:12:51 +0100
Subject: [PATCH] Fix a bug in never_loop when anonymous blocks are nested in
 named blocks

The following code

```
loop {
    'a: {
        { }
        break 'a;
    }
}
```

was detected as a never-looping loop.
---
 clippy_lints/src/loops/never_loop.rs | 4 +++-
 tests/ui/never_loop.rs               | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/clippy_lints/src/loops/never_loop.rs b/clippy_lints/src/loops/never_loop.rs
index 9d16949c81f..3cb5b1ffc7b 100644
--- a/clippy_lints/src/loops/never_loop.rs
+++ b/clippy_lints/src/loops/never_loop.rs
@@ -163,7 +163,9 @@ fn never_loop_expr(expr: &Expr<'_>, ignore_ids: &mut Vec<HirId>, main_loop_id: H
                 ignore_ids.push(b.hir_id);
             }
             let ret = never_loop_block(b, ignore_ids, main_loop_id);
-            ignore_ids.pop();
+            if l.is_some() {
+                ignore_ids.pop();
+            }
             ret
         },
         ExprKind::Continue(d) => {
diff --git a/tests/ui/never_loop.rs b/tests/ui/never_loop.rs
index 28e8f459d44..a177d5e06aa 100644
--- a/tests/ui/never_loop.rs
+++ b/tests/ui/never_loop.rs
@@ -250,6 +250,15 @@ pub fn test20() {
     }
 }
 
+pub fn test21() {
+    loop {
+        'a: {
+            { }
+            break 'a;
+        }
+    }
+}
+
 fn main() {
     test1();
     test2();