From b9700ce81d31674152c534609c0e3f62e40aa98b Mon Sep 17 00:00:00 2001 From: vms Date: Sun, 8 Nov 2020 14:26:43 +0300 Subject: [PATCH] update --- .../src/instructions_generator.rs | 5 ++++- .../instructions_generator/fn_instructions.rs | 5 ++++- .../foreign_mod_instructions.rs | 5 ++++- .../record_instructions.rs | 5 ++++- engine/src/{module => block}/exports.rs | 0 engine/src/{module => block}/fce_module.rs | 4 +--- engine/src/{module => block}/memory.rs | 0 engine/src/{module => block}/mod.rs | 2 +- .../src/{module => block}/type_converters.rs | 0 engine/src/{module => block}/wit_function.rs | 0 engine/src/{module => block}/wit_instance.rs | 0 engine/src/engine.rs | 4 ++-- engine/src/lib.rs | 18 +++++++++--------- 13 files changed, 29 insertions(+), 19 deletions(-) rename engine/src/{module => block}/exports.rs (100%) rename engine/src/{module => block}/fce_module.rs (99%) rename engine/src/{module => block}/memory.rs (100%) rename engine/src/{module => block}/mod.rs (96%) rename engine/src/{module => block}/type_converters.rs (100%) rename engine/src/{module => block}/wit_function.rs (100%) rename engine/src/{module => block}/wit_instance.rs (100%) diff --git a/crates/wit-generator/src/instructions_generator.rs b/crates/wit-generator/src/instructions_generator.rs index 30598b24..56851538 100644 --- a/crates/wit-generator/src/instructions_generator.rs +++ b/crates/wit-generator/src/instructions_generator.rs @@ -225,5 +225,8 @@ impl<'a> WITResolver<'a> { } pub(crate) trait WITGenerator { - fn generate_wit<'ast_type, 'resolver>(&'ast_type self, wit_resolver: &'resolver mut WITResolver<'ast_type>) -> Result<()>; + fn generate_wit<'ast_type, 'resolver>( + &'ast_type self, + wit_resolver: &'resolver mut WITResolver<'ast_type>, + ) -> Result<()>; } diff --git a/crates/wit-generator/src/instructions_generator/fn_instructions.rs b/crates/wit-generator/src/instructions_generator/fn_instructions.rs index d8c8fdcd..ee0da5c4 100644 --- a/crates/wit-generator/src/instructions_generator/fn_instructions.rs +++ b/crates/wit-generator/src/instructions_generator/fn_instructions.rs @@ -27,7 +27,10 @@ use fluence_sdk_wit::ParsedType; use wasmer_wit::interpreter::Instruction; impl WITGenerator for AstFunctionItem { - fn generate_wit<'ast_type, 'resolver>(&'ast_type self, wit_resolver: &'resolver mut WITResolver<'ast_type>) -> Result<()> { + fn generate_wit<'ast_type, 'resolver>( + &'ast_type self, + wit_resolver: &'resolver mut WITResolver<'ast_type>, + ) -> Result<()> { let arguments = &self.signature.arguments; let output_type = &self.signature.output_type; diff --git a/crates/wit-generator/src/instructions_generator/foreign_mod_instructions.rs b/crates/wit-generator/src/instructions_generator/foreign_mod_instructions.rs index d574f518..b4084d6c 100644 --- a/crates/wit-generator/src/instructions_generator/foreign_mod_instructions.rs +++ b/crates/wit-generator/src/instructions_generator/foreign_mod_instructions.rs @@ -29,7 +29,10 @@ use wasmer_wit::interpreter::Instruction; const HOST_NAMESPACE_NAME: &str = "host"; impl WITGenerator for AstExternModItem { - fn generate_wit<'ast_type, 'resolver>(&'ast_type self, wit_resolver: &'resolver mut WITResolver<'ast_type>) -> Result<()> { + fn generate_wit<'ast_type, 'resolver>( + &'ast_type self, + wit_resolver: &'resolver mut WITResolver<'ast_type>, + ) -> Result<()> { // host imports should be left as is if self.namespace == HOST_NAMESPACE_NAME { return Ok(()); diff --git a/crates/wit-generator/src/instructions_generator/record_instructions.rs b/crates/wit-generator/src/instructions_generator/record_instructions.rs index 18f0c250..36db66fb 100644 --- a/crates/wit-generator/src/instructions_generator/record_instructions.rs +++ b/crates/wit-generator/src/instructions_generator/record_instructions.rs @@ -25,7 +25,10 @@ use wasmer_wit::types::RecordType; use wasmer_wit::vec1::Vec1; impl WITGenerator for AstRecordItem { - fn generate_wit<'ast_type, 'resolver>(&'ast_type self, wit_resolver: &'resolver mut WITResolver<'ast_type>) -> Result<()> { + fn generate_wit<'ast_type, 'resolver>( + &'ast_type self, + wit_resolver: &'resolver mut WITResolver<'ast_type>, + ) -> Result<()> { use super::utils::ptype_to_itype_unchecked; let fields = self diff --git a/engine/src/module/exports.rs b/engine/src/block/exports.rs similarity index 100% rename from engine/src/module/exports.rs rename to engine/src/block/exports.rs diff --git a/engine/src/module/fce_module.rs b/engine/src/block/fce_module.rs similarity index 99% rename from engine/src/module/fce_module.rs rename to engine/src/block/fce_module.rs index d88f8501..8ab55a5e 100644 --- a/engine/src/module/fce_module.rs +++ b/engine/src/block/fce_module.rs @@ -251,9 +251,7 @@ impl FCEModule { wit.implementations() .filter_map(|(adapter_function_id, core_function_id)| { match wit.exports_by_type(*core_function_id) { - Some(export_function_name) => { - Some((adapter_function_id, export_function_name)) - } + Some(export_function_name) => Some((adapter_function_id, export_function_name)), // pass functions that aren't export None => None, } diff --git a/engine/src/module/memory.rs b/engine/src/block/memory.rs similarity index 100% rename from engine/src/module/memory.rs rename to engine/src/block/memory.rs diff --git a/engine/src/module/mod.rs b/engine/src/block/mod.rs similarity index 96% rename from engine/src/module/mod.rs rename to engine/src/block/mod.rs index b23e37c5..71e7ad64 100644 --- a/engine/src/module/mod.rs +++ b/engine/src/block/mod.rs @@ -25,7 +25,7 @@ pub use wit_instance::RecordTypes; pub use wasmer_wit::types::InterfaceType as IType; pub use wasmer_wit::types::RecordType as IRecordType; -pub use wasmer_wit::ast::FunctionArg as IFunctionArg; +pub use wasmer_wit::types::FunctionArg as IFunctionArg; pub use wasmer_wit::values::InterfaceValue as IValue; pub use fce_module::FCEFunctionSignature; pub use wasmer_wit::values::from_interface_values; diff --git a/engine/src/module/type_converters.rs b/engine/src/block/type_converters.rs similarity index 100% rename from engine/src/module/type_converters.rs rename to engine/src/block/type_converters.rs diff --git a/engine/src/module/wit_function.rs b/engine/src/block/wit_function.rs similarity index 100% rename from engine/src/module/wit_function.rs rename to engine/src/block/wit_function.rs diff --git a/engine/src/module/wit_instance.rs b/engine/src/block/wit_instance.rs similarity index 100% rename from engine/src/module/wit_instance.rs rename to engine/src/block/wit_instance.rs diff --git a/engine/src/engine.rs b/engine/src/engine.rs index f9830825..f959d507 100644 --- a/engine/src/engine.rs +++ b/engine/src/engine.rs @@ -15,8 +15,8 @@ */ use super::*; -use crate::module::FCEModule; -use crate::module::RecordTypes; +use crate::block::FCEModule; +use crate::block::RecordTypes; use std::collections::hash_map::Entry; use std::collections::HashMap; diff --git a/engine/src/lib.rs b/engine/src/lib.rs index 7d71b00f..08a3e3c7 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -27,13 +27,21 @@ unreachable_patterns )] +mod block; mod config; mod engine; mod errors; mod host_imports; mod misc; -mod module; +pub use block::IValue; +pub use block::IRecordType; +pub use block::IFunctionArg; +pub use block::IType; +pub use block::RecordTypes; +pub use block::FCEFunctionSignature; +pub use block::from_interface_values; +pub use block::to_interface_value; pub use config::FCEModuleConfig; pub use config::HostExportedFunc; pub use config::HostImportDescriptor; @@ -41,14 +49,6 @@ pub use engine::FCE; pub use engine::FCEModuleInterface; pub use errors::FCEError; pub use host_imports::HostImportError; -pub use module::IValue; -pub use module::IRecordType; -pub use module::IFunctionArg; -pub use module::IType; -pub use module::RecordTypes; -pub use module::FCEFunctionSignature; -pub use module::from_interface_values; -pub use module::to_interface_value; pub use wasmer_wit::types::RecordFieldType as IRecordFieldType; pub mod vec1 {