From 7f45bfadba6516ba2b80dd76e06c09e27fb1c4ee Mon Sep 17 00:00:00 2001 From: vms Date: Mon, 10 May 2021 13:57:10 +0300 Subject: [PATCH] fix imports --- crates/marine-macro/src/lib.rs | 2 +- crates/marine-test-macro-impl/src/errors.rs | 4 ++-- .../marine-test-macro-impl/src/marine_test/config_utils.rs | 6 +++--- fluence/src/lib.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/marine-macro/src/lib.rs b/crates/marine-macro/src/lib.rs index 7fe5417..62b39af 100644 --- a/crates/marine-macro/src/lib.rs +++ b/crates/marine-macro/src/lib.rs @@ -80,7 +80,7 @@ pub fn marine(_attr: TokenStream, input: TokenStream) -> TokenStream { // deprecated macro for backwards compatibility #[deprecated(since = "0.6.2", note = "please use the #[marine] macro instead")] #[proc_macro_attribute] -pub fn marine(_attr: TokenStream, input: TokenStream) -> TokenStream { +pub fn fce(_attr: TokenStream, input: TokenStream) -> TokenStream { // into converts proc_macro::TokenStream to proc_macro2::TokenStream match marine_impl(input.into()) { Ok(v) => v, diff --git a/crates/marine-test-macro-impl/src/errors.rs b/crates/marine-test-macro-impl/src/errors.rs index e2e4309..72a0421 100644 --- a/crates/marine-test-macro-impl/src/errors.rs +++ b/crates/marine-test-macro-impl/src/errors.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -use marine_it_parser::WITParserError; +use marine_it_parser::ITParserError; use fluence_app_service::AppServiceError; use darling::Error as DarlingError; @@ -26,7 +26,7 @@ use std::path::PathBuf; #[derive(Debug, ThisError)] pub enum TestGeneratorError { #[error("Can't load Wasm modules into Marine: {0}")] - WITParserError(#[from] WITParserError), + ITParserError(#[from] ITParserError), #[error("{0}")] CorruptedITSection(#[from] CorruptedITSection), diff --git a/crates/marine-test-macro-impl/src/marine_test/config_utils.rs b/crates/marine-test-macro-impl/src/marine_test/config_utils.rs index 2ffb8c1..87dd52a 100644 --- a/crates/marine-test-macro-impl/src/marine_test/config_utils.rs +++ b/crates/marine-test-macro-impl/src/marine_test/config_utils.rs @@ -18,18 +18,18 @@ use crate::TResult; use fluence_app_service::TomlAppServiceConfig; use marine_it_parser::module_raw_interface; -use marine_it_parser::interface::FCEModuleInterface; +use marine_it_parser::interface::MModuleInterface; use std::path::PathBuf; #[derive(Debug, Clone, PartialEq, Eq)] pub(super) struct Module<'m> { pub name: &'m str, - pub interface: FCEModuleInterface, + pub interface: MModuleInterface, } impl<'m> Module<'m> { - fn new(name: &'m str, interface: FCEModuleInterface) -> Self { + fn new(name: &'m str, interface: MModuleInterface) -> Self { Self { name, interface } } } diff --git a/fluence/src/lib.rs b/fluence/src/lib.rs index b95ca5e..b7ffe4d 100644 --- a/fluence/src/lib.rs +++ b/fluence/src/lib.rs @@ -75,7 +75,7 @@ mod mounted_binary; extern crate self as fluence; pub use marine_macro::marine; -pub use marine_macro::marine; +pub use marine_macro::fce; pub use call_parameters::CallParameters; pub use call_parameters::SecurityTetraplet;