From 68365697b3ab5e57c7a4e1cc4878e9a77ef002ae Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Thu, 8 Jan 2026 19:33:24 +0100
Subject: [PATCH] A `return` in an iterator closure should not trigger
 `never_loop`

The iterator never loops when the closure used in, e.g., `.any()`,
panics, not when it diverges as a regular `return` lets the iterator
continue.
---
 clippy_lints/src/loops/never_loop.rs          | 4 ++--
 tests/ui/never_loop_iterator_reduction.rs     | 9 ++++++++-
 tests/ui/never_loop_iterator_reduction.stderr | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/clippy_lints/src/loops/never_loop.rs b/clippy_lints/src/loops/never_loop.rs
index a037af3433c3..e7b9b1cd3881 100644
--- a/clippy_lints/src/loops/never_loop.rs
+++ b/clippy_lints/src/loops/never_loop.rs
@@ -4,8 +4,8 @@
 use clippy_utils::higher::ForLoop;
 use clippy_utils::macros::root_macro_call_first_node;
 use clippy_utils::source::{snippet, snippet_with_context};
-use clippy_utils::sym;
 use clippy_utils::visitors::{Descend, for_each_expr_without_closures};
+use clippy_utils::{contains_return, sym};
 use rustc_errors::Applicability;
 use rustc_hir::{
     Block, Closure, Destination, Expr, ExprKind, HirId, InlineAsm, InlineAsmOperand, Node, Pat, Stmt, StmtKind,
@@ -82,7 +82,7 @@ pub(super) fn check_iterator_reduction<'tcx>(
 ) {
     let closure_body = cx.tcx.hir_body(closure.body).value;
     let body_ty = cx.typeck_results().expr_ty(closure_body);
-    if body_ty.is_never() {
+    if body_ty.is_never() && !contains_return(closure_body) {
         span_lint_and_then(
             cx,
             NEVER_LOOP,
diff --git a/tests/ui/never_loop_iterator_reduction.rs b/tests/ui/never_loop_iterator_reduction.rs
index 6b07b91db29a..27f1766b841d 100644
--- a/tests/ui/never_loop_iterator_reduction.rs
+++ b/tests/ui/never_loop_iterator_reduction.rs
@@ -1,8 +1,9 @@
 //@no-rustfix
 #![warn(clippy::never_loop)]
+#![expect(clippy::needless_return)]
 
 fn main() {
-    // diverging closure: should trigger
+    // diverging closure with no `return`: should trigger
     [0, 1].into_iter().for_each(|x| {
         //~^ never_loop
 
@@ -14,4 +15,10 @@ fn main() {
     [0, 1].into_iter().for_each(|x| {
         let _ = x + 1;
     });
+
+    // `return` should NOT trigger even though it is diverging
+    [0, 1].into_iter().for_each(|x| {
+        println!("x = {x}");
+        return;
+    });
 }
diff --git a/tests/ui/never_loop_iterator_reduction.stderr b/tests/ui/never_loop_iterator_reduction.stderr
index b76ee283146c..92483c85432d 100644
--- a/tests/ui/never_loop_iterator_reduction.stderr
+++ b/tests/ui/never_loop_iterator_reduction.stderr
@@ -1,5 +1,5 @@
 error: this iterator reduction never loops (closure always diverges)
-  --> tests/ui/never_loop_iterator_reduction.rs:6:5
+  --> tests/ui/never_loop_iterator_reduction.rs:7:5
    |
 LL | /     [0, 1].into_iter().for_each(|x| {
 LL | |