re-export wasmi_core as core from within wasmi_v1 (#350)

# Conflicts:
#	wasmi_v1/src/module/instantiate.rs
#	wasmi_v1/src/module2/compile/block_type.rs

wasmi_v1/src/engine/call_stack.rs

@@ -15,7 +15,7 @@ use super::{
     ValueStack,
     DEFAULT_CALL_STACK_LIMIT,
 };
-use crate::TrapCode;
+use crate::core::TrapCode;
 use alloc::vec::Vec;
 use validation::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX};
 

wasmi_v1/src/engine/exec_context.rs

@@ -13,7 +13,10 @@ use super::{
     ValueStack,
     VisitInstruction,
 };
-use crate::{Func, Trap, TrapCode, F32, F64};
+use crate::{
+    core::{Trap, TrapCode, F32, F64},
+    Func,
+};
 use core::ops::{BitAnd, BitOr, BitXor, Neg, Shl, Shr};
 use wasmi_core::{
     memory_units::Pages,

wasmi_v1/src/engine/inst_builder.rs

@@ -6,7 +6,7 @@ use super::{
     FuncBody,
     Instruction,
 };
-use crate::{Value, ValueType};
+use crate::core::{Value, ValueType};
 use alloc::vec::Vec;
 use core::{fmt, fmt::Display, mem};
 

wasmi_v1/src/engine/mod.rs

@@ -28,10 +28,10 @@ use self::{
 use super::{func::FuncEntityInternal, AsContext, AsContextMut, Func};
 use crate::{
     arena::{GuardedEntity, Index},
+    core::Trap,
     func::HostFuncEntity,
     FuncType,
     Instance,
-    Trap,
 };
 use alloc::sync::Arc;
 use core::{

wasmi_v1/src/engine/traits.rs

@@ -1,4 +1,4 @@
-use crate::Value;
+use crate::core::Value;
 use core::{iter, slice};
 
 /// Types implementing this trait may be used as parameters for function execution.

wasmi_v1/src/engine/value_stack.rs

@@ -1,7 +1,7 @@
 //! Data structures to represent the Wasm value stack during execution.
 
 use super::{DropKeep, DEFAULT_VALUE_STACK_LIMIT};
-use crate::{TrapCode, Value, ValueType, F32, F64};
+use crate::core::{TrapCode, Value, ValueType, F32, F64};
 use alloc::vec::Vec;
 use core::{fmt, fmt::Debug, iter, mem};
 

wasmi_v1/src/error.rs

@@ -7,7 +7,7 @@ use super::errors::{
     TableError,
     TranslationError,
 };
-use crate::Trap;
+use crate::core::Trap;
 use core::{fmt, fmt::Display};
 
 /// An error that may occur upon operating on Wasm modules or module instances.

wasmi_v1/src/func/into_func.rs

@@ -3,13 +3,13 @@ use super::{
     HostFuncTrampoline,
 };
 use crate::{
+    core::{FromValue, Trap, Value, ValueType, F32, F64},
     engine::{ReadParams, WriteResults},
     foreach_tuple::for_each_tuple,
     Caller,
     FuncType,
 };
 use core::{array, iter::FusedIterator};
-use wasmi_core::{FromValue, Trap, Value, ValueType, F32, F64};
 
 /// Closures and functions that can be used as host functions.
 pub trait IntoFunc<T, Params, Results>: Send + Sync + 'static {

wasmi_v1/src/func/mod.rs

@@ -18,7 +18,11 @@ use super::{
     StoreContext,
     Stored,
 };
-use crate::{Error, FuncType, Trap, Value};
+use crate::{
+    core::{Trap, Value},
+    Error,
+    FuncType,
+};
 use alloc::sync::Arc;
 use core::{fmt, fmt::Debug};
 

wasmi_v1/src/func/typed_func.rs

@@ -1,10 +1,10 @@
 use super::{into_func::WasmTypeList, Func, FuncError};
 use crate::{
+    core::Value,
     engine::{CallParams, CallResults},
     AsContext,
     AsContextMut,
     Error,
-    Value,
 };
 use core::{fmt, fmt::Debug, marker::PhantomData};
 use wasmi_core::Trap;

wasmi_v1/src/func_type.rs

@@ -1,4 +1,4 @@
-use crate::ValueType;
+use crate::core::ValueType;
 use alloc::{sync::Arc, vec::Vec};
 
 /// A function type representing a function's parameter and result types.

wasmi_v1/src/global.rs

@@ -1,5 +1,5 @@
 use super::{AsContext, AsContextMut, Index, Stored};
-use crate::{Value, ValueType};
+use crate::core::{Value, ValueType};
 use core::{fmt, fmt::Display};
 use parity_wasm::elements as pwasm;
 

wasmi_v1/src/lib.rs

@@ -27,7 +27,9 @@ mod module;
 mod store;
 mod table;
 
-use wasmi_core::{Trap, TrapCode, Value, ValueType, F32, F64};
+/// Definitions from the `wasmi_core` crate.
+#[doc(inline)]
+pub use wasmi_core as core;
 
 /// Defines some errors that may occur upon interaction with `wasmi`.
 pub mod errors {

wasmi_v1/src/linker.rs

@@ -8,7 +8,7 @@ use super::{
     Module,
     TableType,
 };
-use crate::{FuncType, ValueType};
+use crate::{core::ValueType, FuncType};
 use alloc::{
     collections::{btree_map::Entry, BTreeMap},
     string::{String, ToString},

wasmi_v1/src/module/compile/mod.rs

@@ -22,7 +22,7 @@ use super::{
     },
     Engine,
 };
-use crate::{Value, ValueType};
+use crate::core::{Value, ValueType};
 use alloc::vec::Vec;
 use parity_wasm::elements::{self as pwasm, Instruction};
 use validation::{

wasmi_v1/src/module/instantiate.rs

@@ -29,7 +29,10 @@ use super::{
     },
     Module,
 };
-use crate::{GlobalType, Value, ValueType, F32, F64};
+use crate::{
+    core::{Value, ValueType, F32, F64},
+    GlobalType,
+};
 use core::{fmt, fmt::Display};
 use parity_wasm::elements as pwasm;
 use validation::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX};