Simplified wasmparser dependencies

This commit is contained in:
Syrus
2020-04-28 14:26:31 -07:00
parent 2f6ffea2aa
commit 39550bc469
12 changed files with 14 additions and 15 deletions

View File

@@ -36,6 +36,7 @@ use wasm_common::entity::{EntityRef, PrimaryMap, SecondaryMap};
use wasm_common::{
FuncIndex, FuncType, GlobalIndex, LocalFuncIndex, MemoryIndex, SignatureIndex, TableIndex, Type,
};
use wasmer_compiler::wasmparser::{self, BinaryReader, MemoryImmediate, Operator};
use wasmer_compiler::CompiledFunctionUnwindInfo;
use wasmer_compiler::FunctionAddressMap;
use wasmer_compiler::FunctionBodyData;
@@ -45,7 +46,6 @@ use wasmer_compiler::{
};
use wasmer_runtime::Module as WasmerCompilerModule;
use wasmer_runtime::{MemoryPlan, MemoryStyle, TablePlan};
use wasmparser::{BinaryReader, MemoryImmediate, Operator};
// TODO: debugging
use std::fs;

View File

@@ -3,9 +3,9 @@ use wasmer_runtime_core::parse::{wp_type_to_type, LoadError};
use wasmer_runtime_core::types::Type;
*/
use wasm_common::Type;
use wasmer_compiler::wasmparser::Type as WpType;
use wasmer_compiler::wasmparser::TypeOrFuncType as WpTypeOrFuncType;
use wasmer_compiler::CompileError;
use wasmparser::Type as WpType;
use wasmparser::TypeOrFuncType as WpTypeOrFuncType;
fn wp_type_to_type(ty: WpType) -> Result<Type, CompileError> {
match ty {