Require T: 'static for Store, upgrade to wasmtime_runtime_layer v34.0.0 (#54)

Author: juntyr

Cargo.toml

@@ -13,7 +13,7 @@ fxhash = { version = "0.2", default-features = false }
 hashbrown = { version = "0.15", default-features = false }
 ref-cast = { version = "1.0", default-features = false }
 smallvec = { version = "1.11", default-features = false }
-wasm_runtime_layer = { path = ".", version = "0.5", default-features = false }
+wasm_runtime_layer = { path = ".", version = "0.6", default-features = false }
 
 [workspace.package]
 edition = "2021"
@@ -22,7 +22,7 @@ repository = "https://github.com/DouglasDwyer/wasm_runtime_layer"
 
 [package]
 name = "wasm_runtime_layer"
-version = "0.5.0"
+version = "0.6.0"
 edition = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
@@ -43,15 +43,15 @@ default = [ "std" ]
 std = [ "anyhow/std" ]
 
 [dev-dependencies]
-js_wasm_runtime_layer = { version = "0.5", path = "backends/js_wasm_runtime_layer" }
+js_wasm_runtime_layer = { version = "0.6", path = "backends/js_wasm_runtime_layer" }
 wasmi_runtime_layer = { version = "0.47", path = "backends/wasmi_runtime_layer" }
 wasm-bindgen-test = { version = "0.3" }
 wat = { version = "1.0" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 wasmer_runtime_layer = { version = "6.0", path = "backends/wasmer_runtime_layer" }
-wasmtime = { version = "33.0", default-features = false, features = [ "gc-null" ] }
-wasmtime_runtime_layer = { version = "33.0", path = "backends/wasmtime_runtime_layer" }
+wasmtime = { version = "34.0", default-features = false, features = [ "gc-null" ] }
+wasmtime_runtime_layer = { version = "34.0", path = "backends/wasmtime_runtime_layer" }
 
 [package.metadata."docs.rs"]
 all-features = true

backends/js_wasm_runtime_layer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "js_wasm_runtime_layer"
-version = "0.5.0"
+version = "0.6.0"
 edition = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }

backends/js_wasm_runtime_layer/src/func.rs

