diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3c1e8f1..0759b740 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: run: __GEAR_WASM_BUILDER_NO_FEATURES_TRACKING=1 cargo clippy --workspace --all-targets --locked -- -D warnings - name: Check IDL Parser For WASM With Clippy - run: __GEAR_WASM_BUILDER_NO_FEATURES_TRACKING=1 cargo clippy --manifest-path=sails/idl-parser/Cargo.toml --all-targets --locked --target=wasm32-unknown-unknown -- -D warnings + run: __GEAR_WASM_BUILDER_NO_FEATURES_TRACKING=1 cargo clippy -p sails-idl-parser --all-targets --locked --target=wasm32-unknown-unknown -- -D warnings test: name: Run Tests diff --git a/Cargo.toml b/Cargo.toml index 26a8dab8..a25b650c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,22 +18,22 @@ members = [ "examples/rmrk/catalog/wasm", "examples/rmrk/resource/app", "examples/rmrk/resource/wasm", - "sails", - "sails/client-gen", - "sails/idl-gen", - "sails/idl-parser", - "sails/macros", - "sails/macros/core", + "rs", + "rs/client-gen", + "rs/idl-gen", + "rs/idl-parser", + "rs/macros", + "rs/macros/core", ] [workspace.dependencies] # The order matches with publishing order. -sails-macros-core = { path = "sails/macros/core" } -sails-macros = { path = "sails/macros" } -sails-idl-parser = { path = "sails/idl-parser" } -sails-client-gen = { path = "sails/client-gen" } -sails-rs = { path = "sails" } -sails-idl-gen = { path = "sails/idl-gen" } +sails-macros-core = { path = "rs/macros/core" } +sails-macros = { path = "rs/macros" } +sails-idl-parser = { path = "rs/idl-parser" } +sails-client-gen = { path = "rs/client-gen" } +sails-rs = { path = "rs" } +sails-idl-gen = { path = "rs/idl-gen" } # Gear deps gclient = "=1.4.2" diff --git a/sails/Cargo.toml b/rs/Cargo.toml similarity index 100% rename from sails/Cargo.toml rename to rs/Cargo.toml diff --git a/sails/client-gen/Cargo.toml b/rs/client-gen/Cargo.toml similarity index 100% rename from sails/client-gen/Cargo.toml rename to rs/client-gen/Cargo.toml diff --git a/sails/client-gen/src/ctor_generators.rs b/rs/client-gen/src/ctor_generators.rs similarity index 100% rename from sails/client-gen/src/ctor_generators.rs rename to rs/client-gen/src/ctor_generators.rs diff --git a/sails/client-gen/src/events_generator.rs b/rs/client-gen/src/events_generator.rs similarity index 100% rename from sails/client-gen/src/events_generator.rs rename to rs/client-gen/src/events_generator.rs diff --git a/sails/client-gen/src/helpers.rs b/rs/client-gen/src/helpers.rs similarity index 100% rename from sails/client-gen/src/helpers.rs rename to rs/client-gen/src/helpers.rs diff --git a/sails/client-gen/src/io_generators.rs b/rs/client-gen/src/io_generators.rs similarity index 100% rename from sails/client-gen/src/io_generators.rs rename to rs/client-gen/src/io_generators.rs diff --git a/sails/client-gen/src/lib.rs b/rs/client-gen/src/lib.rs similarity index 100% rename from sails/client-gen/src/lib.rs rename to rs/client-gen/src/lib.rs diff --git a/sails/client-gen/src/root_generator.rs b/rs/client-gen/src/root_generator.rs similarity index 100% rename from sails/client-gen/src/root_generator.rs rename to rs/client-gen/src/root_generator.rs diff --git a/sails/client-gen/src/service_generators.rs b/rs/client-gen/src/service_generators.rs similarity index 100% rename from sails/client-gen/src/service_generators.rs rename to rs/client-gen/src/service_generators.rs diff --git a/sails/client-gen/src/type_generators.rs b/rs/client-gen/src/type_generators.rs similarity index 100% rename from sails/client-gen/src/type_generators.rs rename to rs/client-gen/src/type_generators.rs diff --git a/sails/client-gen/tests/generator.rs b/rs/client-gen/tests/generator.rs similarity index 100% rename from sails/client-gen/tests/generator.rs rename to rs/client-gen/tests/generator.rs diff --git a/sails/client-gen/tests/snapshots/generator__basic_works.snap b/rs/client-gen/tests/snapshots/generator__basic_works.snap similarity index 100% rename from sails/client-gen/tests/snapshots/generator__basic_works.snap rename to rs/client-gen/tests/snapshots/generator__basic_works.snap diff --git a/sails/client-gen/tests/snapshots/generator__events_works.snap b/rs/client-gen/tests/snapshots/generator__events_works.snap similarity index 100% rename from sails/client-gen/tests/snapshots/generator__events_works.snap rename to rs/client-gen/tests/snapshots/generator__events_works.snap diff --git a/sails/client-gen/tests/snapshots/generator__full.snap b/rs/client-gen/tests/snapshots/generator__full.snap similarity index 100% rename from sails/client-gen/tests/snapshots/generator__full.snap rename to rs/client-gen/tests/snapshots/generator__full.snap diff --git a/sails/client-gen/tests/snapshots/generator__multiple_services.snap b/rs/client-gen/tests/snapshots/generator__multiple_services.snap similarity index 100% rename from sails/client-gen/tests/snapshots/generator__multiple_services.snap rename to rs/client-gen/tests/snapshots/generator__multiple_services.snap diff --git a/sails/client-gen/tests/snapshots/generator__nonzero_works.snap b/rs/client-gen/tests/snapshots/generator__nonzero_works.snap similarity index 100% rename from sails/client-gen/tests/snapshots/generator__nonzero_works.snap rename to rs/client-gen/tests/snapshots/generator__nonzero_works.snap diff --git a/sails/client-gen/tests/snapshots/generator__rmrk_works.snap b/rs/client-gen/tests/snapshots/generator__rmrk_works.snap similarity index 100% rename from sails/client-gen/tests/snapshots/generator__rmrk_works.snap rename to rs/client-gen/tests/snapshots/generator__rmrk_works.snap diff --git a/sails/idl-gen/Cargo.toml b/rs/idl-gen/Cargo.toml similarity index 100% rename from sails/idl-gen/Cargo.toml rename to rs/idl-gen/Cargo.toml diff --git a/sails/idl-gen/hbs/composite.hbs b/rs/idl-gen/hbs/composite.hbs similarity index 100% rename from sails/idl-gen/hbs/composite.hbs rename to rs/idl-gen/hbs/composite.hbs diff --git a/sails/idl-gen/hbs/idl.hbs b/rs/idl-gen/hbs/idl.hbs similarity index 100% rename from sails/idl-gen/hbs/idl.hbs rename to rs/idl-gen/hbs/idl.hbs diff --git a/sails/idl-gen/hbs/variant.hbs b/rs/idl-gen/hbs/variant.hbs similarity index 100% rename from sails/idl-gen/hbs/variant.hbs rename to rs/idl-gen/hbs/variant.hbs diff --git a/sails/idl-gen/src/errors.rs b/rs/idl-gen/src/errors.rs similarity index 100% rename from sails/idl-gen/src/errors.rs rename to rs/idl-gen/src/errors.rs diff --git a/sails/idl-gen/src/lib.rs b/rs/idl-gen/src/lib.rs similarity index 100% rename from sails/idl-gen/src/lib.rs rename to rs/idl-gen/src/lib.rs diff --git a/sails/idl-gen/src/meta.rs b/rs/idl-gen/src/meta.rs similarity index 100% rename from sails/idl-gen/src/meta.rs rename to rs/idl-gen/src/meta.rs diff --git a/sails/idl-gen/src/type_names.rs b/rs/idl-gen/src/type_names.rs similarity index 100% rename from sails/idl-gen/src/type_names.rs rename to rs/idl-gen/src/type_names.rs diff --git a/sails/idl-gen/tests/generator.rs b/rs/idl-gen/tests/generator.rs similarity index 100% rename from sails/idl-gen/tests/generator.rs rename to rs/idl-gen/tests/generator.rs diff --git a/sails/idl-gen/tests/snapshots/generator__program_idl_works_with_empty_ctors.snap b/rs/idl-gen/tests/snapshots/generator__program_idl_works_with_empty_ctors.snap similarity index 100% rename from sails/idl-gen/tests/snapshots/generator__program_idl_works_with_empty_ctors.snap rename to rs/idl-gen/tests/snapshots/generator__program_idl_works_with_empty_ctors.snap diff --git a/sails/idl-gen/tests/snapshots/generator__program_idl_works_with_multiple_services.snap b/rs/idl-gen/tests/snapshots/generator__program_idl_works_with_multiple_services.snap similarity index 100% rename from sails/idl-gen/tests/snapshots/generator__program_idl_works_with_multiple_services.snap rename to rs/idl-gen/tests/snapshots/generator__program_idl_works_with_multiple_services.snap diff --git a/sails/idl-gen/tests/snapshots/generator__program_idl_works_with_non_empty_ctors.snap b/rs/idl-gen/tests/snapshots/generator__program_idl_works_with_non_empty_ctors.snap similarity index 100% rename from sails/idl-gen/tests/snapshots/generator__program_idl_works_with_non_empty_ctors.snap rename to rs/idl-gen/tests/snapshots/generator__program_idl_works_with_non_empty_ctors.snap diff --git a/sails/idl-gen/tests/snapshots/generator__service_idl_works_with_base_services.snap b/rs/idl-gen/tests/snapshots/generator__service_idl_works_with_base_services.snap similarity index 100% rename from sails/idl-gen/tests/snapshots/generator__service_idl_works_with_base_services.snap rename to rs/idl-gen/tests/snapshots/generator__service_idl_works_with_base_services.snap diff --git a/sails/idl-gen/tests/snapshots/generator__service_idl_works_with_basics.snap b/rs/idl-gen/tests/snapshots/generator__service_idl_works_with_basics.snap similarity index 100% rename from sails/idl-gen/tests/snapshots/generator__service_idl_works_with_basics.snap rename to rs/idl-gen/tests/snapshots/generator__service_idl_works_with_basics.snap diff --git a/sails/idl-parser/Cargo.toml b/rs/idl-parser/Cargo.toml similarity index 100% rename from sails/idl-parser/Cargo.toml rename to rs/idl-parser/Cargo.toml diff --git a/sails/idl-parser/build.rs b/rs/idl-parser/build.rs similarity index 100% rename from sails/idl-parser/build.rs rename to rs/idl-parser/build.rs diff --git a/sails/idl-parser/src/ast/mod.rs b/rs/idl-parser/src/ast/mod.rs similarity index 100% rename from sails/idl-parser/src/ast/mod.rs rename to rs/idl-parser/src/ast/mod.rs diff --git a/sails/idl-parser/src/ast/visitor.rs b/rs/idl-parser/src/ast/visitor.rs similarity index 100% rename from sails/idl-parser/src/ast/visitor.rs rename to rs/idl-parser/src/ast/visitor.rs diff --git a/sails/idl-parser/src/ffi/ast/mod.rs b/rs/idl-parser/src/ffi/ast/mod.rs similarity index 100% rename from sails/idl-parser/src/ffi/ast/mod.rs rename to rs/idl-parser/src/ffi/ast/mod.rs diff --git a/sails/idl-parser/src/ffi/ast/visitor.rs b/rs/idl-parser/src/ffi/ast/visitor.rs similarity index 100% rename from sails/idl-parser/src/ffi/ast/visitor.rs rename to rs/idl-parser/src/ffi/ast/visitor.rs diff --git a/sails/idl-parser/src/grammar.lalrpop b/rs/idl-parser/src/grammar.lalrpop similarity index 100% rename from sails/idl-parser/src/grammar.lalrpop rename to rs/idl-parser/src/grammar.lalrpop diff --git a/sails/idl-parser/src/grammar.rs b/rs/idl-parser/src/grammar.rs similarity index 100% rename from sails/idl-parser/src/grammar.rs rename to rs/idl-parser/src/grammar.rs diff --git a/sails/idl-parser/src/lexer.rs b/rs/idl-parser/src/lexer.rs similarity index 100% rename from sails/idl-parser/src/lexer.rs rename to rs/idl-parser/src/lexer.rs diff --git a/sails/idl-parser/src/lib.rs b/rs/idl-parser/src/lib.rs similarity index 100% rename from sails/idl-parser/src/lib.rs rename to rs/idl-parser/src/lib.rs diff --git a/sails/macros/Cargo.toml b/rs/macros/Cargo.toml similarity index 100% rename from sails/macros/Cargo.toml rename to rs/macros/Cargo.toml diff --git a/sails/macros/core/Cargo.toml b/rs/macros/core/Cargo.toml similarity index 100% rename from sails/macros/core/Cargo.toml rename to rs/macros/core/Cargo.toml diff --git a/sails/macros/core/src/lib.rs b/rs/macros/core/src/lib.rs similarity index 100% rename from sails/macros/core/src/lib.rs rename to rs/macros/core/src/lib.rs diff --git a/sails/macros/core/src/program/args.rs b/rs/macros/core/src/program/args.rs similarity index 100% rename from sails/macros/core/src/program/args.rs rename to rs/macros/core/src/program/args.rs diff --git a/sails/macros/core/src/program/mod.rs b/rs/macros/core/src/program/mod.rs similarity index 100% rename from sails/macros/core/src/program/mod.rs rename to rs/macros/core/src/program/mod.rs diff --git a/sails/macros/core/src/route.rs b/rs/macros/core/src/route.rs similarity index 100% rename from sails/macros/core/src/route.rs rename to rs/macros/core/src/route.rs diff --git a/sails/macros/core/src/sails_paths.rs b/rs/macros/core/src/sails_paths.rs similarity index 100% rename from sails/macros/core/src/sails_paths.rs rename to rs/macros/core/src/sails_paths.rs diff --git a/sails/macros/core/src/service/args.rs b/rs/macros/core/src/service/args.rs similarity index 100% rename from sails/macros/core/src/service/args.rs rename to rs/macros/core/src/service/args.rs diff --git a/sails/macros/core/src/service/mod.rs b/rs/macros/core/src/service/mod.rs similarity index 100% rename from sails/macros/core/src/service/mod.rs rename to rs/macros/core/src/service/mod.rs diff --git a/sails/macros/core/src/shared.rs b/rs/macros/core/src/shared.rs similarity index 100% rename from sails/macros/core/src/shared.rs rename to rs/macros/core/src/shared.rs diff --git a/sails/macros/core/tests/gprogram.rs b/rs/macros/core/tests/gprogram.rs similarity index 100% rename from sails/macros/core/tests/gprogram.rs rename to rs/macros/core/tests/gprogram.rs diff --git a/sails/macros/core/tests/gservice.rs b/rs/macros/core/tests/gservice.rs similarity index 100% rename from sails/macros/core/tests/gservice.rs rename to rs/macros/core/tests/gservice.rs diff --git a/sails/macros/core/tests/snapshots/gprogram__generates_handle_for_multiple_services_with_non_empty_routes.snap b/rs/macros/core/tests/snapshots/gprogram__generates_handle_for_multiple_services_with_non_empty_routes.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gprogram__generates_handle_for_multiple_services_with_non_empty_routes.snap rename to rs/macros/core/tests/snapshots/gprogram__generates_handle_for_multiple_services_with_non_empty_routes.snap diff --git a/sails/macros/core/tests/snapshots/gprogram__generates_handle_for_single_service_with_non_empty_route.snap b/rs/macros/core/tests/snapshots/gprogram__generates_handle_for_single_service_with_non_empty_route.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gprogram__generates_handle_for_single_service_with_non_empty_route.snap rename to rs/macros/core/tests/snapshots/gprogram__generates_handle_for_single_service_with_non_empty_route.snap diff --git a/sails/macros/core/tests/snapshots/gprogram__generates_handle_with_gprogram_attributes.snap b/rs/macros/core/tests/snapshots/gprogram__generates_handle_with_gprogram_attributes.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gprogram__generates_handle_with_gprogram_attributes.snap rename to rs/macros/core/tests/snapshots/gprogram__generates_handle_with_gprogram_attributes.snap diff --git a/sails/macros/core/tests/snapshots/gprogram__generates_init_for_multiple_ctors.snap b/rs/macros/core/tests/snapshots/gprogram__generates_init_for_multiple_ctors.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gprogram__generates_init_for_multiple_ctors.snap rename to rs/macros/core/tests/snapshots/gprogram__generates_init_for_multiple_ctors.snap diff --git a/sails/macros/core/tests/snapshots/gprogram__generates_init_for_no_ctor.snap b/rs/macros/core/tests/snapshots/gprogram__generates_init_for_no_ctor.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gprogram__generates_init_for_no_ctor.snap rename to rs/macros/core/tests/snapshots/gprogram__generates_init_for_no_ctor.snap diff --git a/sails/macros/core/tests/snapshots/gprogram__generates_init_for_single_ctor.snap b/rs/macros/core/tests/snapshots/gprogram__generates_init_for_single_ctor.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gprogram__generates_init_for_single_ctor.snap rename to rs/macros/core/tests/snapshots/gprogram__generates_init_for_single_ctor.snap diff --git a/sails/macros/core/tests/snapshots/gservice__works_with_basics.snap b/rs/macros/core/tests/snapshots/gservice__works_with_basics.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gservice__works_with_basics.snap rename to rs/macros/core/tests/snapshots/gservice__works_with_basics.snap diff --git a/sails/macros/core/tests/snapshots/gservice__works_with_events.snap b/rs/macros/core/tests/snapshots/gservice__works_with_events.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gservice__works_with_events.snap rename to rs/macros/core/tests/snapshots/gservice__works_with_events.snap diff --git a/sails/macros/core/tests/snapshots/gservice__works_with_extends.snap b/rs/macros/core/tests/snapshots/gservice__works_with_extends.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gservice__works_with_extends.snap rename to rs/macros/core/tests/snapshots/gservice__works_with_extends.snap diff --git a/sails/macros/core/tests/snapshots/gservice__works_with_extends_and_lifetimes.snap b/rs/macros/core/tests/snapshots/gservice__works_with_extends_and_lifetimes.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gservice__works_with_extends_and_lifetimes.snap rename to rs/macros/core/tests/snapshots/gservice__works_with_extends_and_lifetimes.snap diff --git a/sails/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_events.snap b/rs/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_events.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_events.snap rename to rs/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_events.snap diff --git a/sails/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_generics.snap b/rs/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_generics.snap similarity index 100% rename from sails/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_generics.snap rename to rs/macros/core/tests/snapshots/gservice__works_with_lifetimes_and_generics.snap diff --git a/sails/macros/src/lib.rs b/rs/macros/src/lib.rs similarity index 100% rename from sails/macros/src/lib.rs rename to rs/macros/src/lib.rs diff --git a/sails/macros/tests/gprogram_basic/mod.rs b/rs/macros/tests/gprogram_basic/mod.rs similarity index 100% rename from sails/macros/tests/gprogram_basic/mod.rs rename to rs/macros/tests/gprogram_basic/mod.rs diff --git a/sails/macros/tests/gprogram_tests.rs b/rs/macros/tests/gprogram_tests.rs similarity index 100% rename from sails/macros/tests/gprogram_tests.rs rename to rs/macros/tests/gprogram_tests.rs diff --git a/sails/macros/tests/gservice_tests.rs b/rs/macros/tests/gservice_tests.rs similarity index 100% rename from sails/macros/tests/gservice_tests.rs rename to rs/macros/tests/gservice_tests.rs diff --git a/sails/macros/tests/gservice_with_basics/mod.rs b/rs/macros/tests/gservice_with_basics/mod.rs similarity index 100% rename from sails/macros/tests/gservice_with_basics/mod.rs rename to rs/macros/tests/gservice_with_basics/mod.rs diff --git a/sails/macros/tests/gservice_with_events/mod.rs b/rs/macros/tests/gservice_with_events/mod.rs similarity index 100% rename from sails/macros/tests/gservice_with_events/mod.rs rename to rs/macros/tests/gservice_with_events/mod.rs diff --git a/sails/macros/tests/gservice_with_extends/mod.rs b/rs/macros/tests/gservice_with_extends/mod.rs similarity index 100% rename from sails/macros/tests/gservice_with_extends/mod.rs rename to rs/macros/tests/gservice_with_extends/mod.rs diff --git a/sails/macros/tests/gservice_with_extends_and_lifetimes/mod.rs b/rs/macros/tests/gservice_with_extends_and_lifetimes/mod.rs similarity index 100% rename from sails/macros/tests/gservice_with_extends_and_lifetimes/mod.rs rename to rs/macros/tests/gservice_with_extends_and_lifetimes/mod.rs diff --git a/sails/macros/tests/gservice_with_lifecycles_and_generics/mod.rs b/rs/macros/tests/gservice_with_lifecycles_and_generics/mod.rs similarity index 100% rename from sails/macros/tests/gservice_with_lifecycles_and_generics/mod.rs rename to rs/macros/tests/gservice_with_lifecycles_and_generics/mod.rs diff --git a/sails/macros/tests/gservice_with_lifetimes_and_events/mod.rs b/rs/macros/tests/gservice_with_lifetimes_and_events/mod.rs similarity index 100% rename from sails/macros/tests/gservice_with_lifetimes_and_events/mod.rs rename to rs/macros/tests/gservice_with_lifetimes_and_events/mod.rs diff --git a/sails/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.rs b/rs/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.rs rename to rs/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.rs diff --git a/sails/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.stderr b/rs/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.stderr rename to rs/macros/tests/ui/gprogram_fails_for_multiple_services_with_same_route.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.rs b/rs/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.rs rename to rs/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.rs diff --git a/sails/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.stderr b/rs/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.stderr rename to rs/macros/tests/ui/gprogram_fails_for_service_multiple_groute_attributes_are_not_allowed.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_for_service_with_empty_route.rs b/rs/macros/tests/ui/gprogram_fails_for_service_with_empty_route.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_service_with_empty_route.rs rename to rs/macros/tests/ui/gprogram_fails_for_service_with_empty_route.rs diff --git a/sails/macros/tests/ui/gprogram_fails_for_service_with_empty_route.stderr b/rs/macros/tests/ui/gprogram_fails_for_service_with_empty_route.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_service_with_empty_route.stderr rename to rs/macros/tests/ui/gprogram_fails_for_service_with_empty_route.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.rs b/rs/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.rs rename to rs/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.rs diff --git a/sails/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.stderr b/rs/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.stderr rename to rs/macros/tests/ui/gprogram_fails_for_service_with_not_valid_route.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_multiple_not_allowed.rs b/rs/macros/tests/ui/gprogram_fails_multiple_not_allowed.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_multiple_not_allowed.rs rename to rs/macros/tests/ui/gprogram_fails_multiple_not_allowed.rs diff --git a/sails/macros/tests/ui/gprogram_fails_multiple_not_allowed.stderr b/rs/macros/tests/ui/gprogram_fails_multiple_not_allowed.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_multiple_not_allowed.stderr rename to rs/macros/tests/ui/gprogram_fails_multiple_not_allowed.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.rs b/rs/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.rs rename to rs/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.rs diff --git a/sails/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.stderr b/rs/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.stderr rename to rs/macros/tests/ui/gprogram_fails_multiple_not_allowed_on_one_impl.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_to_parse_program_impl.rs b/rs/macros/tests/ui/gprogram_fails_to_parse_program_impl.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_to_parse_program_impl.rs rename to rs/macros/tests/ui/gprogram_fails_to_parse_program_impl.rs diff --git a/sails/macros/tests/ui/gprogram_fails_to_parse_program_impl.stderr b/rs/macros/tests/ui/gprogram_fails_to_parse_program_impl.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_to_parse_program_impl.stderr rename to rs/macros/tests/ui/gprogram_fails_to_parse_program_impl.stderr diff --git a/sails/macros/tests/ui/gprogram_fails_unknown_args.rs b/rs/macros/tests/ui/gprogram_fails_unknown_args.rs similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_unknown_args.rs rename to rs/macros/tests/ui/gprogram_fails_unknown_args.rs diff --git a/sails/macros/tests/ui/gprogram_fails_unknown_args.stderr b/rs/macros/tests/ui/gprogram_fails_unknown_args.stderr similarity index 100% rename from sails/macros/tests/ui/gprogram_fails_unknown_args.stderr rename to rs/macros/tests/ui/gprogram_fails_unknown_args.stderr diff --git a/sails/macros/tests/ui/gservice_fails_multiple_not_allowed.rs b/rs/macros/tests/ui/gservice_fails_multiple_not_allowed.rs similarity index 100% rename from sails/macros/tests/ui/gservice_fails_multiple_not_allowed.rs rename to rs/macros/tests/ui/gservice_fails_multiple_not_allowed.rs diff --git a/sails/macros/tests/ui/gservice_fails_multiple_not_allowed.stderr b/rs/macros/tests/ui/gservice_fails_multiple_not_allowed.stderr similarity index 100% rename from sails/macros/tests/ui/gservice_fails_multiple_not_allowed.stderr rename to rs/macros/tests/ui/gservice_fails_multiple_not_allowed.stderr diff --git a/sails/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.rs b/rs/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.rs similarity index 100% rename from sails/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.rs rename to rs/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.rs diff --git a/sails/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.stderr b/rs/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.stderr similarity index 100% rename from sails/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.stderr rename to rs/macros/tests/ui/gservice_fails_multiple_not_allowed_on_one_impl.stderr diff --git a/sails/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.rs b/rs/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.rs similarity index 100% rename from sails/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.rs rename to rs/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.rs diff --git a/sails/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.stderr b/rs/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.stderr similarity index 100% rename from sails/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.stderr rename to rs/macros/tests/ui/gservice_fails_no_handlers_or_extends_found.stderr diff --git a/sails/macros/tests/ui/gservice_fails_route_fn_must_be_public.rs b/rs/macros/tests/ui/gservice_fails_route_fn_must_be_public.rs similarity index 100% rename from sails/macros/tests/ui/gservice_fails_route_fn_must_be_public.rs rename to rs/macros/tests/ui/gservice_fails_route_fn_must_be_public.rs diff --git a/sails/macros/tests/ui/gservice_fails_route_fn_must_be_public.stderr b/rs/macros/tests/ui/gservice_fails_route_fn_must_be_public.stderr similarity index 100% rename from sails/macros/tests/ui/gservice_fails_route_fn_must_be_public.stderr rename to rs/macros/tests/ui/gservice_fails_route_fn_must_be_public.stderr diff --git a/sails/macros/tests/ui/gservice_fails_to_parse_service_impl.rs b/rs/macros/tests/ui/gservice_fails_to_parse_service_impl.rs similarity index 100% rename from sails/macros/tests/ui/gservice_fails_to_parse_service_impl.rs rename to rs/macros/tests/ui/gservice_fails_to_parse_service_impl.rs diff --git a/sails/macros/tests/ui/gservice_fails_to_parse_service_impl.stderr b/rs/macros/tests/ui/gservice_fails_to_parse_service_impl.stderr similarity index 100% rename from sails/macros/tests/ui/gservice_fails_to_parse_service_impl.stderr rename to rs/macros/tests/ui/gservice_fails_to_parse_service_impl.stderr diff --git a/sails/macros/tests/ui/gservice_works_panic_on_unexpected_input.rs b/rs/macros/tests/ui/gservice_works_panic_on_unexpected_input.rs similarity index 100% rename from sails/macros/tests/ui/gservice_works_panic_on_unexpected_input.rs rename to rs/macros/tests/ui/gservice_works_panic_on_unexpected_input.rs diff --git a/sails/macros/tests/ui/gservice_works_panic_on_unexpected_input_double_encoded.rs b/rs/macros/tests/ui/gservice_works_panic_on_unexpected_input_double_encoded.rs similarity index 100% rename from sails/macros/tests/ui/gservice_works_panic_on_unexpected_input_double_encoded.rs rename to rs/macros/tests/ui/gservice_works_panic_on_unexpected_input_double_encoded.rs diff --git a/sails/macros/tests/ui/gservice_works_with_basics.rs b/rs/macros/tests/ui/gservice_works_with_basics.rs similarity index 100% rename from sails/macros/tests/ui/gservice_works_with_basics.rs rename to rs/macros/tests/ui/gservice_works_with_basics.rs diff --git a/sails/macros/tests/ui/gservice_works_with_extends.rs b/rs/macros/tests/ui/gservice_works_with_extends.rs similarity index 100% rename from sails/macros/tests/ui/gservice_works_with_extends.rs rename to rs/macros/tests/ui/gservice_works_with_extends.rs diff --git a/sails/macros/tests/ui/gservice_works_with_lifecycles_and_generics.rs b/rs/macros/tests/ui/gservice_works_with_lifecycles_and_generics.rs similarity index 100% rename from sails/macros/tests/ui/gservice_works_with_lifecycles_and_generics.rs rename to rs/macros/tests/ui/gservice_works_with_lifecycles_and_generics.rs diff --git a/sails/macros/tests/ui_error_tests.rs b/rs/macros/tests/ui_error_tests.rs similarity index 100% rename from sails/macros/tests/ui_error_tests.rs rename to rs/macros/tests/ui_error_tests.rs diff --git a/sails/src/calls.rs b/rs/src/calls.rs similarity index 100% rename from sails/src/calls.rs rename to rs/src/calls.rs diff --git a/sails/src/errors.rs b/rs/src/errors.rs similarity index 100% rename from sails/src/errors.rs rename to rs/src/errors.rs diff --git a/sails/src/events.rs b/rs/src/events.rs similarity index 100% rename from sails/src/events.rs rename to rs/src/events.rs diff --git a/sails/src/gsdk/calls.rs b/rs/src/gsdk/calls.rs similarity index 100% rename from sails/src/gsdk/calls.rs rename to rs/src/gsdk/calls.rs diff --git a/sails/src/gsdk/mod.rs b/rs/src/gsdk/mod.rs similarity index 100% rename from sails/src/gsdk/mod.rs rename to rs/src/gsdk/mod.rs diff --git a/sails/src/gstd/calls.rs b/rs/src/gstd/calls.rs similarity index 100% rename from sails/src/gstd/calls.rs rename to rs/src/gstd/calls.rs diff --git a/sails/src/gstd/events.rs b/rs/src/gstd/events.rs similarity index 100% rename from sails/src/gstd/events.rs rename to rs/src/gstd/events.rs diff --git a/sails/src/gstd/mod.rs b/rs/src/gstd/mod.rs similarity index 100% rename from sails/src/gstd/mod.rs rename to rs/src/gstd/mod.rs diff --git a/sails/src/gstd/services.rs b/rs/src/gstd/services.rs similarity index 100% rename from sails/src/gstd/services.rs rename to rs/src/gstd/services.rs diff --git a/sails/src/gtest/calls.rs b/rs/src/gtest/calls.rs similarity index 100% rename from sails/src/gtest/calls.rs rename to rs/src/gtest/calls.rs diff --git a/sails/src/gtest/mod.rs b/rs/src/gtest/mod.rs similarity index 100% rename from sails/src/gtest/mod.rs rename to rs/src/gtest/mod.rs diff --git a/sails/src/lib.rs b/rs/src/lib.rs similarity index 100% rename from sails/src/lib.rs rename to rs/src/lib.rs diff --git a/sails/src/prelude.rs b/rs/src/prelude.rs similarity index 100% rename from sails/src/prelude.rs rename to rs/src/prelude.rs diff --git a/sails/src/types.rs b/rs/src/types.rs similarity index 100% rename from sails/src/types.rs rename to rs/src/types.rs