Drop xet_error. (#134)

xet_error was a source drop of thiserror with integrated logging and the ability to put in a breakpoint to note exception propagation. However, the benefits of maintaining a source drop with changes, at least on client side, are less clear in the current ecosystem and with upgrades to the thiserror package (e.g. better integrated stacktracing). This PR removes xet_error and reverts everything back to the original thiserror implementation.
huggingface · Jan 9, 2025 · 196e8c8 · 196e8c8
1 parent d88a88a
commit 196e8c8
Show file tree

Hide file tree

Showing 139 changed files with 85 additions and 5,565 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,6 @@ members = [
     "parutils",
     "progress_reporting",
     "utils",
-    "xet_error",
     "cas_object",
     "cas_types",
     "chunk_cache",

diff --git a/README.md b/README.md
@@ -21,7 +21,6 @@ Xet-core is the repo responsible for Rust-based code running on the client machi
 * [parutils](src/parutils): Provides parallel execution utilities relying on Tokio (ex. parallel foreach).
 * [progress_reporting](src/progress_reporting): offers ReportedWriter so progress for Writer operations can be displayed.
 * [utils](src/utils): general utilities - **unclear how much is currently in use**
-* [xet_error](src/xet_error): Error utility crate, widely used for anyhow! logging in other crates.
 
 ## Local Development
 

diff --git a/cas_client/Cargo.toml b/cas_client/Cargo.toml
@@ -18,7 +18,7 @@ utils = { path = "../utils" }
 merkledb = { path = "../merkledb" }
 mdb_shard = { path = "../mdb_shard" }
 merklehash = { path = "../merklehash" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 tokio = { version = "1.41", features = ["full"] }
 async-trait = "0.1.9"
 anyhow = "1"

diff --git a/cas_client/src/error.rs b/cas_client/src/error.rs
@@ -1,5 +1,5 @@
 use merklehash::MerkleHash;
-use xet_error::Error;
+use thiserror::Error;
 
 #[non_exhaustive]
 #[derive(Error, Debug)]

diff --git a/cas_object/Cargo.toml b/cas_object/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 error_printer = { path = "../error_printer" }
 merkledb = { path = "../merkledb" }
 merklehash = { path = "../merklehash" }

diff --git a/cas_object/src/error.rs b/cas_object/src/error.rs
@@ -1,7 +1,7 @@
 use std::convert::Infallible;
 
+use thiserror::Error;
 use tracing::warn;
-use xet_error::Error;
 
 #[non_exhaustive]
 #[derive(Error, Debug)]

diff --git a/cas_types/Cargo.toml b/cas_types/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 merklehash = { path = "../merklehash" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 serde = { version = "1.0.208", features = ["derive"] }
 serde_repr = "0.1.19"
diff --git a/cas_types/src/error.rs b/cas_types/src/error.rs
@@ -1,4 +1,4 @@
-use xet_error::Error;
+use thiserror::Error;
 
 #[non_exhaustive]
 #[derive(Error, Debug)]

diff --git a/chunk_cache/Cargo.toml b/chunk_cache/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 cas_types = { path = "../cas_types" }
 merklehash = { path = "../merklehash" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 error_printer = { path = "../error_printer" }
 file_utils = { path = "../file_utils" }
 utils = { path = "../utils" }

diff --git a/chunk_cache/src/error.rs b/chunk_cache/src/error.rs
@@ -3,7 +3,7 @@ use std::str::Utf8Error;
 
 use base64::DecodeError;
 use merklehash::DataHashBytesParseError;
-use xet_error::Error;
+use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum ChunkCacheError {

diff --git a/chunk_cache_bench/Cargo.lock b/chunk_cache_bench/Cargo.lock
diff --git a/data/Cargo.toml b/data/Cargo.toml
@@ -21,7 +21,7 @@ utils = { path = "../utils" }
 parutils = { path = "../parutils" }
 file_utils = { path = "../file_utils" }
 error_printer = { path = "../error_printer" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 tokio = { version = "1.36", features = ["full"] }
 anyhow = "1"
 tracing = "0.1.*"

diff --git a/data/src/errors.rs b/data/src/errors.rs
@@ -4,8 +4,9 @@ use std::sync::mpsc::RecvError;
 use cas_client::CasClientError;
 use mdb_shard::error::MDBShardError;
 use merkledb::error::MerkleDBError;
+use thiserror::Error;
+use tracing::error;
 use utils::errors::{AuthError, SingleflightError};
-use xet_error::Error;
 
 #[derive(Error, Debug)]
 pub enum DataProcessingError {
@@ -79,7 +80,7 @@ pub type Result<T> = std::result::Result<T, DataProcessingError>;
 impl From<SingleflightError<DataProcessingError>> for DataProcessingError {
     fn from(value: SingleflightError<DataProcessingError>) -> Self {
         let msg = format!("{value:?}");
-        xet_error::error_hook(&msg);
+        error!("{msg}");
         match value {
             SingleflightError::InternalError(e) => e,
             _ => DataProcessingError::InternalError(format!("SingleflightError: {msg}")),

diff --git a/hf_xet/Cargo.lock b/hf_xet/Cargo.lock
diff --git a/mdb_shard/Cargo.toml b/mdb_shard/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 merklehash = { path = "../merklehash" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 utils = { path = "../utils" }
 tempdir = "0.3.7"
 tokio = { version = "1.36", features = ["full"] }

diff --git a/mdb_shard/src/error.rs b/mdb_shard/src/error.rs
@@ -1,7 +1,7 @@
 use std::io;
 
 use merklehash::MerkleHash;
-use xet_error::Error;
+use thiserror::Error;
 
 #[non_exhaustive]
 #[derive(Error, Debug)]

diff --git a/merkledb/Cargo.toml b/merkledb/Cargo.toml
@@ -10,7 +10,7 @@ doctest = false
 
 [dependencies]
 merklehash = { path = "../merklehash" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 parutils = { path = "../parutils" }
 rand = "0.8.5"
 rand_core = "0.6.3"

diff --git a/merkledb/src/error.rs b/merkledb/src/error.rs
@@ -1,6 +1,6 @@
 use std::io;
 
-use xet_error::Error;
+use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum MerkleDBError {

diff --git a/utils/Cargo.toml b/utils/Cargo.toml
@@ -9,7 +9,7 @@ path = "src/lib.rs"
 
 [dependencies]
 merklehash = { path = "../merklehash" }
-xet_error = { path = "../xet_error" }
+thiserror = "2.0"
 futures = "0.3.28"
 
 # singleflight & threadpool

diff --git a/utils/src/errors.rs b/utils/src/errors.rs
@@ -1,4 +1,4 @@
-use xet_error::Error;
+use thiserror::Error;
 
 #[derive(Debug, Error)]
 #[non_exhaustive]

diff --git a/utils/src/threadpool.rs b/utils/src/threadpool.rs
@@ -3,6 +3,7 @@ use std::future::Future;
 use std::sync::atomic::Ordering::SeqCst;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
+use thiserror::Error;
 /// This module provides a simple wrapper around Tokio's runtime to create a thread pool
 /// with some default settings. It is intended to be used as a singleton thread pool for
 /// the entire application.
@@ -52,7 +53,6 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use tokio;
 use tokio::task::{JoinError, JoinHandle};
 use tracing::{debug, error};
-use xet_error::Error;
 
 const THREADPOOL_NUM_WORKER_THREADS: usize = 4; // 4 active threads
 const THREADPOOL_THREAD_ID_PREFIX: &str = "hf-xet"; // thread names will be hf-xet-0, hf-xet-1, etc.

diff --git a/xet_error/.github/workflows/ci.yml b/xet_error/.github/workflows/ci.yml