diff --git a/crates/jit/src/instantiate.rs b/crates/jit/src/instantiate.rs index 2680b1630682..e8ffc7550b7b 100644 --- a/crates/jit/src/instantiate.rs +++ b/crates/jit/src/instantiate.rs @@ -254,7 +254,7 @@ impl CompiledModule { } /// Return a reference to a module. - pub fn module_ref(&self) -> &Module { + pub fn module(&self) -> &Module { &self.module } diff --git a/crates/runtime/src/debug_builtins.rs b/crates/runtime/src/debug_builtins.rs index 57e7b16b7cac..3a6cfc8b81c2 100644 --- a/crates/runtime/src/debug_builtins.rs +++ b/crates/runtime/src/debug_builtins.rs @@ -16,7 +16,7 @@ pub unsafe extern "C" fn resolve_vmctx_memory_ptr(p: *const u32) -> *const u8 { ); let handle = InstanceHandle::from_vmctx(VMCTX_AND_MEMORY.0); assert!( - VMCTX_AND_MEMORY.1 < handle.module_ref().local.memory_plans.len(), + VMCTX_AND_MEMORY.1 < handle.module().local.memory_plans.len(), "memory index for debugger is out of bounds" ); let index = MemoryIndex::new(VMCTX_AND_MEMORY.1); diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs index ba5600a296f7..4b446686bbec 100644 --- a/crates/runtime/src/instance.rs +++ b/crates/runtime/src/instance.rs @@ -92,7 +92,7 @@ impl Instance { unsafe { *self.signature_ids_ptr().add(index) } } - pub(crate) fn module_ref(&self) -> &Module { + pub(crate) fn module(&self) -> &Module { &self.module } @@ -934,8 +934,8 @@ impl InstanceHandle { } /// Return a reference to a module. - pub fn module_ref(&self) -> &Module { - self.instance().module_ref() + pub fn module(&self) -> &Module { + self.instance().module() } /// Lookup an export with the given name. diff --git a/crates/wasmtime/src/instance.rs b/crates/wasmtime/src/instance.rs index 3c38fce4ad1c..3eaa04b8deba 100644 --- a/crates/wasmtime/src/instance.rs +++ b/crates/wasmtime/src/instance.rs @@ -35,11 +35,11 @@ fn instantiate( } } - if imports.len() != compiled_module.module_ref().imports.len() { + if imports.len() != compiled_module.module().imports.len() { bail!( "wrong number of imports provided, {} != {}", imports.len(), - compiled_module.module_ref().imports.len() + compiled_module.module().imports.len() ); } @@ -79,7 +79,7 @@ fn instantiate( instance }; - let start_func = instance.handle.module_ref().start_func; + let start_func = instance.handle.module().start_func; // If a start function is present, invoke it. Make sure we use all the // trap-handling configuration in `store` as well. diff --git a/crates/wasmtime/src/module.rs b/crates/wasmtime/src/module.rs index 36dcc23a1d50..d9180f96def5 100644 --- a/crates/wasmtime/src/module.rs +++ b/crates/wasmtime/src/module.rs @@ -417,7 +417,7 @@ impl Module { pub fn imports<'module>( &'module self, ) -> impl ExactSizeIterator> + 'module { - let module = self.inner.compiled.module_ref(); + let module = self.inner.compiled.module(); module .imports .iter() @@ -484,7 +484,7 @@ impl Module { pub fn exports<'module>( &'module self, ) -> impl ExactSizeIterator> + 'module { - let module = self.inner.compiled.module_ref(); + let module = self.inner.compiled.module(); module.exports.iter().map(move |(name, entity_index)| { let r#type = EntityType::new(entity_index, module); ExportType::new(name, r#type) @@ -535,7 +535,7 @@ impl Module { /// # } /// ``` pub fn get_export<'module>(&'module self, name: &'module str) -> Option { - let module = self.inner.compiled.module_ref(); + let module = self.inner.compiled.module(); let entity_index = module.exports.get(name)?; Some(EntityType::new(entity_index, module).extern_type()) }