fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-23 05:31:32 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Enderlin
2020-04-09 10:54:09 +02:00
parent f955617d17
commit e4b05d0b00
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/interface-types/src/interpreter/instructions/call_core.rs
View File

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

7
lib/interface-types/src/interpreter/instructions/records.rs
View File

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

5
lib/interface-types/src/interpreter/wasm/structures.rs
View File

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

2
lib/interface-types/src/interpreter/wasm/values.rs
View File

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

14
lib/interface-types/src/macros.rs
View File

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