From 2a1a80d80cdc75ed0bb9f35744591089b8a89f31 Mon Sep 17 00:00:00 2001
From: Michael Wright <mikerite@lavabit.com>
Date: Sun, 5 Jun 2022 07:22:45 +0200
Subject: [PATCH] needless_late_init refactoring

Simplify the creation of suggestions by using `flat_map` instead of
`chain`. Note that the order of the suggestions is not important.
---
 clippy_lints/src/needless_late_init.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/clippy_lints/src/needless_late_init.rs b/clippy_lints/src/needless_late_init.rs
index 9c4e2ef67121..5e97c606e21f 100644
--- a/clippy_lints/src/needless_late_init.rs
+++ b/clippy_lints/src/needless_late_init.rs
@@ -185,12 +185,12 @@ fn assignment_suggestions<'tcx>(
 
     let suggestions = assignments
         .iter()
-        .map(|assignment| assignment.span.until(assignment.rhs_span))
-        .chain(
-            assignments
-                .iter()
-                .map(|assignment| assignment.rhs_span.shrink_to_hi().with_hi(assignment.span.hi())),
-        )
+        .flat_map(|assignment| {
+            [
+                assignment.span.until(assignment.rhs_span),
+                assignment.rhs_span.shrink_to_hi().with_hi(assignment.span.hi()),
+            ]
+        })
         .map(|span| Some((span, String::new())))
         .collect::<Option<Vec<(Span, String)>>>()?;