Add sources to auto error conversion

Author: palfrey

nativelink-error/BUILD.bazel

@@ -4,6 +4,7 @@ load(
     "rust_doc_test",
     "rust_library",
     "rust_test",
+    "rust_test_suite",
 )
 
 rust_library(
@@ -29,6 +30,18 @@ rust_library(
     ],
 )
 
+rust_test_suite(
+    name = "integration",
+    timeout = "short",
+    srcs = [
+        "tests/error_tests.rs",
+    ],
+    deps = [
+        "//nativelink-error",
+        "@crates//:walkdir",
+    ],
+)
+
 rust_test(
     name = "unit_test",
     timeout = "short",

nativelink-error/Cargo.toml

@@ -5,7 +5,6 @@ lints.workspace = true
 autobenches = false
 autobins = false
 autoexamples = false
-autotests = false
 edition = "2024"
 name = "nativelink-error"
 version = "1.0.0-rc4"

nativelink-error/src/lib.rs

@@ -83,6 +83,17 @@ impl Error {
         }
     }
 
+    #[must_use]
+    pub fn from_std_err(code: Code, mut err: &dyn core::error::Error) -> Self {
+        let mut messages = vec![format!("{err}")];
+        while let Some(src) = err.source() {
+            messages.push(format!("{src}"));
+            err = src;
+        }
+        messages.reverse();
+        Self::new_with_messages(code, messages)
+    }
+
     #[inline]
     #[must_use]
     pub fn append<S: Into<String>>(mut self, msg: S) -> Self {
@@ -162,37 +173,37 @@ impl core::fmt::Display for Error {
 
 impl From<prost::DecodeError> for Error {
     fn from(err: prost::DecodeError) -> Self {
-        make_err!(Code::Internal, "{}", err.to_string())
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<prost::EncodeError> for Error {
     fn from(err: prost::EncodeError) -> Self {
-        make_err!(Code::Internal, "{}", err.to_string())
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<prost::UnknownEnumValue> for Error {
     fn from(err: prost::UnknownEnumValue) -> Self {
-        make_err!(Code::Internal, "{}", err.to_string())
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<core::num::TryFromIntError> for Error {
     fn from(err: core::num::TryFromIntError) -> Self {
-        make_err!(Code::InvalidArgument, "{}", err.to_string())
+        Self::from_std_err(Code::InvalidArgument, &err)
     }
 }
 
 impl From<tokio::task::JoinError> for Error {
     fn from(err: tokio::task::JoinError) -> Self {
-        make_err!(Code::Internal, "{}", err.to_string())
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl<T> From<PoisonError<MutexGuard<'_, T>>> for Error {
     fn from(err: PoisonError<MutexGuard<'_, T>>) -> Self {
-        make_err!(Code::Internal, "{}", err.to_string())
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
@@ -218,7 +229,7 @@ impl From<serde_json5::Error> for Error {
 
 impl From<core::num::ParseIntError> for Error {
     fn from(err: core::num::ParseIntError) -> Self {
-        make_err!(Code::InvalidArgument, "{}", err.to_string())
+        Self::from_std_err(Code::InvalidArgument, &err)
     }
 }
 
@@ -231,19 +242,19 @@ impl From<core::convert::Infallible> for Error {
 
 impl From<TimestampError> for Error {
     fn from(err: TimestampError) -> Self {
-        make_err!(Code::InvalidArgument, "{}", err)
+        Self::from_std_err(Code::InvalidArgument, &err)
     }
 }
 
 impl From<AcquireError> for Error {
     fn from(err: AcquireError) -> Self {
-        make_err!(Code::Internal, "{}", err)
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<Utf8Error> for Error {
     fn from(err: Utf8Error) -> Self {
-        make_err!(Code::Internal, "{}", err)
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
@@ -295,32 +306,32 @@ impl From<Error> for tonic::Status {
 }
 
 impl From<walkdir::Error> for Error {
-    fn from(value: walkdir::Error) -> Self {
-        Self::new(Code::Internal, value.to_string())
+    fn from(err: walkdir::Error) -> Self {
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<uuid::Error> for Error {
-    fn from(value: uuid::Error) -> Self {
-        Self::new(Code::Internal, value.to_string())
+    fn from(err: uuid::Error) -> Self {
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<rustls_pki_types::pem::Error> for Error {
-    fn from(value: rustls_pki_types::pem::Error) -> Self {
-        Self::new(Code::Internal, value.to_string())
+    fn from(err: rustls_pki_types::pem::Error) -> Self {
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 
 impl From<tokio::time::error::Elapsed> for Error {
-    fn from(value: tokio::time::error::Elapsed) -> Self {
-        Self::new(Code::DeadlineExceeded, value.to_string())
+    fn from(err: tokio::time::error::Elapsed) -> Self {
+        Self::from_std_err(Code::DeadlineExceeded, &err)
     }
 }
 
 impl From<url::ParseError> for Error {
-    fn from(value: url::ParseError) -> Self {
-        Self::new(Code::Internal, value.to_string())
+    fn from(err: url::ParseError) -> Self {
+        Self::from_std_err(Code::DeadlineExceeded, &err)
     }
 }
 

nativelink-error/tests/error_tests.rs

@@ -0,0 +1,16 @@
+use nativelink_error::Error;
+use walkdir::WalkDir;
+
+#[test]
+fn walkdir_source_error() {
+    for entry in WalkDir::new("/bad/path") {
+        let err: Error = entry.unwrap_err().into();
+        assert_eq!(
+            err.messages,
+            vec![
+                "No such file or directory (os error 2)",
+                "IO error for operation on /bad/path: No such file or directory (os error 2)"
+            ]
+        );
+    }
+}