From 3492f400575f194c305eee22d782d1d0b673e3fd Mon Sep 17 00:00:00 2001 From: vms Date: Mon, 22 Feb 2021 18:30:45 +0300 Subject: [PATCH] module renaming --- crates/main/src/lib.rs | 5 +---- .../src/{mounted_binary_result.rs => mounted_binary.rs} | 4 ++-- src/lib.rs | 6 ++++-- 3 files changed, 7 insertions(+), 8 deletions(-) rename crates/main/src/{mounted_binary_result.rs => mounted_binary.rs} (96%) diff --git a/crates/main/src/lib.rs b/crates/main/src/lib.rs index a4ea5e0..fc36a30 100644 --- a/crates/main/src/lib.rs +++ b/crates/main/src/lib.rs @@ -35,7 +35,7 @@ mod call_parameters; mod export_allocator; #[cfg(any(feature = "debug", feature = "logger"))] mod logger; -mod mounted_binary_result; +pub mod mounted_binary; mod result; pub use call_parameters::CallParameters; @@ -53,9 +53,6 @@ pub use logger::TargetMap; #[cfg(feature = "logger")] pub use logger::WASM_LOG_ENV_NAME; -pub use mounted_binary_result::MountedBinaryResult; -pub use mounted_binary_result::SUCCESS_CODE; - pub use result::get_result_ptr; pub use result::get_result_size; pub use result::set_result_ptr; diff --git a/crates/main/src/mounted_binary_result.rs b/crates/main/src/mounted_binary.rs similarity index 96% rename from crates/main/src/mounted_binary_result.rs rename to crates/main/src/mounted_binary.rs index 13ee98c..a6480e3 100644 --- a/crates/main/src/mounted_binary_result.rs +++ b/crates/main/src/mounted_binary.rs @@ -24,7 +24,7 @@ pub const SUCCESS_CODE: i32 = 0; /// Describes result of calling a CLI service. #[fce] #[derive(Clone, PartialEq, Default, Eq, Debug, Serialize, Deserialize)] -pub struct MountedBinaryResult { +pub struct Result { /// Return process exit code or host execution error code, where SUCCESS_CODE means success. pub ret_code: i32, @@ -38,7 +38,7 @@ pub struct MountedBinaryResult { pub stderr: Vec, } -impl MountedBinaryResult { +impl Result { /// Create a new failure MountedBinaryResult from the provided ret_code. pub fn from_error(ret_code: i32, error: impl Into) -> Self { Self { diff --git a/src/lib.rs b/src/lib.rs index 84f9f83..2a113b4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -79,8 +79,10 @@ pub use fluence_sdk_main::WasmLoggerBuilder; #[cfg(feature = "logger")] pub use fluence_sdk_main::TargetMap; -pub use fluence_sdk_main::MountedBinaryResult; -pub use fluence_sdk_main::SUCCESS_CODE; +pub mod mounted_binary { + pub use fluence_sdk_main::mounted_binary::Result; + pub use fluence_sdk_main::mounted_binary::SUCCESS_CODE; +} /// These API functions are intended for internal usage in generated code. /// Normally, you shouldn't use them.