fix imports

This commit is contained in:
vms 2021-05-10 13:57:10 +03:00
parent 164d40fa81
commit 7f45bfadba
4 changed files with 7 additions and 7 deletions

View File

@ -80,7 +80,7 @@ pub fn marine(_attr: TokenStream, input: TokenStream) -> TokenStream {
// deprecated macro for backwards compatibility // deprecated macro for backwards compatibility
#[deprecated(since = "0.6.2", note = "please use the #[marine] macro instead")] #[deprecated(since = "0.6.2", note = "please use the #[marine] macro instead")]
#[proc_macro_attribute] #[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 // into converts proc_macro::TokenStream to proc_macro2::TokenStream
match marine_impl(input.into()) { match marine_impl(input.into()) {
Ok(v) => v, Ok(v) => v,

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
use marine_it_parser::WITParserError; use marine_it_parser::ITParserError;
use fluence_app_service::AppServiceError; use fluence_app_service::AppServiceError;
use darling::Error as DarlingError; use darling::Error as DarlingError;
@ -26,7 +26,7 @@ use std::path::PathBuf;
#[derive(Debug, ThisError)] #[derive(Debug, ThisError)]
pub enum TestGeneratorError { pub enum TestGeneratorError {
#[error("Can't load Wasm modules into Marine: {0}")] #[error("Can't load Wasm modules into Marine: {0}")]
WITParserError(#[from] WITParserError), ITParserError(#[from] ITParserError),
#[error("{0}")] #[error("{0}")]
CorruptedITSection(#[from] CorruptedITSection), CorruptedITSection(#[from] CorruptedITSection),

View File

@ -18,18 +18,18 @@ use crate::TResult;
use fluence_app_service::TomlAppServiceConfig; use fluence_app_service::TomlAppServiceConfig;
use marine_it_parser::module_raw_interface; use marine_it_parser::module_raw_interface;
use marine_it_parser::interface::FCEModuleInterface; use marine_it_parser::interface::MModuleInterface;
use std::path::PathBuf; use std::path::PathBuf;
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub(super) struct Module<'m> { pub(super) struct Module<'m> {
pub name: &'m str, pub name: &'m str,
pub interface: FCEModuleInterface, pub interface: MModuleInterface,
} }
impl<'m> Module<'m> { impl<'m> Module<'m> {
fn new(name: &'m str, interface: FCEModuleInterface) -> Self { fn new(name: &'m str, interface: MModuleInterface) -> Self {
Self { name, interface } Self { name, interface }
} }
} }

View File

@ -75,7 +75,7 @@ mod mounted_binary;
extern crate self as fluence; extern crate self as fluence;
pub use marine_macro::marine; pub use marine_macro::marine;
pub use marine_macro::marine; pub use marine_macro::fce;
pub use call_parameters::CallParameters; pub use call_parameters::CallParameters;
pub use call_parameters::SecurityTetraplet; pub use call_parameters::SecurityTetraplet;