mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-10 22:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename WasmerEnv::finish to WasmerEnv::init_with_instance

Browse Source
This commit is contained in:
Mark McCaskey
2020-11-17 17:14:11 -08:00
parent 6aab77e503
commit 3580f165e8
8 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/api/src/env.rs
View File

@@ -47,7 +47,7 @@ impl From<ExportError> for HostEnvInitError {
/// }
///
/// impl WasmerEnv for MyEnv {
/// fn finish(&mut self, instance: &Instance) -> Result<(), HostEnvInitError> {
/// fn init_with_instance(&mut self, instance: &Instance) -> Result<(), HostEnvInitError> {
/// let memory = instance.exports.get_memory("memory").unwrap();
/// self.memory.initialize(memory.clone());
/// Ok(())
@@ -60,7 +60,7 @@ pub trait WasmerEnv {
///
/// This function is called after `Instance` is created but before it is
/// returned to the user via `Instance::new`.
fn finish(&mut self, instance: &Instance) -> Result<(), HostEnvInitError> {
fn init_with_instance(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
Ok(())
}
}
@@ -94,8 +94,8 @@ impl WasmerEnv for ::std::sync::atomic::AtomicUsize {}
impl WasmerEnv for ::std::sync::atomic::AtomicIsize {}
impl<T: WasmerEnv> WasmerEnv for &'static mut T {
fn finish(&mut self, instance: &Instance) -> Result<(), HostEnvInitError> {
(*self).finish(instance)
fn init_with_instance(&mut self, instance: &Instance) -> Result<(), HostEnvInitError> {
(*self).init_with_instance(instance)
}
}

8
lib/api/src/externals/function.rs vendored
View File

@@ -145,7 +145,9 @@ impl Function {
};
// TODO: look into removing transmute by changing API type signatures
let function_ptr = Some(unsafe {
std::mem::transmute::<fn(_, _) -> Result<(), _>, fn(_, _) -> Result<(), _>>(Env::finish)
std::mem::transmute::<fn(_, _) -> Result<(), _>, fn(_, _) -> Result<(), _>>(
Env::init_with_instance,
)
});
Self {
@@ -253,7 +255,9 @@ impl Function {
};
// TODO: look into removing transmute by changing API type signatures
let function_ptr = Some(unsafe {
std::mem::transmute::<fn(_, _) -> Result<(), _>, fn(_, _) -> Result<(), _>>(Env::finish)
std::mem::transmute::<fn(_, _) -> Result<(), _>, fn(_, _) -> Result<(), _>>(
Env::init_with_instance,
)
});
let signature = function.ty();

5
lib/c-api/src/wasm_c_api/externals/function.rs vendored
View File

@@ -116,7 +116,10 @@ pub unsafe extern "C" fn wasm_func_new_with_env(
}
impl wasmer::WasmerEnv for WrapperEnv {
fn finish(&mut self, _instance: &wasmer::Instance) -> Result<(), wasmer::HostEnvInitError> {
fn init_with_instance(
&mut self,
_instance: &wasmer::Instance,
) -> Result<(), wasmer::HostEnvInitError> {
Ok(())
}
}

3
lib/c-api/wasmer_wasm.h
View File

@@ -29,6 +29,9 @@
# define DEPRECATED(message) __declspec(deprecated(message))
#endif
// The `jit` feature has been enabled for this build.
#define WASMER_JIT_ENABLED
// The `compiler` feature has been enabled for this build.
#define WASMER_COMPILER_ENABLED

4
lib/derive/src/lib.rs
View File

@@ -42,7 +42,7 @@ fn impl_wasmer_env(input: &DeriveInput) -> TokenStream {
set_dummy(quote! {
impl ::wasmer::WasmerEnv for #struct_name {
fn finish(&mut self, instance: &::wasmer::Instance) -> Result<(), ::wasmer::HostEnvInitError> {
fn init_with_instance(&mut self, instance: &::wasmer::Instance) -> Result<(), ::wasmer::HostEnvInitError> {
Ok(())
}
}
@@ -154,7 +154,7 @@ fn derive_struct_fields(data: &DataStruct) -> (TokenStream, TokenStream) {
}
let trait_methods = quote! {
fn finish(&mut self, instance: &::wasmer::Instance) -> Result<(), ::wasmer::HostEnvInitError> {
fn init_with_instance(&mut self, instance: &::wasmer::Instance) -> Result<(), ::wasmer::HostEnvInitError> {
#(#finish)*
Ok(())
}

4
lib/emscripten/src/lib.rs
View File

@@ -77,9 +77,9 @@ pub struct EmEnv {
}
impl WasmerEnv for EmEnv {
fn finish(&mut self, instance: &Instance) -> Result<(), wasmer::HostEnvInitError> {
fn init_with_instance(&mut self, instance: &Instance) -> Result<(), wasmer::HostEnvInitError> {
let mut ed = self.data.lock().unwrap();
ed.finish(instance)?;
ed.init_with_instance(instance)?;
Ok(())
}
}

4
tests/compilers/imports.rs
View File

@@ -97,7 +97,7 @@ fn dynamic_function_with_env() -> Result<()> {
}
impl WasmerEnv for Env {
fn finish(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
fn init_with_instance(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
Ok(())
}
}
@@ -230,7 +230,7 @@ fn static_function_with_env() -> Result<()> {
}
impl WasmerEnv for Env {
fn finish(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
fn init_with_instance(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
Ok(())
}
}

4
tests/compilers/native_functions.rs
View File

@@ -116,7 +116,7 @@ fn static_host_function_with_env() -> anyhow::Result<()> {
}
impl WasmerEnv for Env {
fn finish(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
fn init_with_instance(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
Ok(())
}
}
@@ -196,7 +196,7 @@ fn dynamic_host_function_with_env() -> anyhow::Result<()> {
}
impl WasmerEnv for Env {
fn finish(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
fn init_with_instance(&mut self, _instance: &Instance) -> Result<(), HostEnvInitError> {
Ok(())
}
}