DeCarabas/oden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[oden-js] Fix various bugs in module loader

Browse source
This commit is contained in:
John Doty 2023-06-24 11:03:07 -07:00
parent db8a5f8eed
commit 9e685bc569
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
oden-js/src/module/loader.rs
View file

@ -9,7 +9,7 @@ pub enum ModuleSource<'a> {
}
pub trait ModuleLoader {
fn load(&mut self, context: &ContextRef, name: &str) -> Result<ModuleSource>;
fn load(&self, context: &ContextRef, name: &str) -> Result<ModuleSource>;
}
pub struct DefaultModuleLoader {}
@ -21,7 +21,7 @@ impl DefaultModuleLoader {
}
impl ModuleLoader for DefaultModuleLoader {
fn load(&mut self, _context: &ContextRef, name: &str) -> Result<ModuleSource> {
fn load(&self, _context: &ContextRef, name: &str) -> Result<ModuleSource> {
// Attempt to open the file.
let path = Path::new(name);
match std::fs::read_to_string(path) {
@ -34,7 +34,7 @@ impl ModuleLoader for DefaultModuleLoader {
pub(crate) fn load_module(
context: &ContextRef,
name: &str,
loader: &mut Box<dyn ModuleLoader>,
loader: &Box<dyn ModuleLoader>,
) -> *mut sys::JSModuleDef {
match loader.load(context, name) {
Ok(ModuleSource::Native(native)) => native.module,