Merge pull request #1464 from cgwalters/utilstracing-log-err

utils: Move ResultExt to bootc_utils

Author: ckyrouac

crates/ostree-ext/src/container/store.rs

@@ -11,8 +11,8 @@ use crate::generic_decompress::Decompressor;
 use crate::logging::system_repo_journal_print;
 use crate::refescape;
 use crate::sysroot::SysrootLock;
-use crate::utils::ResultExt;
 use anyhow::{anyhow, Context};
+use bootc_utils::ResultExt;
 use camino::{Utf8Path, Utf8PathBuf};
 use canon_json::CanonJsonSerialize;
 use cap_std_ext::cap_std;

crates/ostree-ext/src/ostree_prepareroot.rs

@@ -17,7 +17,7 @@ use ostree::{gio, glib};
 
 use crate::keyfileext::KeyFileExt;
 use crate::ostree_manual;
-use crate::utils::ResultExt;
+use bootc_utils::ResultExt;
 
 /// The relative path to ostree-prepare-root's config.
 pub const CONF_PATH: &str = "ostree/prepare-root.conf";

crates/ostree-ext/src/utils.rs

@@ -1,34 +1 @@
-pub(crate) trait ResultExt<T, E: std::fmt::Display> {
-    /// Return the Ok value unchanged.  In the err case, log it, and call the closure to compute the default
-    fn log_err_or_else<F>(self, default: F) -> T
-    where
-        F: FnOnce() -> T;
-    /// Return the Ok value unchanged.  In the err case, log it, and return the default value
-    fn log_err_default(self) -> T
-    where
-        T: Default;
-}
 
-impl<T, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
-    #[track_caller]
-    fn log_err_or_else<F>(self, default: F) -> T
-    where
-        F: FnOnce() -> T,
-    {
-        match self {
-            Ok(r) => r,
-            Err(e) => {
-                tracing::debug!("{e}");
-                default()
-            }
-        }
-    }
-
-    #[track_caller]
-    fn log_err_default(self) -> T
-    where
-        T: Default,
-    {
-        self.log_err_or_else(|| Default::default())
-    }
-}

crates/utils/src/lib.rs

@@ -14,3 +14,5 @@ mod tracing_util;
 pub use tracing_util::*;
 /// Re-execute the current process
 pub mod reexec;
+mod result_ext;
+pub use result_ext::*;

crates/utils/src/result_ext.rs

@@ -0,0 +1,35 @@
+/// Extension trait for Result types that provides logging capabilities
+pub trait ResultExt<T, E: std::fmt::Display> {
+    /// Return the Ok value unchanged.  In the err case, log it, and call the closure to compute the default
+    fn log_err_or_else<F>(self, default: F) -> T
+    where
+        F: FnOnce() -> T;
+    /// Return the Ok value unchanged.  In the err case, log it, and return the default value
+    fn log_err_default(self) -> T
+    where
+        T: Default;
+}
+
+impl<T, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
+    #[track_caller]
+    fn log_err_or_else<F>(self, default: F) -> T
+    where
+        F: FnOnce() -> T,
+    {
+        match self {
+            Ok(r) => r,
+            Err(e) => {
+                tracing::debug!("{e}");
+                default()
+            }
+        }
+    }
+
+    #[track_caller]
+    fn log_err_default(self) -> T
+    where
+        T: Default,
+    {
+        self.log_err_or_else(|| Default::default())
+    }
+}