feat(interface-types) Remove the re-export of InterfaceType in values.

This commit is contained in:
Ivan Enderlin 2020-04-09 10:54:09 +02:00
parent 0f1ddce3c9
commit de1d3c7766
5 changed files with 28 additions and 24 deletions

View File

@ -1,10 +1,8 @@
use crate::{
errors::{InstructionError, InstructionErrorKind},
interpreter::wasm::{
structures::{FunctionIndex, TypedIndex},
values::InterfaceType,
},
interpreter::wasm::structures::{FunctionIndex, TypedIndex},
interpreter::Instruction,
types::InterfaceType,
};
executable_instruction!(

View File

@ -172,11 +172,14 @@ mod tests {
#[test]
#[allow(non_snake_case, unused)]
fn test_record_lift__to_rust_struct() {
use crate::interpreter::{
instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
stack::Stackable,
wasm::values::{from_interface_values, InterfaceType, InterfaceValue},
Instruction, Interpreter,
use crate::{
interpreter::{
instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
stack::Stackable,
wasm::values::{from_interface_values, InterfaceValue},
Instruction, Interpreter,
},
types::InterfaceType,
};
use serde::Deserialize;
use std::{cell::Cell, collections::HashMap, convert::TryInto};

View File

@ -1,9 +1,6 @@
#![allow(missing_docs)]
use crate::{
ast,
interpreter::wasm::values::{InterfaceType, InterfaceValue},
};
use crate::{ast, interpreter::wasm::values::InterfaceValue, types::InterfaceType};
use std::{cell::Cell, ops::Deref};
pub trait TypedIndex: Copy + Clone {

View File

@ -1,6 +1,6 @@
//! Defines WIT values and associated operations.
pub use crate::types::{InterfaceType, RecordType};
use crate::types::{InterfaceType, RecordType};
use crate::{errors::WasmValueNativeCastError, vec1::Vec1};
use std::{convert::TryFrom, slice::Iter};

View File

@ -96,11 +96,14 @@ macro_rules! test_executable_instruction {
#[test]
#[allow(non_snake_case, unused)]
fn $test_name() {
use crate::interpreter::{
instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
stack::Stackable,
wasm::values::{InterfaceType, InterfaceValue},
Instruction, Interpreter,
use crate::{
interpreter::{
instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
stack::Stackable,
wasm::values::InterfaceValue,
Instruction, Interpreter,
},
types::InterfaceType,
};
use std::{cell::Cell, collections::HashMap, convert::TryInto};
@ -135,11 +138,14 @@ macro_rules! test_executable_instruction {
#[test]
#[allow(non_snake_case, unused)]
fn $test_name() {
use crate::interpreter::{
instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
stack::Stackable,
wasm::values::{InterfaceType, InterfaceValue},
Instruction, Interpreter,
use crate::{
interpreter::{
instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
stack::Stackable,
wasm::values::InterfaceValue,
Instruction, Interpreter,
},
types::InterfaceType,
};
use std::{cell::Cell, collections::HashMap, convert::TryInto};