From fb021d7ceff3f8b1d7cdb0c2bdd75ea07c0428d2 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Wed, 15 Mar 2023 17:46:36 -0400
Subject: refactor: remove usages of `map_or` / `map_or_else` (#18212)

These methods are confusing because the arguments are backwards. I feel
like they should have never been added to `Option<T>` and that clippy
should suggest rewriting to
`map(...).unwrap_or(...)`/`map(...).unwrap_or_else(|| ...)`

https://github.com/rust-lang/rfcs/issues/1025
---
 cli/cache/mod.rs | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'cli/cache/mod.rs')

diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs
index a962538b7..ddb419e54 100644
--- a/cli/cache/mod.rs
+++ b/cli/cache/mod.rs
@@ -129,25 +129,23 @@ impl Loader for FetchCacher {
       file_fetcher
         .fetch(&specifier, permissions)
         .await
-        .map_or_else(
-          |err| {
-            if let Some(err) = err.downcast_ref::<std::io::Error>() {
-              if err.kind() == std::io::ErrorKind::NotFound {
-                return Ok(None);
-              }
-            } else if get_error_class_name(&err) == "NotFound" {
+        .map(|file| {
+          Ok(Some(LoadResponse::Module {
+            specifier: file.specifier,
+            maybe_headers: file.maybe_headers,
+            content: file.source,
+          }))
+        })
+        .unwrap_or_else(|err| {
+          if let Some(err) = err.downcast_ref::<std::io::Error>() {
+            if err.kind() == std::io::ErrorKind::NotFound {
               return Ok(None);
             }
-            Err(err)
-          },
-          |file| {
-            Ok(Some(LoadResponse::Module {
-              specifier: file.specifier,
-              maybe_headers: file.maybe_headers,
-              content: file.source,
-            }))
-          },
-        )
+          } else if get_error_class_name(&err) == "NotFound" {
+            return Ok(None);
+          }
+          Err(err)
+        })
     }
     .boxed()
   }
-- 
cgit v1.2.3