chore: upgrade to Rust 1.59 (#13767)

2 files changed, 5 insertions, 9 deletions

diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index eb9c91071..3a5455aae 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -137,14 +137,10 @@ async fn create_graph(
   };
   let maybe_import_map_resolver =
     ps.maybe_import_map.clone().map(ImportMapResolver::new);
-  let maybe_jsx_resolver = ps
-    .maybe_config_file
-    .as_ref()
-    .map(|cf| {
-      cf.to_maybe_jsx_import_source_module()
-        .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone()))
-    })
-    .flatten();
+  let maybe_jsx_resolver = ps.maybe_config_file.as_ref().and_then(|cf| {
+    cf.to_maybe_jsx_import_source_module()
+      .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone()))
+  });
   let maybe_resolver = if maybe_jsx_resolver.is_some() {
     maybe_jsx_resolver.as_ref().map(|jr| jr.as_resolver())
   } else {
diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
index b37e2b3b0..7f4c18fca 100644
--- a/cli/tools/vendor/test.rs
+++ b/cli/tools/vendor/test.rs
@@ -223,7 +223,7 @@ fn make_path(text: &str) -> PathBuf {
   // a cross platform path here
   assert!(text.starts_with('/'));
   if cfg!(windows) {
-    PathBuf::from(format!("C:{}", text.replace("/", "\\")))
+    PathBuf::from(format!("C:{}", text.replace('/', "\\")))
   } else {
     PathBuf::from(text)
   }