diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2021-02-17 13:47:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-17 13:47:18 -0500 |
commit | c7dabc99eed50fa20cdcafd7c0175ab615da3d50 (patch) | |
tree | ec2c611c627827bbdd61d3e27400ae1b9a50d459 /cli/ops/runtime_compiler.rs | |
parent | f6d6b24506410816833d802e1a8d9cd704f73289 (diff) |
Make ModuleSpecifier a type alias, not wrapper struct (#9531)
Diffstat (limited to 'cli/ops/runtime_compiler.rs')
-rw-r--r-- | cli/ops/runtime_compiler.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs index f54e7d206..79f378d6d 100644 --- a/cli/ops/runtime_compiler.rs +++ b/cli/ops/runtime_compiler.rs @@ -13,11 +13,11 @@ use deno_core::error::generic_error; use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::error::Context; +use deno_core::resolve_url_or_path; use deno_core::serde_json; use deno_core::serde_json::json; use deno_core::serde_json::Value; use deno_core::BufVec; -use deno_core::ModuleSpecifier; use deno_core::OpState; use deno_runtime::permissions::Permissions; use serde::Deserialize; @@ -79,12 +79,10 @@ async fn op_emit( )?)) }; let maybe_import_map = if let Some(import_map_str) = args.import_map_path { - let import_map_specifier = - ModuleSpecifier::resolve_url_or_path(&import_map_str) - .context(format!("Bad URL (\"{}\") for import map.", import_map_str))?; - let import_map_url = import_map_specifier.as_url(); + let import_map_specifier = resolve_url_or_path(&import_map_str) + .context(format!("Bad URL (\"{}\") for import map.", import_map_str))?; let import_map = if let Some(value) = args.import_map { - ImportMap::from_json(&import_map_url.to_string(), &value.to_string())? + ImportMap::from_json(import_map_specifier.as_str(), &value.to_string())? } else { let file = program_state .file_fetcher @@ -99,7 +97,7 @@ async fn op_emit( None }; let mut builder = GraphBuilder::new(handler, maybe_import_map, None); - let root_specifier = ModuleSpecifier::resolve_url_or_path(&root_specifier)?; + let root_specifier = resolve_url_or_path(&root_specifier)?; builder .add(&root_specifier, is_dynamic) .await |