From c769fcc3471dcc4c976569be57aea65109105f92 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 24 Oct 2024 01:31:30 +0000
Subject: [PATCH] move core result into core utils

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/mod.rs                                  | 4 +---
 src/core/utils/mod.rs                            | 1 +
 src/core/{ => utils}/result.rs                   | 0
 src/core/{ => utils}/result/debug_inspect.rs     | 0
 src/core/{ => utils}/result/flat_ok.rs           | 0
 src/core/{ => utils}/result/inspect_log.rs       | 0
 src/core/{ => utils}/result/into_is_ok.rs        | 0
 src/core/{ => utils}/result/log_debug_err.rs     | 0
 src/core/{ => utils}/result/log_err.rs           | 0
 src/core/{ => utils}/result/map_expect.rs        | 0
 src/core/{ => utils}/result/not_found.rs         | 0
 src/core/{ => utils}/result/unwrap_infallible.rs | 0
 12 files changed, 2 insertions(+), 3 deletions(-)
 rename src/core/{ => utils}/result.rs (100%)
 rename src/core/{ => utils}/result/debug_inspect.rs (100%)
 rename src/core/{ => utils}/result/flat_ok.rs (100%)
 rename src/core/{ => utils}/result/inspect_log.rs (100%)
 rename src/core/{ => utils}/result/into_is_ok.rs (100%)
 rename src/core/{ => utils}/result/log_debug_err.rs (100%)
 rename src/core/{ => utils}/result/log_err.rs (100%)
 rename src/core/{ => utils}/result/map_expect.rs (100%)
 rename src/core/{ => utils}/result/not_found.rs (100%)
 rename src/core/{ => utils}/result/unwrap_infallible.rs (100%)

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