From e7954413e16d5814db5da6389f8d6e0c328812aa Mon Sep 17 00:00:00 2001
From: Yusuke Tanaka <yusuktan@maguro.dev>
Date: Fri, 26 Mar 2021 03:17:37 +0900
Subject: upgrade: Rust 1.51.0 (#9895)

---
 cli/tools/coverage.rs    | 14 ++++----------
 cli/tools/installer.rs   |  3 ++-
 cli/tools/test_runner.rs |  3 +--
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'cli/tools')

diff --git a/cli/tools/coverage.rs b/cli/tools/coverage.rs
index 9e97688a3..9a197eabd 100644
--- a/cli/tools/coverage.rs
+++ b/cli/tools/coverage.rs
@@ -157,11 +157,8 @@ impl CoverageReporter for LcovCoverageReporter {
   ) {
     // TODO(caspervonb) cleanup and reduce duplication between reporters, pre-compute line coverage
     // elsewhere.
-    let maybe_source_map = if let Some(source_map) = maybe_source_map {
-      Some(SourceMap::from_slice(&source_map).unwrap())
-    } else {
-      None
-    };
+    let maybe_source_map = maybe_source_map
+      .map(|source_map| SourceMap::from_slice(&source_map).unwrap());
 
     let url = Url::parse(&script_coverage.url).unwrap();
     let file_path = url.to_file_path().unwrap();
@@ -374,11 +371,8 @@ impl CoverageReporter for PrettyCoverageReporter {
     maybe_source_map: Option<Vec<u8>>,
     maybe_original_source: Option<String>,
   ) {
-    let maybe_source_map = if let Some(source_map) = maybe_source_map {
-      Some(SourceMap::from_slice(&source_map).unwrap())
-    } else {
-      None
-    };
+    let maybe_source_map = maybe_source_map
+      .map(|source_map| SourceMap::from_slice(&source_map).unwrap());
 
     let mut ignored_spans: Vec<Span> = Vec::new();
     for item in ast::lex("", script_source, &MediaType::JavaScript) {
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs
index 20b0b17ef..a616db7ef 100644
--- a/cli/tools/installer.rs
+++ b/cli/tools/installer.rs
@@ -14,6 +14,7 @@ use std::io;
 use std::io::Write;
 #[cfg(not(windows))]
 use std::os::unix::fs::PermissionsExt;
+use std::path::Path;
 use std::path::PathBuf;
 
 lazy_static! {
@@ -318,7 +319,7 @@ pub fn install(
   Ok(())
 }
 
-fn is_in_path(dir: &PathBuf) -> bool {
+fn is_in_path(dir: &Path) -> bool {
   if let Some(paths) = env::var_os("PATH") {
     for p in env::split_paths(&paths) {
       if *dir == p {
diff --git a/cli/tools/test_runner.rs b/cli/tools/test_runner.rs
index e91cad011..df792bd53 100644
--- a/cli/tools/test_runner.rs
+++ b/cli/tools/test_runner.rs
@@ -6,7 +6,6 @@ use deno_core::error::AnyError;
 use deno_core::serde_json::json;
 use deno_core::url::Url;
 use std::path::Path;
-use std::path::PathBuf;
 
 fn is_supported(p: &Path) -> bool {
   use std::path::Component;
@@ -34,7 +33,7 @@ fn is_supported(p: &Path) -> bool {
 
 pub fn prepare_test_modules_urls(
   include: Vec<String>,
-  root_path: &PathBuf,
+  root_path: &Path,
 ) -> Result<Vec<Url>, AnyError> {
   let (include_paths, include_urls): (Vec<String>, Vec<String>) =
     include.into_iter().partition(|n| !is_remote_url(n));
-- 
cgit v1.2.3