Merge branch 'errors-with-sources' into mongo-embedded-testing

Author: palfrey

nativelink-error/src/lib.rs

@@ -220,7 +220,7 @@ impl From<serde_json5::Error> for Error {
                         msg
                     )
                 } else {
-                    make_err!(Code::Internal, "{}", msg)
+                    Self::new(Code::Internal, msg)
                 }
             }
         }
@@ -295,7 +295,7 @@ impl From<redis::RedisError> for Error {
 
 impl From<tonic::Status> for Error {
     fn from(status: tonic::Status) -> Self {
-        make_err!(status.code(), "{}", status.to_string())
+        Self::new(status.code(), status.to_string())
     }
 }
 
@@ -331,7 +331,7 @@ impl From<tokio::time::error::Elapsed> for Error {
 
 impl From<url::ParseError> for Error {
     fn from(err: url::ParseError) -> Self {
-        Self::from_std_err(Code::DeadlineExceeded, &err)
+        Self::from_std_err(Code::Internal, &err)
     }
 }
 

nativelink-error/tests/error_tests.rs

@@ -19,7 +19,7 @@ fn walkdir_source_error() {
             err.messages,
             vec![
                 os_error,
-                "IO error for operation on /bad/path: No such file or directory (os error 2)"
+                &format!("IO error for operation on /bad/path: {os_error}")
             ]
         );
     }