From d55a9967b17f389affd3de1bed64582c7d93862f Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 26 Feb 2020 05:13:28 -0800 Subject: [PATCH] Remove some obsolete re-exports in wasmtime-jit. (#992) These were from when wasmtime-jit was trying to present a different API; now they're not needed. --- crates/api/src/callable.rs | 3 +-- crates/api/src/func.rs | 3 +-- crates/jit/src/lib.rs | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/crates/api/src/callable.rs b/crates/api/src/callable.rs index 601b0ed76341..c4983df8c8e4 100644 --- a/crates/api/src/callable.rs +++ b/crates/api/src/callable.rs @@ -6,8 +6,7 @@ use crate::values::Val; use std::ptr; use std::rc::Rc; use wasmtime_environ::ir; -use wasmtime_jit::InstanceHandle; -use wasmtime_runtime::Export; +use wasmtime_runtime::{Export, InstanceHandle}; /// A trait representing a function that can be imported and called from inside /// WebAssembly. diff --git a/crates/api/src/func.rs b/crates/api/src/func.rs index bc24660afc4b..de0255feff43 100644 --- a/crates/api/src/func.rs +++ b/crates/api/src/func.rs @@ -6,8 +6,7 @@ use std::mem; use std::panic::{self, AssertUnwindSafe}; use std::ptr; use std::rc::Rc; -use wasmtime_jit::InstanceHandle; -use wasmtime_runtime::{VMContext, VMFunctionBody}; +use wasmtime_runtime::{InstanceHandle, VMContext, VMFunctionBody}; /// A WebAssembly function which can be called. /// diff --git a/crates/jit/src/lib.rs b/crates/jit/src/lib.rs index 3d7bba278503..0c56c58a6fc4 100644 --- a/crates/jit/src/lib.rs +++ b/crates/jit/src/lib.rs @@ -40,9 +40,5 @@ pub use crate::link::link_module; pub use crate::resolver::{NullResolver, Resolver}; pub use crate::target_tunables::target_tunables; -// Re-export `InstanceHandle` so that users won't need to separately depend on -// wasmtime-runtime in common cases. -pub use wasmtime_runtime::{InstanceHandle, InstantiationError}; - /// Version number of this crate. pub const VERSION: &str = env!("CARGO_PKG_VERSION");