diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/module_loader.rs | 5 | ||||
| -rw-r--r-- | cli/standalone.rs | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cli/module_loader.rs b/cli/module_loader.rs index faf1492bb..c14c953b2 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -65,7 +65,6 @@ impl CliModuleLoader { impl ModuleLoader for CliModuleLoader { fn resolve( &self, - _op_state: Rc<RefCell<OpState>>, specifier: &str, referrer: &str, is_main: bool, @@ -77,6 +76,9 @@ impl ModuleLoader for CliModuleLoader { referrer }; + // TODO(ry) I think we can remove this conditional. At the time of writing + // we don't have any tests that fail if it was removed. + // https://github.com/WICG/import-maps/issues/157 if !is_main { if let Some(import_map) = &self.import_map { return import_map @@ -92,7 +94,6 @@ impl ModuleLoader for CliModuleLoader { fn load( &self, - _op_state: Rc<RefCell<OpState>>, module_specifier: &ModuleSpecifier, maybe_referrer: Option<ModuleSpecifier>, _is_dynamic: bool, diff --git a/cli/standalone.rs b/cli/standalone.rs index b957f2505..3db2981e4 100644 --- a/cli/standalone.rs +++ b/cli/standalone.rs @@ -20,7 +20,6 @@ use deno_core::url::Url; use deno_core::v8_set_flags; use deno_core::ModuleLoader; use deno_core::ModuleSpecifier; -use deno_core::OpState; use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel; use deno_runtime::deno_web::BlobStore; use deno_runtime::permissions::Permissions; @@ -29,7 +28,6 @@ use deno_runtime::worker::MainWorker; use deno_runtime::worker::WorkerOptions; use deno_tls::create_default_root_cert_store; use log::Level; -use std::cell::RefCell; use std::convert::TryInto; use std::env::current_exe; use std::fs::File; @@ -127,7 +125,6 @@ struct EmbeddedModuleLoader(String); impl ModuleLoader for EmbeddedModuleLoader { fn resolve( &self, - _op_state: Rc<RefCell<OpState>>, specifier: &str, _referrer: &str, _is_main: bool, @@ -146,7 +143,6 @@ impl ModuleLoader for EmbeddedModuleLoader { fn load( &self, - _op_state: Rc<RefCell<OpState>>, module_specifier: &ModuleSpecifier, _maybe_referrer: Option<ModuleSpecifier>, _is_dynamic: bool, |