Make ModuleSpecifier a type alias, not wrapper struct (#9531)

1 files changed, 14 insertions, 29 deletions

diff --git a/runtime/permissions.rs b/runtime/permissions.rs
index b568c0a4f..e89a8747d 100644
--- a/runtime/permissions.rs
+++ b/runtime/permissions.rs
@@ -580,9 +580,8 @@ impl Permissions {
     &self,
     specifier: &ModuleSpecifier,
   ) -> Result<(), AnyError> {
-    let url = specifier.as_url();
-    match url.scheme() {
-      "file" => match url.to_file_path() {
+    match specifier.scheme() {
+      "file" => match specifier.to_file_path() {
         Ok(path) => self.check_read(&path),
         Err(_) => Err(uri_error(format!(
           "Invalid file path.\n  Specifier: {}",
@@ -590,7 +589,7 @@ impl Permissions {
         ))),
       },
       "data" => Ok(()),
-      _ => self.check_net_url(url),
+      _ => self.check_net_url(specifier),
     }
   }
 
@@ -749,6 +748,7 @@ fn format_host<T: AsRef<str>>(host: &(T, Option<u16>)) -> String {
 #[cfg(test)]
 mod tests {
   use super::*;
+  use deno_core::resolve_url_or_path;
 
   // Creates vector of strings, Vec<String>
   macro_rules! svec {
@@ -1000,42 +1000,27 @@ mod tests {
 
     let mut fixtures = vec![
       (
-        ModuleSpecifier::resolve_url_or_path("http://localhost:4545/mod.ts")
-          .unwrap(),
+        resolve_url_or_path("http://localhost:4545/mod.ts").unwrap(),
         true,
       ),
       (
-        ModuleSpecifier::resolve_url_or_path("http://deno.land/x/mod.ts")
-          .unwrap(),
+        resolve_url_or_path("http://deno.land/x/mod.ts").unwrap(),
         false,
       ),
       (
-        ModuleSpecifier::resolve_url_or_path(
-          "data:text/plain,Hello%2C%20Deno!",
-        )
-        .unwrap(),
+        resolve_url_or_path("data:text/plain,Hello%2C%20Deno!").unwrap(),
         true,
       ),
     ];
 
     if cfg!(target_os = "windows") {
-      fixtures.push((
-        ModuleSpecifier::resolve_url_or_path("file:///C:/a/mod.ts").unwrap(),
-        true,
-      ));
-      fixtures.push((
-        ModuleSpecifier::resolve_url_or_path("file:///C:/b/mod.ts").unwrap(),
-        false,
-      ));
+      fixtures
+        .push((resolve_url_or_path("file:///C:/a/mod.ts").unwrap(), true));
+      fixtures
+        .push((resolve_url_or_path("file:///C:/b/mod.ts").unwrap(), false));
     } else {
-      fixtures.push((
-        ModuleSpecifier::resolve_url_or_path("file:///a/mod.ts").unwrap(),
-        true,
-      ));
-      fixtures.push((
-        ModuleSpecifier::resolve_url_or_path("file:///b/mod.ts").unwrap(),
-        false,
-      ));
+      fixtures.push((resolve_url_or_path("file:///a/mod.ts").unwrap(), true));
+      fixtures.push((resolve_url_or_path("file:///b/mod.ts").unwrap(), false));
     }
 
     for (specifier, expected) in fixtures {
@@ -1058,7 +1043,7 @@ mod tests {
 
     for url in test_cases {
       assert!(perms
-        .check_specifier(&ModuleSpecifier::resolve_url_or_path(url).unwrap())
+        .check_specifier(&resolve_url_or_path(url).unwrap())
         .is_err());
     }
   }