More minor fixes suggested by @jackh726

2021-05-10 14:59:54 +02:00
parent 3c0c3874fc
commit 2448c7698e
4 changed files with 9 additions and 15 deletions
--- a/compiler/rustc_resolve/src/late/diagnostics.rs
+++ b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -1905,9 +1905,11 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {

                let spans_suggs: Vec<_> = formatters
                    .into_iter()
-                    .filter_map(|fmt| fmt)
                    .zip(spans_with_counts.iter())
-                    .map(|(formatter, (span, _))| (*span, formatter(name)))
+                    .filter_map(|(fmt, (span, _))| {
+                        if let Some(formatter) = fmt { Some((formatter, span)) } else { None }
+                    })
+                    .map(|(formatter, span)| (*span, formatter(name)))
                    .collect();
                err.multipart_suggestion_with_style(
                    &format!(