diff --git a/Cargo.lock b/Cargo.lock index f4ae671..75a2e80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -697,7 +697,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "marine-build-rs-generator" -version = "0.8.0" +version = "0.8.1" dependencies = [ "marine-test-macro-impl", ] @@ -883,7 +883,7 @@ dependencies = [ [[package]] name = "marine-rs-sdk-test" -version = "0.8.0" +version = "0.8.1" dependencies = [ "fluence-app-service", "marine-build-rs-generator", @@ -924,7 +924,7 @@ dependencies = [ [[package]] name = "marine-test-macro" -version = "0.8.0" +version = "0.8.1" dependencies = [ "marine-test-macro-impl", "proc-macro-error", @@ -935,7 +935,7 @@ dependencies = [ [[package]] name = "marine-test-macro-impl" -version = "0.8.0" +version = "0.8.1" dependencies = [ "darling", "fluence-app-service", diff --git a/Cargo.toml b/Cargo.toml index a7a5d0e..4eeef60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marine-rs-sdk-test" -version = "0.8.0" +version = "0.8.1" description = "Backend SDK that allows testing modules for the Marine runtime" documentation = "https://docs.rs/marine-rs-sdk-test" repository = "https://github.com/fluencelabs/marine-rs-sdk-test" @@ -21,8 +21,8 @@ doctest = false trybuild = "1.0" [dependencies] -marine-test-macro = { path = "crates/marine-test-macro", version = "=0.8.0" } -marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.8.0" } +marine-test-macro = { path = "crates/marine-test-macro", version = "=0.8.1" } +marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.8.1" } fluence-app-service = { version = "0.22.1", features = ["raw-module-api"] } serde = { version = "1.0.144", features = ["derive"] } diff --git a/crates/marine-build-rs-generator/Cargo.toml b/crates/marine-build-rs-generator/Cargo.toml index 5550ff2..47619d3 100644 --- a/crates/marine-build-rs-generator/Cargo.toml +++ b/crates/marine-build-rs-generator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marine-build-rs-generator" -version = "0.8.0" +version = "0.8.1" edition = "2018" description = "Tools for generating marine_test_env in build scripts" documentation = "https://docs.rs/marine-build-rs-generator" @@ -17,4 +17,4 @@ all-features = true doctest = false [dependencies] -marine-test-macro-impl = { path = "../marine-test-macro-impl", version = "=0.8.0" } +marine-test-macro-impl = { path = "../marine-test-macro-impl", version = "=0.8.1" } diff --git a/crates/marine-build-rs-generator/src/lib.rs b/crates/marine-build-rs-generator/src/lib.rs index c9bfa7d..4218a04 100644 --- a/crates/marine-build-rs-generator/src/lib.rs +++ b/crates/marine-build-rs-generator/src/lib.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -#![doc(html_root_url = "https://docs.rs/marine-build-rs-generator/0.8.0")] +#![doc(html_root_url = "https://docs.rs/marine-build-rs-generator/0.8.1")] #![deny( dead_code, nonstandard_style, diff --git a/crates/marine-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml index cdf42f7..682c865 100644 --- a/crates/marine-test-macro-impl/Cargo.toml +++ b/crates/marine-test-macro-impl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marine-test-macro-impl" -version = "0.8.0" +version = "0.8.1" edition = "2018" description = "Implementation of the `#[marine_test]` macro" documentation = "https://docs.rs/fluence/marine-test-macro-impl" diff --git a/crates/marine-test-macro-impl/src/marine_test/token_stream_generator/service_generation_utils.rs b/crates/marine-test-macro-impl/src/marine_test/token_stream_generator/service_generation_utils.rs index ccac3cd..704d395 100644 --- a/crates/marine-test-macro-impl/src/marine_test/token_stream_generator/service_generation_utils.rs +++ b/crates/marine-test-macro-impl/src/marine_test/token_stream_generator/service_generation_utils.rs @@ -65,7 +65,7 @@ pub(crate) fn generate_app_service_ctor( let mut __m_generated_marine_config = marine_rs_sdk_test::internal::TomlAppServiceConfig::load(&config_path) .unwrap_or_else(|e| panic!("app service config located at `{:?}` can't be loaded: {}", config_path, e)); __m_generated_marine_config.service_base_dir = Some(tmp_dir); - __m_generated_marine_config.toml_marine_config.modules_dir = Some(modules_dir.to_string()); + __m_generated_marine_config.toml_marine_config.modules_dir = Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade(__m_generated_marine_config, service_id, std::collections::HashMap::new()) .unwrap_or_else(|e| panic!("app service can't be created: {}", e)); diff --git a/crates/marine-test-macro-impl/tests/generation_tests/empty_func/expanded.rs b/crates/marine-test-macro-impl/tests/generation_tests/empty_func/expanded.rs index acb68f2..a7dc243 100644 --- a/crates/marine-test-macro-impl/tests/generation_tests/empty_func/expanded.rs +++ b/crates/marine-test-macro-impl/tests/generation_tests/empty_func/expanded.rs @@ -112,7 +112,7 @@ fn empty_string() { config_path, e )); __m_generated_marine_config.service_base_dir = Some(tmp_dir); - __m_generated_marine_config.toml_marine_config.modules_dir = Some(modules_dir.to_string()); + __m_generated_marine_config.toml_marine_config.modules_dir = Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, diff --git a/crates/marine-test-macro-impl/tests/generation_tests/mounted_binary/expanded.rs b/crates/marine-test-macro-impl/tests/generation_tests/mounted_binary/expanded.rs index e87945f..69e0782 100644 --- a/crates/marine-test-macro-impl/tests/generation_tests/mounted_binary/expanded.rs +++ b/crates/marine-test-macro-impl/tests/generation_tests/mounted_binary/expanded.rs @@ -145,7 +145,7 @@ fn test() { ) ); __m_generated_marine_config.service_base_dir = Some(tmp_dir); - __m_generated_marine_config.toml_marine_config.modules_dir = Some(modules_dir.to_string()); + __m_generated_marine_config.toml_marine_config.modules_dir = Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, diff --git a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-empty_mod/expanded.rs b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-empty_mod/expanded.rs index 4c7f6ff..70c4a18 100644 --- a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-empty_mod/expanded.rs +++ b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-empty_mod/expanded.rs @@ -215,7 +215,7 @@ pub mod tests { ); __m_generated_marine_config.service_base_dir = Some(tmp_dir); __m_generated_marine_config.toml_marine_config.modules_dir = - Some(modules_dir.to_string()); + Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, diff --git a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-multiple/expanded.rs b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-multiple/expanded.rs index d854801..fc5ef57 100644 --- a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-multiple/expanded.rs +++ b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-multiple/expanded.rs @@ -215,7 +215,7 @@ fn test() { ); __m_generated_marine_config.service_base_dir = Some(tmp_dir); __m_generated_marine_config.toml_marine_config.modules_dir = - Some(modules_dir.to_string()); + Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, @@ -459,7 +459,7 @@ fn test() { ); __m_generated_marine_config.service_base_dir = Some(tmp_dir); __m_generated_marine_config.toml_marine_config.modules_dir = - Some(modules_dir.to_string()); + Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, diff --git a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-single/expanded.rs b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-single/expanded.rs index 83cf797..2af594c 100644 --- a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-single/expanded.rs +++ b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-single/expanded.rs @@ -215,7 +215,7 @@ fn empty_test() { ); __m_generated_marine_config.service_base_dir = Some(tmp_dir); __m_generated_marine_config.toml_marine_config.modules_dir = - Some(modules_dir.to_string()); + Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, diff --git a/crates/marine-test-macro-impl/tests/generation_tests/multiple_modules/expanded.rs b/crates/marine-test-macro-impl/tests/generation_tests/multiple_modules/expanded.rs index a4c3af1..a220d7f 100644 --- a/crates/marine-test-macro-impl/tests/generation_tests/multiple_modules/expanded.rs +++ b/crates/marine-test-macro-impl/tests/generation_tests/multiple_modules/expanded.rs @@ -264,7 +264,7 @@ fn empty_string() { ) ); __m_generated_marine_config.service_base_dir = Some(tmp_dir); - __m_generated_marine_config.toml_marine_config.modules_dir = Some(modules_dir.to_string()); + __m_generated_marine_config.toml_marine_config.modules_dir = Some(std::path::PathBuf::from(modules_dir)); let marine = marine_rs_sdk_test::internal::AppService::new_with_empty_facade( __m_generated_marine_config, service_id, diff --git a/crates/marine-test-macro/Cargo.toml b/crates/marine-test-macro/Cargo.toml index 8c452f5..15d5334 100644 --- a/crates/marine-test-macro/Cargo.toml +++ b/crates/marine-test-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marine-test-macro" -version = "0.8.0" +version = "0.8.1" edition = "2018" description = "Definition of the `#[marine_test]` macro" documentation = "https://docs.rs/fluence/marine-test-macro" @@ -18,7 +18,7 @@ proc-macro = true doctest = false [dependencies] -marine-test-macro-impl = { path = "../marine-test-macro-impl", version = "=0.8.0" } +marine-test-macro-impl = { path = "../marine-test-macro-impl", version = "=0.8.1" } quote = "1.0.21" proc-macro2 = "1.0.43" diff --git a/crates/marine-test-macro/src/lib.rs b/crates/marine-test-macro/src/lib.rs index 3e38299..f644d8e 100644 --- a/crates/marine-test-macro/src/lib.rs +++ b/crates/marine-test-macro/src/lib.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -#![doc(html_root_url = "https://docs.rs/marine-test-macro/0.8.0")] +#![doc(html_root_url = "https://docs.rs/marine-test-macro/0.8.1")] #![deny( dead_code, nonstandard_style, diff --git a/src/lib.rs b/src/lib.rs index 3bc3701..384c791 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -#![doc(html_root_url = "https://docs.rs/marine-rs-sdk-test/0.8.0")] +#![doc(html_root_url = "https://docs.rs/marine-rs-sdk-test/0.8.1")] #![deny( dead_code, nonstandard_style,