From 7e786f47a74ec9ecd148033e48ddc3b7a722c139 Mon Sep 17 00:00:00 2001 From: vms Date: Mon, 10 May 2021 12:23:26 +0300 Subject: [PATCH] rename fce to marine --- Cargo.toml | 8 +++--- crates/main/Cargo.toml | 6 ++--- crates/{wit => marine-macro-impl}/Cargo.toml | 10 ++++---- .../src/ast_types.rs | 0 .../src/export_ast_types.rs | 0 .../src/fce_macro_impl.rs | 2 +- crates/{wit => marine-macro-impl}/src/lib.rs | 2 +- .../src/parse_macro_input.rs | 0 .../src/parse_macro_input/item_fn.rs | 0 .../src/parse_macro_input/item_foreign_mod.rs | 0 .../src/parse_macro_input/item_record.rs | 0 .../src/parse_macro_input/utils.rs | 0 .../src/parsed_type.rs | 0 .../src/parsed_type/fn_arg.rs | 0 .../src/parsed_type/fn_epilog.rs | 0 .../src/parsed_type/fn_prolog.rs | 0 .../src/parsed_type/foreign_mod_arg.rs | 0 .../src/parsed_type/foreign_mod_epilog.rs | 0 .../src/parsed_type/foreign_mod_prolog.rs | 0 .../src/parsed_type/traits.rs | 0 .../src/parsed_type/utils.rs | 0 .../src/parsed_type/vector_ser_der.rs | 0 .../src/parsed_type/vector_ser_der/der.rs | 0 .../src/parsed_type/vector_ser_der/ser.rs | 0 .../src/token_stream_generator.rs | 0 .../token_stream_generator/fn_generator.rs | 0 .../foreign_mod_generator.rs | 0 .../record_generator.rs | 0 .../record_generator/field_values_builder.rs | 0 .../record_generator/record_deserializer.rs | 0 .../record_generator/record_serializer.rs | 0 .../{wit => marine-macro-impl}/src/utils.rs | 0 .../src/wasm_type.rs | 0 .../exports/arrays/expanded.rs | 0 .../generation_tests/exports/arrays/fce.rs | 0 .../exports/basic_types/expanded.rs | 0 .../exports/basic_types/fce.rs | 0 .../generation_tests/exports/refs/expanded.rs | 0 .../generation_tests/exports/refs/fce.rs | 0 .../records/call_parameters/expanded.rs | 0 .../records/call_parameters/fce.rs | 0 .../records/use_as_type/expanded.rs | 0 .../records/use_as_type/fce.rs | 0 .../tests/generation_tests_runner.rs | 0 .../{wit => marine-macro-impl}/tests/utils.rs | 4 +-- crates/{fce-macro => marine-macro}/Cargo.toml | 10 ++++---- crates/{fce-macro => marine-macro}/src/lib.rs | 25 ++++++++++++++++--- .../Cargo.toml | 6 ++--- .../src/attributes.rs | 0 .../src/errors.rs | 0 .../src/fce_test/config_utils.rs | 0 .../src/fce_test/fce_test_impl.rs | 0 .../src/fce_test/glue_code_generator.rs | 0 .../src/fce_test/mod.rs | 0 .../src/fce_test/module_generator.rs | 0 .../module_generator/methods_generator.rs | 0 .../methods_generator_utils.rs | 0 .../module_generator/record_type_generator.rs | 0 .../src/fce_test/utils.rs | 0 .../src/lib.rs | 0 .../Cargo.toml | 6 ++--- .../src/lib.rs | 0 crates/timestamp-macro/Cargo.toml | 4 +-- fluence-test/Cargo.toml | 4 +-- fluence/Cargo.toml | 8 +++--- fluence/src/call_parameters.rs | 6 ++--- fluence/src/lib.rs | 5 ++-- fluence/src/mounted_binary.rs | 6 ++--- 68 files changed, 65 insertions(+), 47 deletions(-) rename crates/{wit => marine-macro-impl}/Cargo.toml (66%) rename crates/{wit => marine-macro-impl}/src/ast_types.rs (100%) rename crates/{wit => marine-macro-impl}/src/export_ast_types.rs (100%) rename crates/{wit => marine-macro-impl}/src/fce_macro_impl.rs (94%) rename crates/{wit => marine-macro-impl}/src/lib.rs (97%) rename crates/{wit => marine-macro-impl}/src/parse_macro_input.rs (100%) rename crates/{wit => marine-macro-impl}/src/parse_macro_input/item_fn.rs (100%) rename crates/{wit => marine-macro-impl}/src/parse_macro_input/item_foreign_mod.rs (100%) rename crates/{wit => marine-macro-impl}/src/parse_macro_input/item_record.rs (100%) rename crates/{wit => marine-macro-impl}/src/parse_macro_input/utils.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/fn_arg.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/fn_epilog.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/fn_prolog.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/foreign_mod_arg.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/foreign_mod_epilog.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/foreign_mod_prolog.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/traits.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/utils.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/vector_ser_der.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/vector_ser_der/der.rs (100%) rename crates/{wit => marine-macro-impl}/src/parsed_type/vector_ser_der/ser.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator/fn_generator.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator/foreign_mod_generator.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator/record_generator.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator/record_generator/field_values_builder.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator/record_generator/record_deserializer.rs (100%) rename crates/{wit => marine-macro-impl}/src/token_stream_generator/record_generator/record_serializer.rs (100%) rename crates/{wit => marine-macro-impl}/src/utils.rs (100%) rename crates/{wit => marine-macro-impl}/src/wasm_type.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/exports/arrays/expanded.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/exports/arrays/fce.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/exports/basic_types/expanded.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/exports/basic_types/fce.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/exports/refs/expanded.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/exports/refs/fce.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/records/call_parameters/expanded.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/records/call_parameters/fce.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/records/use_as_type/expanded.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests/records/use_as_type/fce.rs (100%) rename crates/{wit => marine-macro-impl}/tests/generation_tests_runner.rs (100%) rename crates/{wit => marine-macro-impl}/tests/utils.rs (95%) rename crates/{fce-macro => marine-macro}/Cargo.toml (57%) rename crates/{fce-macro => marine-macro}/src/lib.rs (77%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/Cargo.toml (77%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/attributes.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/errors.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/config_utils.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/fce_test_impl.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/glue_code_generator.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/mod.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/module_generator.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/module_generator/methods_generator.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/module_generator/methods_generator_utils.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/module_generator/record_type_generator.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/fce_test/utils.rs (100%) rename crates/{fce-test-macro-impl => marine-test-macro-impl}/src/lib.rs (100%) rename crates/{fce-test-macro => marine-test-macro}/Cargo.toml (76%) rename crates/{fce-test-macro => marine-test-macro}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 78a194c..60a67a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] members = [ - "crates/fce-macro", - "crates/fce-test-macro", - "crates/fce-test-macro-impl", "crates/main", + "crates/marine-macro", + "crates/marine-macro-impl", + "crates/marine-test-macro", + "crates/marine-test-macro-impl", "crates/timestamp-macro", - "crates/wit", "fluence", "fluence-test" ] diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml index e75d7d4..f3636ad 100644 --- a/crates/main/Cargo.toml +++ b/crates/main/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "fluence-sdk-main" -version = "0.6.1" # remember to update html_root_url +version = "0.6.2" # remember to update html_root_url edition = "2018" description = "Rust SDK for applications for the Fluence network" -documentation = "https://docs.rs/fluence/fluence-sdk-macro" +documentation = "https://docs.rs/fluence/marine-macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/main" authors = ["Fluence Labs"] keywords = ["fluence", "sdk", "webassembly"] @@ -19,7 +19,7 @@ crate-type = ["rlib"] doctest = false [dependencies] -fluence-sdk-macro = { path = "../fce-macro", version = "=0.6.1" } +marine-macro = { path = "../marine-macro", version = "=0.6.2" } log = { version = "0.4.8", features = ["std"] } serde = "=1.0.118" diff --git a/crates/wit/Cargo.toml b/crates/marine-macro-impl/Cargo.toml similarity index 66% rename from crates/wit/Cargo.toml rename to crates/marine-macro-impl/Cargo.toml index 7399cb2..e1e3693 100644 --- a/crates/wit/Cargo.toml +++ b/crates/marine-macro-impl/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "fluence-sdk-wit" -version = "0.6.1" # remember to update html_root_url +name = "marine-macro-impl" +version = "0.6.2" # remember to update html_root_url edition = "2018" -description = "Webassembly interface-types generator" -documentation = "https://docs.rs/fluence/fluence-sdk-macro" +description = "Implementation of the `#[marine]` macro" +documentation = "https://docs.rs/fluence/marine-macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro" authors = ["Fluence Labs"] -keywords = ["fluence", "sdk", "webassembly", "wit", "interface-types"] +keywords = ["fluence", "sdk", "webassembly", "it", "interface-types"] categories = ["api-bindings", "wasm"] license = "Apache-2.0" diff --git a/crates/wit/src/ast_types.rs b/crates/marine-macro-impl/src/ast_types.rs similarity index 100% rename from crates/wit/src/ast_types.rs rename to crates/marine-macro-impl/src/ast_types.rs diff --git a/crates/wit/src/export_ast_types.rs b/crates/marine-macro-impl/src/export_ast_types.rs similarity index 100% rename from crates/wit/src/export_ast_types.rs rename to crates/marine-macro-impl/src/export_ast_types.rs diff --git a/crates/wit/src/fce_macro_impl.rs b/crates/marine-macro-impl/src/fce_macro_impl.rs similarity index 94% rename from crates/wit/src/fce_macro_impl.rs rename to crates/marine-macro-impl/src/fce_macro_impl.rs index 9b69006..aae28ec 100644 --- a/crates/wit/src/fce_macro_impl.rs +++ b/crates/marine-macro-impl/src/fce_macro_impl.rs @@ -20,7 +20,7 @@ use proc_macro2::TokenStream; use quote::ToTokens; use syn::Result; -pub fn fce(tokens: TokenStream) -> Result { +pub fn marine(tokens: TokenStream) -> Result { let item = syn::parse2::(tokens)?; // convert proc_macro2 token to internal AST type let fce_ast_item = item.parse_macro_input()?; diff --git a/crates/wit/src/lib.rs b/crates/marine-macro-impl/src/lib.rs similarity index 97% rename from crates/wit/src/lib.rs rename to crates/marine-macro-impl/src/lib.rs index 0d17a84..5e8f4e6 100644 --- a/crates/wit/src/lib.rs +++ b/crates/marine-macro-impl/src/lib.rs @@ -40,7 +40,7 @@ mod utils; mod wasm_type; pub use export_ast_types::*; -pub use fce_macro_impl::fce; +pub use fce_macro_impl::marine; pub use parsed_type::ParsedType; pub use token_stream_generator::GENERATED_WRAPPER_FUNC_PREFIX; pub use token_stream_generator::GENERATED_SECTION_PREFIX; diff --git a/crates/wit/src/parse_macro_input.rs b/crates/marine-macro-impl/src/parse_macro_input.rs similarity index 100% rename from crates/wit/src/parse_macro_input.rs rename to crates/marine-macro-impl/src/parse_macro_input.rs diff --git a/crates/wit/src/parse_macro_input/item_fn.rs b/crates/marine-macro-impl/src/parse_macro_input/item_fn.rs similarity index 100% rename from crates/wit/src/parse_macro_input/item_fn.rs rename to crates/marine-macro-impl/src/parse_macro_input/item_fn.rs diff --git a/crates/wit/src/parse_macro_input/item_foreign_mod.rs b/crates/marine-macro-impl/src/parse_macro_input/item_foreign_mod.rs similarity index 100% rename from crates/wit/src/parse_macro_input/item_foreign_mod.rs rename to crates/marine-macro-impl/src/parse_macro_input/item_foreign_mod.rs diff --git a/crates/wit/src/parse_macro_input/item_record.rs b/crates/marine-macro-impl/src/parse_macro_input/item_record.rs similarity index 100% rename from crates/wit/src/parse_macro_input/item_record.rs rename to crates/marine-macro-impl/src/parse_macro_input/item_record.rs diff --git a/crates/wit/src/parse_macro_input/utils.rs b/crates/marine-macro-impl/src/parse_macro_input/utils.rs similarity index 100% rename from crates/wit/src/parse_macro_input/utils.rs rename to crates/marine-macro-impl/src/parse_macro_input/utils.rs diff --git a/crates/wit/src/parsed_type.rs b/crates/marine-macro-impl/src/parsed_type.rs similarity index 100% rename from crates/wit/src/parsed_type.rs rename to crates/marine-macro-impl/src/parsed_type.rs diff --git a/crates/wit/src/parsed_type/fn_arg.rs b/crates/marine-macro-impl/src/parsed_type/fn_arg.rs similarity index 100% rename from crates/wit/src/parsed_type/fn_arg.rs rename to crates/marine-macro-impl/src/parsed_type/fn_arg.rs diff --git a/crates/wit/src/parsed_type/fn_epilog.rs b/crates/marine-macro-impl/src/parsed_type/fn_epilog.rs similarity index 100% rename from crates/wit/src/parsed_type/fn_epilog.rs rename to crates/marine-macro-impl/src/parsed_type/fn_epilog.rs diff --git a/crates/wit/src/parsed_type/fn_prolog.rs b/crates/marine-macro-impl/src/parsed_type/fn_prolog.rs similarity index 100% rename from crates/wit/src/parsed_type/fn_prolog.rs rename to crates/marine-macro-impl/src/parsed_type/fn_prolog.rs diff --git a/crates/wit/src/parsed_type/foreign_mod_arg.rs b/crates/marine-macro-impl/src/parsed_type/foreign_mod_arg.rs similarity index 100% rename from crates/wit/src/parsed_type/foreign_mod_arg.rs rename to crates/marine-macro-impl/src/parsed_type/foreign_mod_arg.rs diff --git a/crates/wit/src/parsed_type/foreign_mod_epilog.rs b/crates/marine-macro-impl/src/parsed_type/foreign_mod_epilog.rs similarity index 100% rename from crates/wit/src/parsed_type/foreign_mod_epilog.rs rename to crates/marine-macro-impl/src/parsed_type/foreign_mod_epilog.rs diff --git a/crates/wit/src/parsed_type/foreign_mod_prolog.rs b/crates/marine-macro-impl/src/parsed_type/foreign_mod_prolog.rs similarity index 100% rename from crates/wit/src/parsed_type/foreign_mod_prolog.rs rename to crates/marine-macro-impl/src/parsed_type/foreign_mod_prolog.rs diff --git a/crates/wit/src/parsed_type/traits.rs b/crates/marine-macro-impl/src/parsed_type/traits.rs similarity index 100% rename from crates/wit/src/parsed_type/traits.rs rename to crates/marine-macro-impl/src/parsed_type/traits.rs diff --git a/crates/wit/src/parsed_type/utils.rs b/crates/marine-macro-impl/src/parsed_type/utils.rs similarity index 100% rename from crates/wit/src/parsed_type/utils.rs rename to crates/marine-macro-impl/src/parsed_type/utils.rs diff --git a/crates/wit/src/parsed_type/vector_ser_der.rs b/crates/marine-macro-impl/src/parsed_type/vector_ser_der.rs similarity index 100% rename from crates/wit/src/parsed_type/vector_ser_der.rs rename to crates/marine-macro-impl/src/parsed_type/vector_ser_der.rs diff --git a/crates/wit/src/parsed_type/vector_ser_der/der.rs b/crates/marine-macro-impl/src/parsed_type/vector_ser_der/der.rs similarity index 100% rename from crates/wit/src/parsed_type/vector_ser_der/der.rs rename to crates/marine-macro-impl/src/parsed_type/vector_ser_der/der.rs diff --git a/crates/wit/src/parsed_type/vector_ser_der/ser.rs b/crates/marine-macro-impl/src/parsed_type/vector_ser_der/ser.rs similarity index 100% rename from crates/wit/src/parsed_type/vector_ser_der/ser.rs rename to crates/marine-macro-impl/src/parsed_type/vector_ser_der/ser.rs diff --git a/crates/wit/src/token_stream_generator.rs b/crates/marine-macro-impl/src/token_stream_generator.rs similarity index 100% rename from crates/wit/src/token_stream_generator.rs rename to crates/marine-macro-impl/src/token_stream_generator.rs diff --git a/crates/wit/src/token_stream_generator/fn_generator.rs b/crates/marine-macro-impl/src/token_stream_generator/fn_generator.rs similarity index 100% rename from crates/wit/src/token_stream_generator/fn_generator.rs rename to crates/marine-macro-impl/src/token_stream_generator/fn_generator.rs diff --git a/crates/wit/src/token_stream_generator/foreign_mod_generator.rs b/crates/marine-macro-impl/src/token_stream_generator/foreign_mod_generator.rs similarity index 100% rename from crates/wit/src/token_stream_generator/foreign_mod_generator.rs rename to crates/marine-macro-impl/src/token_stream_generator/foreign_mod_generator.rs diff --git a/crates/wit/src/token_stream_generator/record_generator.rs b/crates/marine-macro-impl/src/token_stream_generator/record_generator.rs similarity index 100% rename from crates/wit/src/token_stream_generator/record_generator.rs rename to crates/marine-macro-impl/src/token_stream_generator/record_generator.rs diff --git a/crates/wit/src/token_stream_generator/record_generator/field_values_builder.rs b/crates/marine-macro-impl/src/token_stream_generator/record_generator/field_values_builder.rs similarity index 100% rename from crates/wit/src/token_stream_generator/record_generator/field_values_builder.rs rename to crates/marine-macro-impl/src/token_stream_generator/record_generator/field_values_builder.rs diff --git a/crates/wit/src/token_stream_generator/record_generator/record_deserializer.rs b/crates/marine-macro-impl/src/token_stream_generator/record_generator/record_deserializer.rs similarity index 100% rename from crates/wit/src/token_stream_generator/record_generator/record_deserializer.rs rename to crates/marine-macro-impl/src/token_stream_generator/record_generator/record_deserializer.rs diff --git a/crates/wit/src/token_stream_generator/record_generator/record_serializer.rs b/crates/marine-macro-impl/src/token_stream_generator/record_generator/record_serializer.rs similarity index 100% rename from crates/wit/src/token_stream_generator/record_generator/record_serializer.rs rename to crates/marine-macro-impl/src/token_stream_generator/record_generator/record_serializer.rs diff --git a/crates/wit/src/utils.rs b/crates/marine-macro-impl/src/utils.rs similarity index 100% rename from crates/wit/src/utils.rs rename to crates/marine-macro-impl/src/utils.rs diff --git a/crates/wit/src/wasm_type.rs b/crates/marine-macro-impl/src/wasm_type.rs similarity index 100% rename from crates/wit/src/wasm_type.rs rename to crates/marine-macro-impl/src/wasm_type.rs diff --git a/crates/wit/tests/generation_tests/exports/arrays/expanded.rs b/crates/marine-macro-impl/tests/generation_tests/exports/arrays/expanded.rs similarity index 100% rename from crates/wit/tests/generation_tests/exports/arrays/expanded.rs rename to crates/marine-macro-impl/tests/generation_tests/exports/arrays/expanded.rs diff --git a/crates/wit/tests/generation_tests/exports/arrays/fce.rs b/crates/marine-macro-impl/tests/generation_tests/exports/arrays/fce.rs similarity index 100% rename from crates/wit/tests/generation_tests/exports/arrays/fce.rs rename to crates/marine-macro-impl/tests/generation_tests/exports/arrays/fce.rs diff --git a/crates/wit/tests/generation_tests/exports/basic_types/expanded.rs b/crates/marine-macro-impl/tests/generation_tests/exports/basic_types/expanded.rs similarity index 100% rename from crates/wit/tests/generation_tests/exports/basic_types/expanded.rs rename to crates/marine-macro-impl/tests/generation_tests/exports/basic_types/expanded.rs diff --git a/crates/wit/tests/generation_tests/exports/basic_types/fce.rs b/crates/marine-macro-impl/tests/generation_tests/exports/basic_types/fce.rs similarity index 100% rename from crates/wit/tests/generation_tests/exports/basic_types/fce.rs rename to crates/marine-macro-impl/tests/generation_tests/exports/basic_types/fce.rs diff --git a/crates/wit/tests/generation_tests/exports/refs/expanded.rs b/crates/marine-macro-impl/tests/generation_tests/exports/refs/expanded.rs similarity index 100% rename from crates/wit/tests/generation_tests/exports/refs/expanded.rs rename to crates/marine-macro-impl/tests/generation_tests/exports/refs/expanded.rs diff --git a/crates/wit/tests/generation_tests/exports/refs/fce.rs b/crates/marine-macro-impl/tests/generation_tests/exports/refs/fce.rs similarity index 100% rename from crates/wit/tests/generation_tests/exports/refs/fce.rs rename to crates/marine-macro-impl/tests/generation_tests/exports/refs/fce.rs diff --git a/crates/wit/tests/generation_tests/records/call_parameters/expanded.rs b/crates/marine-macro-impl/tests/generation_tests/records/call_parameters/expanded.rs similarity index 100% rename from crates/wit/tests/generation_tests/records/call_parameters/expanded.rs rename to crates/marine-macro-impl/tests/generation_tests/records/call_parameters/expanded.rs diff --git a/crates/wit/tests/generation_tests/records/call_parameters/fce.rs b/crates/marine-macro-impl/tests/generation_tests/records/call_parameters/fce.rs similarity index 100% rename from crates/wit/tests/generation_tests/records/call_parameters/fce.rs rename to crates/marine-macro-impl/tests/generation_tests/records/call_parameters/fce.rs diff --git a/crates/wit/tests/generation_tests/records/use_as_type/expanded.rs b/crates/marine-macro-impl/tests/generation_tests/records/use_as_type/expanded.rs similarity index 100% rename from crates/wit/tests/generation_tests/records/use_as_type/expanded.rs rename to crates/marine-macro-impl/tests/generation_tests/records/use_as_type/expanded.rs diff --git a/crates/wit/tests/generation_tests/records/use_as_type/fce.rs b/crates/marine-macro-impl/tests/generation_tests/records/use_as_type/fce.rs similarity index 100% rename from crates/wit/tests/generation_tests/records/use_as_type/fce.rs rename to crates/marine-macro-impl/tests/generation_tests/records/use_as_type/fce.rs diff --git a/crates/wit/tests/generation_tests_runner.rs b/crates/marine-macro-impl/tests/generation_tests_runner.rs similarity index 100% rename from crates/wit/tests/generation_tests_runner.rs rename to crates/marine-macro-impl/tests/generation_tests_runner.rs diff --git a/crates/wit/tests/utils.rs b/crates/marine-macro-impl/tests/utils.rs similarity index 95% rename from crates/wit/tests/utils.rs rename to crates/marine-macro-impl/tests/utils.rs index d5ed28d..0e8241a 100644 --- a/crates/wit/tests/utils.rs +++ b/crates/marine-macro-impl/tests/utils.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -use fluence_sdk_wit::fce; +use marine_macro_impl::marine; use pretty_assertions::assert_eq; @@ -28,7 +28,7 @@ where { let fce_item = stream_from_file(fce_path); let test_token_stream = quote::quote! { #fce_item }; - let fce_token_streams = fce(test_token_stream) + let fce_token_streams = marine(test_token_stream) .unwrap_or_else(|e| panic!("failed to apply the fce macro due {}", e)); let expanded_item = items_from_file(expanded_path); diff --git a/crates/fce-macro/Cargo.toml b/crates/marine-macro/Cargo.toml similarity index 57% rename from crates/fce-macro/Cargo.toml rename to crates/marine-macro/Cargo.toml index f819cd3..843f1c0 100644 --- a/crates/fce-macro/Cargo.toml +++ b/crates/marine-macro/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "fluence-sdk-macro" -version = "0.6.1" # remember to update html_root_url +name = "marine-macro" +version = "0.6.2" # remember to update html_root_url edition = "2018" -description = "Definition of the `#[fce]` macro" -documentation = "https://docs.rs/fluence/fluence-sdk-macro" +description = "Definition of the `#[marine]` macro" +documentation = "https://docs.rs/fluence/marine-macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro" authors = ["Fluence Labs"] keywords = ["fluence", "sdk", "webassembly", "procedural_macros"] @@ -18,4 +18,4 @@ proc-macro = true doctest = false [dependencies] -fluence-sdk-wit = { path = "../wit", version = "=0.6.1" } +marine-macro-impl = { path = "../marine-macro-impl", version = "=0.6.2" } diff --git a/crates/fce-macro/src/lib.rs b/crates/marine-macro/src/lib.rs similarity index 77% rename from crates/fce-macro/src/lib.rs rename to crates/marine-macro/src/lib.rs index 658b1a5..e53954c 100644 --- a/crates/fce-macro/src/lib.rs +++ b/crates/marine-macro/src/lib.rs @@ -50,7 +50,7 @@ //! //! ``` -#![doc(html_root_url = "https://docs.rs/fluence-sdk-macro/0.5.0")] +#![doc(html_root_url = "https://docs.rs/marine-macro/0.5.0")] #![deny( dead_code, nonstandard_style, @@ -62,13 +62,13 @@ #![warn(rust_2018_idioms)] #![recursion_limit = "1024"] -use fluence_sdk_wit::fce as fce_impl; +use marine_macro_impl::marine as marine_impl; use proc_macro::TokenStream; #[proc_macro_attribute] -pub fn fce(_attr: TokenStream, input: TokenStream) -> TokenStream { +pub fn marine(_attr: TokenStream, input: TokenStream) -> TokenStream { // into converts proc_macro::TokenStream to proc_macro2::TokenStream - match fce_impl(input.into()) { + match marine_impl(input.into()) { Ok(v) => v, // converts syn:error to proc_macro2::TokenStream Err(e) => e.to_compile_error(), @@ -76,3 +76,20 @@ pub fn fce(_attr: TokenStream, input: TokenStream) -> TokenStream { // converts proc_macro2::TokenStream to proc_macro::TokenStream .into() } + +// deprecated macro for backwards compatibility +#[deprecated( + since = "0.6.2", + note = "please use the #[marine] macro instead" +)] +#[proc_macro_attribute] +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, + // converts syn:error to proc_macro2::TokenStream + Err(e) => e.to_compile_error(), + } + // converts proc_macro2::TokenStream to proc_macro::TokenStream + .into() +} diff --git a/crates/fce-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml similarity index 77% rename from crates/fce-test-macro-impl/Cargo.toml rename to crates/marine-test-macro-impl/Cargo.toml index a3dbf50..8ab2ebd 100644 --- a/crates/fce-test-macro-impl/Cargo.toml +++ b/crates/marine-test-macro-impl/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "fluence-sdk-test-macro-impl" +name = "marine-test-macro-impl" version = "0.1.5" # remember to update html_root_url edition = "2018" -description = "Implementation of the `#[fce_test]` macro" +description = "Implementation of the `#[marine_test]` macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro-test" authors = ["Fluence Labs"] keywords = ["fluence", "sdk", "webassembly", "procedural_macros"] @@ -13,7 +13,7 @@ license = "Apache-2.0" all-features = true [dependencies] -fluence-app-service = { version = "0.7.0", features = ["raw-module-api"] } +#fluence-app-service = { version = "0.7.0", features = ["raw-module-api"] } fce-wit-parser = "0.5.0" darling = "0.12.2" diff --git a/crates/fce-test-macro-impl/src/attributes.rs b/crates/marine-test-macro-impl/src/attributes.rs similarity index 100% rename from crates/fce-test-macro-impl/src/attributes.rs rename to crates/marine-test-macro-impl/src/attributes.rs diff --git a/crates/fce-test-macro-impl/src/errors.rs b/crates/marine-test-macro-impl/src/errors.rs similarity index 100% rename from crates/fce-test-macro-impl/src/errors.rs rename to crates/marine-test-macro-impl/src/errors.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/config_utils.rs b/crates/marine-test-macro-impl/src/fce_test/config_utils.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/config_utils.rs rename to crates/marine-test-macro-impl/src/fce_test/config_utils.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/fce_test_impl.rs b/crates/marine-test-macro-impl/src/fce_test/fce_test_impl.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/fce_test_impl.rs rename to crates/marine-test-macro-impl/src/fce_test/fce_test_impl.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/glue_code_generator.rs b/crates/marine-test-macro-impl/src/fce_test/glue_code_generator.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/glue_code_generator.rs rename to crates/marine-test-macro-impl/src/fce_test/glue_code_generator.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/mod.rs b/crates/marine-test-macro-impl/src/fce_test/mod.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/mod.rs rename to crates/marine-test-macro-impl/src/fce_test/mod.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator.rs b/crates/marine-test-macro-impl/src/fce_test/module_generator.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/module_generator.rs rename to crates/marine-test-macro-impl/src/fce_test/module_generator.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator.rs b/crates/marine-test-macro-impl/src/fce_test/module_generator/methods_generator.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator.rs rename to crates/marine-test-macro-impl/src/fce_test/module_generator/methods_generator.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator_utils.rs b/crates/marine-test-macro-impl/src/fce_test/module_generator/methods_generator_utils.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator_utils.rs rename to crates/marine-test-macro-impl/src/fce_test/module_generator/methods_generator_utils.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs b/crates/marine-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs rename to crates/marine-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs diff --git a/crates/fce-test-macro-impl/src/fce_test/utils.rs b/crates/marine-test-macro-impl/src/fce_test/utils.rs similarity index 100% rename from crates/fce-test-macro-impl/src/fce_test/utils.rs rename to crates/marine-test-macro-impl/src/fce_test/utils.rs diff --git a/crates/fce-test-macro-impl/src/lib.rs b/crates/marine-test-macro-impl/src/lib.rs similarity index 100% rename from crates/fce-test-macro-impl/src/lib.rs rename to crates/marine-test-macro-impl/src/lib.rs diff --git a/crates/fce-test-macro/Cargo.toml b/crates/marine-test-macro/Cargo.toml similarity index 76% rename from crates/fce-test-macro/Cargo.toml rename to crates/marine-test-macro/Cargo.toml index 213cfd3..1c99367 100644 --- a/crates/fce-test-macro/Cargo.toml +++ b/crates/marine-test-macro/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "fluence-sdk-test-macro" +name = "marine-test-macro" version = "0.1.5" # remember to update html_root_url edition = "2018" -description = "Definition of the `#[fce_test]` macro" +description = "Definition of the `#[marine_test]` macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro-test" authors = ["Fluence Labs"] keywords = ["fluence", "sdk", "webassembly", "procedural_macros"] @@ -17,7 +17,7 @@ proc-macro = true doctest = false [dependencies] -fluence-sdk-test-macro-impl = { path = "../fce-test-macro-impl", version = "0.1.5" } +marine-test-macro-impl = { path = "../marine-test-macro-impl", version = "0.1.5" } quote = "1.0.9" proc-macro2 = "1.0.24" diff --git a/crates/fce-test-macro/src/lib.rs b/crates/marine-test-macro/src/lib.rs similarity index 100% rename from crates/fce-test-macro/src/lib.rs rename to crates/marine-test-macro/src/lib.rs diff --git a/crates/timestamp-macro/Cargo.toml b/crates/timestamp-macro/Cargo.toml index 839cffe..eb126f6 100644 --- a/crates/timestamp-macro/Cargo.toml +++ b/crates/timestamp-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "fce-timestamp-macro" -version = "0.6.1" # remember to update html_root_url +name = "marine-timestamp-macro" +version = "0.6.2" # remember to update html_root_url edition = "2018" description = "Definition of the `#[build_timestamp]` macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/timestamp-macro" diff --git a/fluence-test/Cargo.toml b/fluence-test/Cargo.toml index e4c8ef8..ce10a69 100644 --- a/fluence-test/Cargo.toml +++ b/fluence-test/Cargo.toml @@ -19,8 +19,8 @@ path = "src/lib.rs" doctest = false [dependencies] -fluence-sdk-test-macro = { path = "../crates/fce-test-macro", version = "0.1.5" } -fluence-app-service = { version = "0.7.0", features = ["raw-module-api"] } +marine-test-macro = { path = "../crates/marine-test-macro", version = "0.1.5" } +#fluence-app-service = { version = "0.7.0", features = ["raw-module-api"] } serde = { version = "1.0.118", features = ["derive"] } serde_json = "1.0.64" diff --git a/fluence/Cargo.toml b/fluence/Cargo.toml index eb47698..9ae8217 100644 --- a/fluence/Cargo.toml +++ b/fluence/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence" -version = "0.6.2" # remember to update html_root_url +version = "0.6.3" # remember to update html_root_url description = "Fluence backend SDK for developing backend applications for the Fluence network" documentation = "https://docs.rs/fluence/" repository = "https://github.com/fluencelabs/rust-sdk" @@ -19,9 +19,9 @@ path = "src/lib.rs" doctest = false [dependencies] -fluence-sdk-macro = { path = "../crates/fce-macro", version = "=0.6.1" } -fluence-sdk-main = { path = "../crates/main", version = "=0.6.1" } -fce-timestamp-macro = { path = "../crates/timestamp-macro", version = "=0.6.1" } +marine-macro = { path = "../crates/marine-macro", version = "=0.6.2" } +fluence-sdk-main = { path = "../crates/main", version = "=0.6.2" } +marine-timestamp-macro = { path = "../crates/timestamp-macro", version = "=0.6.2" } serde = { version = "1.0.118", features = ["derive"]} diff --git a/fluence/src/call_parameters.rs b/fluence/src/call_parameters.rs index ff711ca..c5f3e88 100644 --- a/fluence/src/call_parameters.rs +++ b/fluence/src/call_parameters.rs @@ -14,13 +14,13 @@ * limitations under the License. */ -use fluence_sdk_macro::fce; +use marine_macro::marine; use serde::Serialize; use serde::Deserialize; /// Describes an origin that set an argument. -#[fce] +#[marine] #[derive(Clone, PartialEq, Default, Eq, Debug, Serialize, Deserialize)] pub struct SecurityTetraplet { pub peer_pk: String, @@ -30,7 +30,7 @@ pub struct SecurityTetraplet { } /// This struct contains parameters that would be accessible by Wasm modules. -#[fce] +#[marine] #[derive(Clone, PartialEq, Default, Eq, Debug, Serialize, Deserialize)] pub struct CallParameters { /// Peer id of the AIR script initiator. diff --git a/fluence/src/lib.rs b/fluence/src/lib.rs index 9a91f19..1678d58 100644 --- a/fluence/src/lib.rs +++ b/fluence/src/lib.rs @@ -74,7 +74,8 @@ mod mounted_binary; // fluence is used inside CallParameters and MountedBinaryResult glue code extern crate self as fluence; -pub use fluence_sdk_macro::fce; +pub use marine_macro::marine; +pub use marine_macro::fce; pub use call_parameters::CallParameters; pub use call_parameters::SecurityTetraplet; @@ -99,5 +100,5 @@ pub mod internal { pub use fluence_sdk_main::set_result_ptr; pub use fluence_sdk_main::set_result_size; pub use fluence_sdk_main::add_object_to_release; - pub use fce_timestamp_macro::build_timestamp; + pub use marine_timestamp_macro::build_timestamp; } diff --git a/fluence/src/mounted_binary.rs b/fluence/src/mounted_binary.rs index 0dab4f0..1fab760 100644 --- a/fluence/src/mounted_binary.rs +++ b/fluence/src/mounted_binary.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -use fluence_sdk_macro::fce; +use marine_macro::marine; use serde::Serialize; use serde::Deserialize; @@ -22,7 +22,7 @@ use serde::Deserialize; pub const SUCCESS_CODE: i32 = 0; /// Describes result of calling a CLI service. -#[fce] +#[marine] #[derive(Clone, PartialEq, Default, Eq, Debug, Serialize, Deserialize)] pub struct MountedBinaryResult { /// Return process exit code or host execution error code, where SUCCESS_CODE means success. @@ -39,7 +39,7 @@ pub struct MountedBinaryResult { } /// The same as the MountedBinaryResult, but stdout and stderr are utf8 strings. -#[fce] +#[marine] #[derive(Clone, PartialEq, Default, Eq, Debug, Serialize, Deserialize)] pub struct MountedBinaryStringResult { /// Return process exit code or host execution error code, where SUCCESS_CODE means success.