diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2021-02-23 15:22:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-23 15:22:55 +0100 |
commit | dc3683c7a433bf44656063c9eee87709fbe1e7d4 (patch) | |
tree | fd5af4dc406d22a6fb64a70677a4be7394daeca5 /core/bindings.rs | |
parent | dccf5e0c5c7f04409809104dd23472bcc058e170 (diff) |
refactor(core): cleanup module implementation (#9580)
* remove "ModuleNameMap", instead define that map inline inside "Modules" struct
* remove "dyn_import_id" argument from "mod_instantiate"
* rename "Modules" struct to "ModuleMap"
* rename "JsRuntime::modules" to "JsRuntime::module_map"
Diffstat (limited to 'core/bindings.rs')
-rw-r--r-- | core/bindings.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/bindings.rs b/core/bindings.rs index 157b58a9d..7fb8aac70 100644 --- a/core/bindings.rs +++ b/core/bindings.rs @@ -246,7 +246,7 @@ pub extern "C" fn host_initialize_import_meta_object_callback( let module_global = v8::Global::new(scope, module); let info = state - .modules + .module_map .get_info(&module_global) .expect("Module not found"); @@ -794,7 +794,7 @@ pub fn module_resolve_callback<'s>( let referrer_global = v8::Global::new(scope, referrer); let referrer_info = state - .modules + .module_map .get_info(&referrer_global) .expect("ModuleInfo not found"); let referrer_name = referrer_info.name.to_string(); @@ -811,8 +811,8 @@ pub fn module_resolve_callback<'s>( ) .expect("Module should have been already resolved"); - if let Some(id) = state.modules.get_id(resolved_specifier.as_str()) { - if let Some(handle) = state.modules.get_handle(id) { + if let Some(id) = state.module_map.get_id(resolved_specifier.as_str()) { + if let Some(handle) = state.module_map.get_handle(id) { return Some(v8::Local::new(scope, handle)); } } |