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

Rename EngineExport to Export

Browse Source
This commit is contained in:
Mark McCaskey
2020-11-30 12:32:53 -08:00
parent 9e0cfcebbb
commit 03410c15a1
21 changed files with 162 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/api/src/native.rs
View File

@@ -15,7 +15,7 @@ use crate::externals::function::{
};
use crate::{FromToNativeWasmType, Function, FunctionType, RuntimeError, Store, WasmTypeList};
use std::panic::{catch_unwind, AssertUnwindSafe};
use wasmer_engine::EngineExportFunction;
use wasmer_engine::ExportFunction;
use wasmer_types::NativeWasmType;
use wasmer_vm::{
VMDynamicFunctionContext, VMExportFunction, VMFunctionBody, VMFunctionEnvironment,
@@ -30,7 +30,7 @@ pub struct NativeFunc<Args = (), Rets = ()> {
address: *const VMFunctionBody,
vmctx: VMFunctionEnvironment,
arg_kind: VMFunctionKind,
// exported: EngineExportFunction,
// exported: ExportFunction,
_phantom: PhantomData<(Args, Rets)>,
}
@@ -77,7 +77,7 @@ where
}
}*/
impl<Args, Rets> From<&NativeFunc<Args, Rets>> for EngineExportFunction
impl<Args, Rets> From<&NativeFunc<Args, Rets>> for ExportFunction
where
Args: WasmTypeList,
Rets: WasmTypeList,
@@ -86,8 +86,8 @@ where
let signature = FunctionType::new(Args::wasm_types(), Rets::wasm_types());
Self {
// TODO:
function_ptr: None,
function: VMExportFunction {
import_init_function_ptr: None,
vm_function: VMExportFunction {
address: other.address,
vmctx: other.vmctx,
signature,
@@ -108,10 +108,10 @@ where
Self {
store: other.store,
definition: other.definition,
exported: EngineExportFunction {
exported: ExportFunction {
// TODO:
function_ptr: None,
function: VMExportFunction {
import_init_function_ptr: None,
vm_function: VMExportFunction {
address: other.address,
vmctx: other.vmctx,
signature,