diff --git a/src/core/mod.rs b/src/core/mod.rs index 491d8b4c..79052554 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -7,7 +7,6 @@ pub mod log; pub mod metrics; pub mod mods; pub mod pdu; -pub mod result; pub mod server; pub mod utils; @@ -19,9 +18,8 @@ pub use config::Config; pub use error::Error; pub use info::{rustc_flags_capture, version, version::version}; pub use pdu::{PduBuilder, PduCount, PduEvent}; -pub use result::Result; pub use server::Server; -pub use utils::{ctor, dtor, implement}; +pub use utils::{ctor, dtor, implement, result, result::Result}; pub use crate as conduit_core; diff --git a/src/core/utils/mod.rs b/src/core/utils/mod.rs index 96a98537..3943a8da 100644 --- a/src/core/utils/mod.rs +++ b/src/core/utils/mod.rs @@ -10,6 +10,7 @@ pub mod json; pub mod math; pub mod mutex_map; pub mod rand; +pub mod result; pub mod set; pub mod stream; pub mod string; diff --git a/src/core/result.rs b/src/core/utils/result.rs similarity index 100% rename from src/core/result.rs rename to src/core/utils/result.rs diff --git a/src/core/result/debug_inspect.rs b/src/core/utils/result/debug_inspect.rs similarity index 100% rename from src/core/result/debug_inspect.rs rename to src/core/utils/result/debug_inspect.rs diff --git a/src/core/result/flat_ok.rs b/src/core/utils/result/flat_ok.rs similarity index 100% rename from src/core/result/flat_ok.rs rename to src/core/utils/result/flat_ok.rs diff --git a/src/core/result/inspect_log.rs b/src/core/utils/result/inspect_log.rs similarity index 100% rename from src/core/result/inspect_log.rs rename to src/core/utils/result/inspect_log.rs diff --git a/src/core/result/into_is_ok.rs b/src/core/utils/result/into_is_ok.rs similarity index 100% rename from src/core/result/into_is_ok.rs rename to src/core/utils/result/into_is_ok.rs diff --git a/src/core/result/log_debug_err.rs b/src/core/utils/result/log_debug_err.rs similarity index 100% rename from src/core/result/log_debug_err.rs rename to src/core/utils/result/log_debug_err.rs diff --git a/src/core/result/log_err.rs b/src/core/utils/result/log_err.rs similarity index 100% rename from src/core/result/log_err.rs rename to src/core/utils/result/log_err.rs diff --git a/src/core/result/map_expect.rs b/src/core/utils/result/map_expect.rs similarity index 100% rename from src/core/result/map_expect.rs rename to src/core/utils/result/map_expect.rs diff --git a/src/core/result/not_found.rs b/src/core/utils/result/not_found.rs similarity index 100% rename from src/core/result/not_found.rs rename to src/core/utils/result/not_found.rs diff --git a/src/core/result/unwrap_infallible.rs b/src/core/utils/result/unwrap_infallible.rs similarity index 100% rename from src/core/result/unwrap_infallible.rs rename to src/core/utils/result/unwrap_infallible.rs