diff --git a/lib/api/src/sys/externals/memory.rs b/lib/api/src/sys/externals/memory.rs index fddcb2995..a82a031bf 100644 --- a/lib/api/src/sys/externals/memory.rs +++ b/lib/api/src/sys/externals/memory.rs @@ -51,7 +51,7 @@ impl Memory { /// ``` pub fn new(store: &mut impl AsStoreMut, ty: MemoryType) -> Result { let mut store = store.as_store_mut(); - let tunables = store.tunables(); + let tunables = store.engine().tunables(); let style = tunables.memory_style(&ty); let memory = tunables.create_host_memory(&ty, &style)?; diff --git a/lib/api/src/sys/externals/table.rs b/lib/api/src/sys/externals/table.rs index 521373308..754d925b2 100644 --- a/lib/api/src/sys/externals/table.rs +++ b/lib/api/src/sys/externals/table.rs @@ -73,7 +73,7 @@ impl Table { ) -> Result { let item = value_to_table_element(&mut store, init)?; let mut store = store.as_store_mut(); - let tunables = store.tunables(); + let tunables = store.engine().tunables(); let style = tunables.table_style(&ty); let mut table = tunables .create_host_table(&ty, &style) diff --git a/lib/api/src/sys/imports.rs b/lib/api/src/sys/imports.rs index a08d1b6ad..6c0f0b3d6 100644 --- a/lib/api/src/sys/imports.rs +++ b/lib/api/src/sys/imports.rs @@ -138,7 +138,7 @@ impl Imports { .next() .map(|a| *a.ty()) .map(|ty| { - let style = store.as_store_ref().tunables().memory_style(&ty); + let style = store.as_store_ref().engine().tunables().memory_style(&ty); VMSharedMemory::new(&ty, &style).unwrap() }); diff --git a/lib/api/src/sys/module.rs b/lib/api/src/sys/module.rs index 16fa7ee23..ea4d55399 100644 --- a/lib/api/src/sys/module.rs +++ b/lib/api/src/sys/module.rs @@ -119,10 +119,10 @@ impl Module { } } let mut store_mut = store.as_store_mut(); - let (tunables, objects) = store_mut.tunables_and_objects_mut(); + let (engine, objects) = store_mut.engine_and_objects_mut(); unsafe { let mut instance_handle = self.artifact.instantiate( - tunables, + engine.tunables(), &imports .iter() .map(crate::Extern::to_vm_extern) diff --git a/lib/api/src/sys/store.rs b/lib/api/src/sys/store.rs index fc095652d..1f3a999db 100644 --- a/lib/api/src/sys/store.rs +++ b/lib/api/src/sys/store.rs @@ -95,6 +95,10 @@ impl Store { } #[cfg(feature = "compiler")] + #[deprecated( + since = "3.2.0", + note = "store.tunables() has been deprecated in favor of store.engine().tunables()" + )] /// Returns the [`Tunables`]. pub fn tunables(&self) -> &dyn Tunables { self.engine.tunables() @@ -259,6 +263,10 @@ impl<'a> StoreRef<'a> { } #[cfg(feature = "compiler")] + #[deprecated( + since = "3.2.0", + note = "store.tunables() has been deprecated in favor of store.engine().tunables()" + )] /// Returns the [`Tunables`]. pub fn tunables(&self) -> &dyn Tunables { self.inner.engine.tunables() @@ -296,6 +304,10 @@ pub struct StoreMut<'a> { impl<'a> StoreMut<'a> { /// Returns the [`Tunables`]. #[cfg(feature = "compiler")] + #[deprecated( + since = "3.2.0", + note = "store.tunables() has been deprecated in favor of store.engine().tunables()" + )] pub fn tunables(&self) -> &dyn Tunables { self.inner.engine.tunables() } @@ -315,8 +327,8 @@ impl<'a> StoreMut<'a> { } #[cfg(feature = "compiler")] - pub(crate) fn tunables_and_objects_mut(&mut self) -> (&dyn Tunables, &mut StoreObjects) { - (self.inner.engine.tunables(), &mut self.inner.objects) + pub(crate) fn engine_and_objects_mut(&mut self) -> (&Engine, &mut StoreObjects) { + (&self.inner.engine, &mut self.inner.objects) } pub(crate) fn as_raw(&self) -> *mut StoreInner { diff --git a/lib/cli/src/commands/create_exe.rs b/lib/cli/src/commands/create_exe.rs index 29613cd4b..675e26b93 100644 --- a/lib/cli/src/commands/create_exe.rs +++ b/lib/cli/src/commands/create_exe.rs @@ -754,7 +754,7 @@ fn compile_atoms( let engine_inner = engine.inner(); let compiler = engine_inner.compiler()?; let features = engine_inner.features(); - let tunables = store.tunables(); + let tunables = store.engine().tunables(); let (module_info, obj, _, _) = Artifact::generate_object( compiler, data, diff --git a/lib/wasi/src/utils.rs b/lib/wasi/src/utils.rs index ba0df86f2..c380b0ef4 100644 --- a/lib/wasi/src/utils.rs +++ b/lib/wasi/src/utils.rs @@ -65,7 +65,7 @@ pub fn wasi_import_shared_memory( .next() .map(|a| *a.ty()) .map(|ty| { - let style = store.as_store_ref().tunables().memory_style(&ty); + let style = store.as_store_ref().engine().tunables().memory_style(&ty); VMSharedMemory::new(&ty, &style).unwrap() });