diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2022-02-24 20:03:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 20:03:12 -0500 |
| commit | 3b12afd0723b288feb7c8c53ac3938a17fd0e57c (patch) | |
| tree | 8ac398efaef6e59e3ab2278f378706aa44b5641e /cli/tools/coverage/mod.rs | |
| parent | c59152e4000393ad122855c26198c1d942497c00 (diff) | |
chore: upgrade to Rust 1.59 (#13767)
Diffstat (limited to 'cli/tools/coverage/mod.rs')
| -rw-r--r-- | cli/tools/coverage/mod.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs index 35001db1e..26f36adae 100644 --- a/cli/tools/coverage/mod.rs +++ b/cli/tools/coverage/mod.rs @@ -312,7 +312,7 @@ fn generate_coverage_report( let mut found_lines = line_counts .iter() .enumerate() - .map(|(index, count)| { + .flat_map(|(index, count)| { // get all the mappings from this destination line to a different src line let mut results = source_map .tokens() @@ -324,7 +324,6 @@ fn generate_coverage_report( results.dedup_by_key(|(index, _)| *index); results.into_iter() }) - .flatten() .collect::<Vec<(usize, i64)>>(); found_lines.sort_unstable_by_key(|(index, _)| *index); @@ -400,8 +399,7 @@ impl CoverageReporter for LcovCoverageReporter { .url .to_file_path() .ok() - .map(|p| p.to_str().map(|p| p.to_string())) - .flatten() + .and_then(|p| p.to_str().map(|p| p.to_string())) .unwrap_or_else(|| coverage_report.url.to_string()); writeln!(out_writer, "SF:{}", file_path)?; |