diff --git a/build/spectests.rs b/build/spectests.rs index 66274d9fb56..55f41df4673 100644 --- a/build/spectests.rs +++ b/build/spectests.rs @@ -205,7 +205,7 @@ impl WastTestGenerator { )] use wabt::wat2wasm; -use crate::webassembly::{{instantiate, compile, ImportObject, ResultObject, Instance}}; +use crate::webassembly::{{instantiate, compile, ResultObject}}; use crate::runtime::types::{{Value}}; use super::_common::{{ diff --git a/emtests/localtime.output b/emtests/localtime.out similarity index 100% rename from emtests/localtime.output rename to emtests/localtime.out diff --git a/src/emtests/_common.rs b/src/emtests/_common.rs index f69b299e5ec..a5c3ce1476c 100644 --- a/src/emtests/_common.rs +++ b/src/emtests/_common.rs @@ -3,10 +3,8 @@ macro_rules! assert_emscripten_output { use crate::apis::generate_emscripten_env; use crate::common::stdio::StdioCapturer; use crate::runtime::types::{ElementType, FuncSig, Table, Type, Value}; - use crate::runtime::{Import, Imports}; - use crate::webassembly::{ - get_isa, instantiate, start_instance, InstanceABI, InstanceOptions, - }; + use crate::runtime::{Import, Imports, InstanceABI, InstanceOptions}; + use crate::webassembly::{get_isa, instantiate, start_instance}; use std::sync::Arc; let wasm_bytes = include_bytes!($file); diff --git a/src/emtests/localtime.rs b/src/emtests/localtime.rs index 6ee4ad4069a..938c8b1591b 100644 --- a/src/emtests/localtime.rs +++ b/src/emtests/localtime.rs @@ -4,6 +4,6 @@ fn test_localtime() { "../../emtests/localtime.wasm", "localtime", vec![], - "../../emtests/localtime.output" + "../../emtests/localtime.out" ); } diff --git a/src/spectests/_common.rs b/src/spectests/_common.rs index 8e1c7e3fe5b..d2424a3bbac 100644 --- a/src/spectests/_common.rs +++ b/src/spectests/_common.rs @@ -1,6 +1,5 @@ use crate::runtime::types::{ElementType, FuncSig, Table, Type, Value}; use crate::runtime::{Import, Imports, TableBacking}; -use crate::webassembly::{ImportObject, ImportValue}; use std::sync::Arc; extern "C" fn print_i32(num: i32) { diff --git a/src/spectests/address.rs b/src/spectests/address.rs index 08c6607adcc..5c907cf1f0c 100644 --- a/src/spectests/address.rs +++ b/src/spectests/address.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/align.rs b/src/spectests/align.rs index 0443824db00..59596d4cb57 100644 --- a/src/spectests/align.rs +++ b/src/spectests/align.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/binary.rs b/src/spectests/binary.rs index 8342ae1bd0b..09411e1343d 100644 --- a/src/spectests/binary.rs +++ b/src/spectests/binary.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/block.rs b/src/spectests/block.rs index df91a5264c2..7e2911a3fcf 100644 --- a/src/spectests/block.rs +++ b/src/spectests/block.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/br.rs b/src/spectests/br.rs index 7be6e150855..f4188569278 100644 --- a/src/spectests/br.rs +++ b/src/spectests/br.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/br_if.rs b/src/spectests/br_if.rs index 0fffab1aa5f..d05d49c85d7 100644 --- a/src/spectests/br_if.rs +++ b/src/spectests/br_if.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/br_table.rs b/src/spectests/br_table.rs index 1e9e11ec35d..d680f8025c3 100644 --- a/src/spectests/br_table.rs +++ b/src/spectests/br_table.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/break_drop.rs b/src/spectests/break_drop.rs index 9dbe553028e..b59eb0f389d 100644 --- a/src/spectests/break_drop.rs +++ b/src/spectests/break_drop.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/call.rs b/src/spectests/call.rs index 44bb1912e75..5bc64d9bdff 100644 --- a/src/spectests/call.rs +++ b/src/spectests/call.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/call_indirect.rs b/src/spectests/call_indirect.rs index 5a762a38a7f..5873f5ce45c 100644 --- a/src/spectests/call_indirect.rs +++ b/src/spectests/call_indirect.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/comments.rs b/src/spectests/comments.rs index 3584b594425..cd71374d59b 100644 --- a/src/spectests/comments.rs +++ b/src/spectests/comments.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/const_.rs b/src/spectests/const_.rs index 14e75ddf75e..10675bb28af 100644 --- a/src/spectests/const_.rs +++ b/src/spectests/const_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/conversions.rs b/src/spectests/conversions.rs index aca69c6f355..a5e97943efe 100644 --- a/src/spectests/conversions.rs +++ b/src/spectests/conversions.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/custom.rs b/src/spectests/custom.rs index eaf098c9833..621cd4d254e 100644 --- a/src/spectests/custom.rs +++ b/src/spectests/custom.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/data.rs b/src/spectests/data.rs index c3a99f09cfb..8ba17cf8800 100644 --- a/src/spectests/data.rs +++ b/src/spectests/data.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/elem.rs b/src/spectests/elem.rs index 2e6b3892185..99b102af929 100644 --- a/src/spectests/elem.rs +++ b/src/spectests/elem.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/endianness.rs b/src/spectests/endianness.rs index c73fd74123a..98831ac77b3 100644 --- a/src/spectests/endianness.rs +++ b/src/spectests/endianness.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/exports.rs b/src/spectests/exports.rs index d171f2e3099..2fbe40f851f 100644 --- a/src/spectests/exports.rs +++ b/src/spectests/exports.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/f32_.rs b/src/spectests/f32_.rs index 9897c03ccc4..17e73f7b2bd 100644 --- a/src/spectests/f32_.rs +++ b/src/spectests/f32_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/f32_bitwise.rs b/src/spectests/f32_bitwise.rs index 7944a52cfec..a5a416774c0 100644 --- a/src/spectests/f32_bitwise.rs +++ b/src/spectests/f32_bitwise.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/f32_cmp.rs b/src/spectests/f32_cmp.rs index 4edeb613b2f..05e9efb5388 100644 --- a/src/spectests/f32_cmp.rs +++ b/src/spectests/f32_cmp.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/f64_.rs b/src/spectests/f64_.rs index a7969accf53..e9bff92570b 100644 --- a/src/spectests/f64_.rs +++ b/src/spectests/f64_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/f64_bitwise.rs b/src/spectests/f64_bitwise.rs index 1ed4cc6dba4..31e0d64663b 100644 --- a/src/spectests/f64_bitwise.rs +++ b/src/spectests/f64_bitwise.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/f64_cmp.rs b/src/spectests/f64_cmp.rs index ce26c5389dc..c9ea11ff1d9 100644 --- a/src/spectests/f64_cmp.rs +++ b/src/spectests/f64_cmp.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/fac.rs b/src/spectests/fac.rs index d1a71d6181a..4c0ae9bd36b 100644 --- a/src/spectests/fac.rs +++ b/src/spectests/fac.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/float_exprs.rs b/src/spectests/float_exprs.rs index 19f7583b9c8..d0c0f498d1d 100644 --- a/src/spectests/float_exprs.rs +++ b/src/spectests/float_exprs.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/float_literals.rs b/src/spectests/float_literals.rs index 3da707fdb23..73ada71ea7d 100644 --- a/src/spectests/float_literals.rs +++ b/src/spectests/float_literals.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/float_memory.rs b/src/spectests/float_memory.rs index 997c48cfe4a..bf40c1bc5eb 100644 --- a/src/spectests/float_memory.rs +++ b/src/spectests/float_memory.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/float_misc.rs b/src/spectests/float_misc.rs index ea04c6217c1..b6c01427b15 100644 --- a/src/spectests/float_misc.rs +++ b/src/spectests/float_misc.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/forward.rs b/src/spectests/forward.rs index 365053a87f1..0d657df8edb 100644 --- a/src/spectests/forward.rs +++ b/src/spectests/forward.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/func.rs b/src/spectests/func.rs index 62c8dabdec9..2a6158753d5 100644 --- a/src/spectests/func.rs +++ b/src/spectests/func.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/func_ptrs.rs b/src/spectests/func_ptrs.rs index 88dc707ce8c..e427160e73b 100644 --- a/src/spectests/func_ptrs.rs +++ b/src/spectests/func_ptrs.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/get_local.rs b/src/spectests/get_local.rs index 089761c690c..0b944a34db7 100644 --- a/src/spectests/get_local.rs +++ b/src/spectests/get_local.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/globals.rs b/src/spectests/globals.rs index f1a72229fb1..16769f4daad 100644 --- a/src/spectests/globals.rs +++ b/src/spectests/globals.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/i32_.rs b/src/spectests/i32_.rs index bbf3ec18f63..a3f42d683a3 100644 --- a/src/spectests/i32_.rs +++ b/src/spectests/i32_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/i64_.rs b/src/spectests/i64_.rs index ad35f3df7ed..bd8db84b614 100644 --- a/src/spectests/i64_.rs +++ b/src/spectests/i64_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/if_.rs b/src/spectests/if_.rs index d39b62aadcb..5774030fa68 100644 --- a/src/spectests/if_.rs +++ b/src/spectests/if_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/int_exprs.rs b/src/spectests/int_exprs.rs index e965ca61eb9..e342980d5d9 100644 --- a/src/spectests/int_exprs.rs +++ b/src/spectests/int_exprs.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/int_literals.rs b/src/spectests/int_literals.rs index d1f3b200d11..d4493b8e11d 100644 --- a/src/spectests/int_literals.rs +++ b/src/spectests/int_literals.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/labels.rs b/src/spectests/labels.rs index 0be51a9890f..39df40d684f 100644 --- a/src/spectests/labels.rs +++ b/src/spectests/labels.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/left_to_right.rs b/src/spectests/left_to_right.rs index d3c74e0871b..6a9ecb35d5b 100644 --- a/src/spectests/left_to_right.rs +++ b/src/spectests/left_to_right.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/loop_.rs b/src/spectests/loop_.rs index aa2243310ec..910f83172a8 100644 --- a/src/spectests/loop_.rs +++ b/src/spectests/loop_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/memory.rs b/src/spectests/memory.rs index 114ffc5220f..5e818bf53c8 100644 --- a/src/spectests/memory.rs +++ b/src/spectests/memory.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/memory_grow.rs b/src/spectests/memory_grow.rs index 211565b5424..0a4e33cf418 100644 --- a/src/spectests/memory_grow.rs +++ b/src/spectests/memory_grow.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/memory_redundancy.rs b/src/spectests/memory_redundancy.rs index 1cebc84bfbe..dd6545d0538 100644 --- a/src/spectests/memory_redundancy.rs +++ b/src/spectests/memory_redundancy.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/memory_trap.rs b/src/spectests/memory_trap.rs index d302383f631..7f5e85a9b2c 100644 --- a/src/spectests/memory_trap.rs +++ b/src/spectests/memory_trap.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/nop.rs b/src/spectests/nop.rs index d49e47ea7c0..63378f86fb5 100644 --- a/src/spectests/nop.rs +++ b/src/spectests/nop.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/return_.rs b/src/spectests/return_.rs index ebdc5026e16..72177c2122c 100644 --- a/src/spectests/return_.rs +++ b/src/spectests/return_.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/select.rs b/src/spectests/select.rs index 4f8fbfc9fe9..288cc1b1a3f 100644 --- a/src/spectests/select.rs +++ b/src/spectests/select.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/set_local.rs b/src/spectests/set_local.rs index 72736b2afe1..2751fd4b673 100644 --- a/src/spectests/set_local.rs +++ b/src/spectests/set_local.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/stack.rs b/src/spectests/stack.rs index 152ab950ffd..6b59a6bdacc 100644 --- a/src/spectests/stack.rs +++ b/src/spectests/stack.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/start.rs b/src/spectests/start.rs index 4ce8f0349a9..5cd4f579db3 100644 --- a/src/spectests/start.rs +++ b/src/spectests/start.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/store_retval.rs b/src/spectests/store_retval.rs index 969b456af5e..9cbdb27bdc0 100644 --- a/src/spectests/store_retval.rs +++ b/src/spectests/store_retval.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/switch.rs b/src/spectests/switch.rs index 3850b897416..47bc0e39cba 100644 --- a/src/spectests/switch.rs +++ b/src/spectests/switch.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/tee_local.rs b/src/spectests/tee_local.rs index 96ef429888d..e1feeef06c9 100644 --- a/src/spectests/tee_local.rs +++ b/src/spectests/tee_local.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/token.rs b/src/spectests/token.rs index 5650a446496..6d79c63a694 100644 --- a/src/spectests/token.rs +++ b/src/spectests/token.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/traps.rs b/src/spectests/traps.rs index 899feee39df..5e748734464 100644 --- a/src/spectests/traps.rs +++ b/src/spectests/traps.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/typecheck.rs b/src/spectests/typecheck.rs index 07f0f9de690..7a2b7b464ff 100644 --- a/src/spectests/typecheck.rs +++ b/src/spectests/typecheck.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/types.rs b/src/spectests/types.rs index 18a6a734042..006118110dd 100644 --- a/src/spectests/types.rs +++ b/src/spectests/types.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck}; diff --git a/src/spectests/unwind.rs b/src/spectests/unwind.rs index 0446ea36356..73bbce1d7ca 100644 --- a/src/spectests/unwind.rs +++ b/src/spectests/unwind.rs @@ -8,7 +8,7 @@ use wabt::wat2wasm; use crate::runtime::types::Value; -use crate::webassembly::{compile, instantiate, ImportObject, Instance, ResultObject}; +use crate::webassembly::{compile, instantiate, ResultObject}; use super::_common::{spectest_importobject, NaNCheck};