diff options
| author | bors <bors@rust-lang.org> | 2022-06-06 00:25:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-06 00:25:14 +0000 |
| commit | 3e771624e1e0de266ae4720354cf4534f010d39d (patch) | |
| tree | 489dbff9f9878b665472ae3de5dce65d948b81d8 | |
| parent | 3e52dee6467fb5c1602e7ac65b7e8a2e143ab5c6 (diff) | |
| parent | a2de34720d984669499e981b640cde050c2a4dfa (diff) | |
| download | rust-3e771624e1e0de266ae4720354cf4534f010d39d.tar.gz rust-3e771624e1e0de266ae4720354cf4534f010d39d.zip | |
Auto merge of #8951 - mikerite:needless-late-init-20220605, r=giraffate
Some refactoring in `needless_late_init` changelog: none
| -rw-r--r-- | clippy_lints/src/needless_late_init.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/clippy_lints/src/needless_late_init.rs b/clippy_lints/src/needless_late_init.rs index 26c694a71fe..4154c71b428 100644 --- a/clippy_lints/src/needless_late_init.rs +++ b/clippy_lints/src/needless_late_init.rs @@ -185,14 +185,14 @@ 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(( + .flat_map(|assignment| { + [ + assignment.span.until(assignment.rhs_span), assignment.rhs_span.shrink_to_hi().with_hi(assignment.span.hi()), - String::new(), - )) - })) - .collect::<Option<Vec<(Span, String)>>>()?; + ] + }) + .map(|span| (span, String::new())) + .collect::<Vec<(Span, String)>>(); match suggestions.len() { // All of `exprs` are never types |