summaryrefslogtreecommitdiff
path: root/cli/tools/vendor/mod.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2022-02-24 20:03:12 -0500
committerGitHub <noreply@github.com>2022-02-24 20:03:12 -0500
commit3b12afd0723b288feb7c8c53ac3938a17fd0e57c (patch)
tree8ac398efaef6e59e3ab2278f378706aa44b5641e /cli/tools/vendor/mod.rs
parentc59152e4000393ad122855c26198c1d942497c00 (diff)
chore: upgrade to Rust 1.59 (#13767)
Diffstat (limited to 'cli/tools/vendor/mod.rs')
-rw-r--r--cli/tools/vendor/mod.rs12
1 files changed, 4 insertions, 8 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 {