From 2c71780cfbba0b2de1682196114c80be641187b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=A9=E6=95=A3=E6=80=A7=E7=99=BE=E4=B8=87=E7=94=9C?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85?= <himself65@outlook.com>
Date: Sun, 17 May 2020 23:33:44 +0800
Subject: Simplify fmt::Display for ModuleResolutionError (#5550)

---
 core/module_specifier.rs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'core')

diff --git a/core/module_specifier.rs b/core/module_specifier.rs
index 2457262c1..9cf449302 100644
--- a/core/module_specifier.rs
+++ b/core/module_specifier.rs
@@ -32,19 +32,15 @@ impl fmt::Display for ModuleResolutionError {
         write!(f, "invalid base URL for relative import: {}", err)
       }
       InvalidPath(ref path) => write!(f, "invalid module path: {:?}", path),
-      ImportPrefixMissing(ref specifier, ref maybe_referrer) => {
-        let msg = format!(
-          "relative import path \"{}\" not prefixed with / or ./ or ../",
-          specifier
-        );
-        let msg = if let Some(referrer) = maybe_referrer {
-          format!("{} Imported from \"{}\"", msg, referrer)
-        } else {
-          msg
-        };
-
-        write!(f, "{}", msg)
-      }
+      ImportPrefixMissing(ref specifier, ref maybe_referrer) => write!(
+        f,
+        "relative import path \"{}\" not prefixed with / or ./ or ../{}",
+        specifier,
+        match maybe_referrer {
+          Some(referrer) => format!(" Imported from \"{}\"", referrer),
+          None => format!(""),
+        }
+      ),
     }
   }
 }
-- 
cgit v1.2.3