@@ -102,7 +102,7 @@ macro_rules! func_wrapper {
 }
 
 impl WasmFunc<Engine> for Func {
-    fn new<T>(
+    fn new<T: 'static>(
         mut ctx: impl AsContextMut<Engine, UserState = T>,
         ty: FuncType,
         func: impl 'static

backends/js_wasm_runtime_layer/src/lib.rs

@@ -96,9 +96,9 @@ impl WasmEngine for Engine {
     type Instance = Instance;
     type Memory = Memory;
     type Module = Module;
-    type Store<T> = Store<T>;
-    type StoreContext<'a, T: 'a> = StoreContext<'a, T>;
-    type StoreContextMut<'a, T: 'a> = StoreContextMut<'a, T>;
+    type Store<T: 'static> = Store<T>;
+    type StoreContext<'a, T: 'static> = StoreContext<'a, T>;
+    type StoreContextMut<'a, T: 'static> = StoreContextMut<'a, T>;
     type Table = Table;
 }
 
@@ -332,7 +332,7 @@ impl WasmExternRef<Engine> for ExternRef {
         unimplemented!("ExternRef is not supported in the js_wasm_runtime_layer backend")
     }
 
-    fn downcast<'a, 's: 'a, T: 'static, S: 's>(
+    fn downcast<'a, 's: 'a, T: 'static, S: 'static>(
         &self,
         _: <Engine as WasmEngine>::StoreContext<'s, S>,
     ) -> anyhow::Result<&'a T> {

backends/js_wasm_runtime_layer/src/store.rs

@@ -22,7 +22,7 @@ use crate::{
 /// no-longer used modules. It is as such recommended to have the stores lifetime correspond to its
 /// modules, and not repeatedly create and drop modules within an existing store, but rather create
 /// a new store for it, to avoid unbounded memory use.
-pub struct Store<T> {
+pub struct Store<T: 'static> {
     /// The internal store is kept behind a pointer.
     ///
     /// This is to allow referencing and reconstructing a calling context in exported functions,
@@ -58,7 +58,7 @@ pub struct Store<T> {
     inner: *mut StoreInner<T>,
 }
 
-impl<T> Store<T> {
+impl<T: 'static> Store<T> {
     /// Creates a new store from the inner box
     fn from_inner(inner: Box<StoreInner<T>>) -> Self {
         Self {
@@ -85,13 +85,13 @@ impl<T> Store<T> {
     }
 }
 
-impl<T> Drop for Store<T> {
+impl<T: 'static> Drop for Store<T> {
     fn drop(&mut self) {
         unsafe { drop(Box::from_raw(self.inner)) }
     }
 }
 
-impl<T> WasmStore<T, Engine> for Store<T> {
+impl<T: 'static> WasmStore<T, Engine> for Store<T> {
     fn new(engine: &Engine, data: T) -> Self {
         #[cfg(feature = "tracing")]
         let _span = tracing::debug_span!("Store::new").entered();
@@ -135,29 +135,29 @@ impl<T> WasmStore<T, Engine> for Store<T> {
     }
 }
 
-impl<T> AsContext<Engine> for Store<T> {
+impl<T: 'static> AsContext<Engine> for Store<T> {
     type UserState = T;
 
     fn as_context(&self) -> <Engine as WasmEngine>::StoreContext<'_, Self::UserState> {
         self.get()
     }
 }
 
-impl<T> AsContextMut<Engine> for Store<T> {
+impl<T: 'static> AsContextMut<Engine> for Store<T> {
     fn as_context_mut(&mut self) -> StoreContextMut<T> {
         self.get_mut()
     }
 }
 
-impl<T: fmt::Debug> fmt::Debug for Store<T> {
+impl<T: 'static + fmt::Debug> fmt::Debug for Store<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.inner.fmt(f)
     }
 }
 
 #[derive(Debug)]
 /// Holds the inner state of the store
-pub struct StoreInner<T> {
+pub struct StoreInner<T: 'static> {
     /// The engine used
     pub(crate) engine: Engine,
     /// Instances are not Send + Sync
@@ -181,7 +181,7 @@ pub struct StoreInner<T> {
     drop_resources: Vec<DropResource>,
 }
 
-impl<T> StoreInner<T> {
+impl<T: 'static> StoreInner<T> {
     /// Inserts a new function and returns its id
     pub(crate) fn insert_func(&mut self, func: FuncInner) -> Func {
         Func {
@@ -225,19 +225,19 @@ impl<T> StoreInner<T> {
 }
 
 /// Immutable context to the store
-pub struct StoreContext<'a, T: 'a> {
+pub struct StoreContext<'a, T: 'static> {
     /// The store
     store: &'a StoreInner<T>,
 }
 
-impl<'a, T: 'a> StoreContext<'a, T> {
+impl<'a, T: 'static> StoreContext<'a, T> {
     /// Provides a store context from a reference
     pub fn from_ref(store: &'a StoreInner<T>) -> Self {
         Self { store }
     }
 }
 
-impl<T> Deref for StoreContext<'_, T> {
+impl<T: 'static> Deref for StoreContext<'_, T> {
     type Target = StoreInner<T>;
 
     fn deref(&self) -> &Self::Target {
@@ -246,12 +246,12 @@ impl<T> Deref for StoreContext<'_, T> {
 }
 
 /// Mutable context to the store
-pub struct StoreContextMut<'a, T: 'a> {
+pub struct StoreContextMut<'a, T: 'static> {
     /// The store
     store: &'a mut StoreInner<T>,
 }
 
-impl<'a, T: 'a> StoreContextMut<'a, T> {
+impl<'a, T: 'static> StoreContextMut<'a, T> {
     /// Returns a pointer to the inner store
     pub(crate) fn as_ptr(&mut self) -> *mut StoreInner<T> {
         self.store as *mut _
@@ -263,21 +263,21 @@ impl<'a, T: 'a> StoreContextMut<'a, T> {
     }
 }
 
-impl<T> Deref for StoreContextMut<'_, T> {
+impl<T: 'static> Deref for StoreContextMut<'_, T> {
     type Target = StoreInner<T>;
 
     fn deref(&self) -> &Self::Target {
         &*self.store
     }
 }
 
-impl<T> DerefMut for StoreContextMut<'_, T> {
+impl<T: 'static> DerefMut for StoreContextMut<'_, T> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut *self.store
     }
 }
 
-impl<'a, T: 'a> WasmStoreContext<'a, T, Engine> for StoreContext<'a, T> {
+impl<'a, T: 'static> WasmStoreContext<'a, T, Engine> for StoreContext<'a, T> {
     fn engine(&self) -> &Engine {
         &self.engine
     }
@@ -287,15 +287,15 @@ impl<'a, T: 'a> WasmStoreContext<'a, T, Engine> for StoreContext<'a, T> {
     }
 }
 
-impl<'a, T: 'a> AsContext<Engine> for StoreContext<'a, T> {
+impl<'a, T: 'static> AsContext<Engine> for StoreContext<'a, T> {
     type UserState = T;
 
     fn as_context(&self) -> StoreContext<'_, T> {
         StoreContext { store: self.store }
     }
 }
 
-impl<'a, T: 'a> WasmStoreContext<'a, T, Engine> for StoreContextMut<'a, T> {
+impl<'a, T: 'static> WasmStoreContext<'a, T, Engine> for StoreContextMut<'a, T> {
     fn engine(&self) -> &Engine {
         &self.engine
     }
@@ -305,21 +305,21 @@ impl<'a, T: 'a> WasmStoreContext<'a, T, Engine> for StoreContextMut<'a, T> {
     }
 }
 
-impl<'a, T: 'a> WasmStoreContextMut<'a, T, Engine> for StoreContextMut<'a, T> {
+impl<'a, T: 'static> WasmStoreContextMut<'a, T, Engine> for StoreContextMut<'a, T> {
     fn data_mut(&mut self) -> &mut T {
         &mut self.data
     }
 }
 
-impl<'a, T: 'a> AsContext<Engine> for StoreContextMut<'a, T> {
+impl<'a, T: 'static> AsContext<Engine> for StoreContextMut<'a, T> {
     type UserState = T;
 
     fn as_context(&self) -> <Engine as WasmEngine>::StoreContext<'_, T> {
         StoreContext { store: self.store }
     }
 }
 
-impl<'a, T: 'a> AsContextMut<Engine> for StoreContextMut<'a, T> {
+impl<'a, T: 'static> AsContextMut<Engine> for StoreContextMut<'a, T> {
     fn as_context_mut(&mut self) -> StoreContextMut<'_, T> {
         StoreContextMut { store: self.store }
     }