From 94e321a6ff9a224f690b355fd4298caf6342e883 Mon Sep 17 00:00:00 2001
From: Michael Wright <mikerite@lavabit.com>
Date: Sun, 5 Jun 2022 07:14:31 +0200
Subject: [PATCH] needless_late_init refactoring

Remove duplication in creating suggestions by first mapping assignments
to spans and then suggestions.
---
 clippy_lints/src/needless_late_init.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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