diff --git a/lib/deprecated/runtime-core/src/instance.rs b/lib/deprecated/runtime-core/src/instance.rs index c572bfdcc..31db97d09 100644 --- a/lib/deprecated/runtime-core/src/instance.rs +++ b/lib/deprecated/runtime-core/src/instance.rs @@ -1,9 +1,4 @@ -mod new { - pub(crate) use wasm_common::entity::EntityRef; - pub(crate) use wasmer::Instance; -} - -use crate::types::Value; +use crate::{new, types::Value}; use std::{convert::Infallible, error::Error}; pub struct Instance { @@ -14,7 +9,7 @@ pub struct Instance { pub module: (), // TODO //pub exports: Exports, - pub(crate) new_instance: new::Instance, + pub(crate) new_instance: new::wasmer::Instance, } impl Instance { @@ -39,7 +34,7 @@ impl Instance { note = "Please use `instance.module().info().resolve_func(name)` instead." )] pub fn resolve_func(&self, name: &str) -> Result { - use self::new::EntityRef; + use new::wasm_common::entity::EntityRef; self.new_instance .module() diff --git a/lib/deprecated/runtime-core/src/lib.rs b/lib/deprecated/runtime-core/src/lib.rs index fdd0b7dbf..55a22fe35 100644 --- a/lib/deprecated/runtime-core/src/lib.rs +++ b/lib/deprecated/runtime-core/src/lib.rs @@ -1,4 +1,9 @@ mod instance; pub mod types; +mod new { + pub(crate) use wasm_common; + pub(crate) use wasmer; +} + pub use crate::instance::Instance; diff --git a/lib/deprecated/runtime-core/src/types.rs b/lib/deprecated/runtime-core/src/types.rs index 45738e4f7..a369a7bdf 100644 --- a/lib/deprecated/runtime-core/src/types.rs +++ b/lib/deprecated/runtime-core/src/types.rs @@ -1,5 +1,3 @@ -mod new { - pub(crate) use wasmer::Val; -} +use crate::new; -pub type Value = new::Val; +pub type Value = new::wasmer::Val;