From 3b12afd0723b288feb7c8c53ac3938a17fd0e57c Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Thu, 24 Feb 2022 20:03:12 -0500
Subject: chore: upgrade to Rust 1.59 (#13767)

---
 cli/tools/coverage/mod.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'cli/tools/coverage/mod.rs')

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)?;
 
-- 
cgit v1.2.3