diff options
Diffstat (limited to 'core/modules.rs')
-rw-r--r-- | core/modules.rs | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/core/modules.rs b/core/modules.rs index 2d80071aa..ddd55199b 100644 --- a/core/modules.rs +++ b/core/modules.rs @@ -432,7 +432,7 @@ impl ModuleLoader for ExtModuleLoader { if let Some(file_source) = maybe_file_source { { let mut used_esm_sources = self.used_esm_sources.borrow_mut(); - let used = used_esm_sources.get_mut(file_source.specifier).unwrap(); + let used = used_esm_sources.get_mut(&file_source.specifier).unwrap(); *used = true; } @@ -1047,23 +1047,13 @@ impl ModuleMap { let main = v8::Boolean::new(scope, info.main); module_info_arr.set_index(scope, 1, main.into()); - let name = v8::String::new_from_one_byte( - scope, - info.name.as_bytes(), - v8::NewStringType::Normal, - ) - .unwrap(); + let name = v8::String::new(scope, &info.name).unwrap(); module_info_arr.set_index(scope, 2, name.into()); let array_len = 2 * info.requests.len() as i32; let requests_arr = v8::Array::new(scope, array_len); for (i, request) in info.requests.iter().enumerate() { - let specifier = v8::String::new_from_one_byte( - scope, - request.specifier.as_bytes(), - v8::NewStringType::Normal, - ) - .unwrap(); + let specifier = v8::String::new(scope, &request.specifier).unwrap(); requests_arr.set_index(scope, 2 * i as u32, specifier.into()); let asserted_module_type = @@ -1089,12 +1079,7 @@ impl ModuleMap { let arr = v8::Array::new(scope, 3); let (specifier, asserted_module_type) = elem.0; - let specifier = v8::String::new_from_one_byte( - scope, - specifier.as_bytes(), - v8::NewStringType::Normal, - ) - .unwrap(); + let specifier = v8::String::new(scope, specifier).unwrap(); arr.set_index(scope, 0, specifier.into()); let asserted_module_type = @@ -1103,12 +1088,7 @@ impl ModuleMap { let symbolic_module: v8::Local<v8::Value> = match &elem.1 { SymbolicModule::Alias(alias) => { - let alias = v8::String::new_from_one_byte( - scope, - alias.as_bytes(), - v8::NewStringType::Normal, - ) - .unwrap(); + let alias = v8::String::new(scope, alias).unwrap(); alias.into() } SymbolicModule::Mod(id) => { |