Clean up dependencies (no functionality change) (#456)

Update entries in cas_client/cargo.toml that specifies dependencies from
crates.io to inheriting from the workspace. Also sort all dependency
entries.

Cargo.toml

@@ -46,15 +46,17 @@ countio = { version = "0.2", features = ["futures"] }
 crc32fast = "1.4"
 csv = "1"
 ctor = "0.4"
-derivative = "2.2.0"
+derivative = "2.2"
 dirs = "5.0"
 futures = "0.3"
 futures-util = "0.3"
 gearhash = "0.1"
 getrandom = "0.3"
 half = "2.4"
+heapify = "0.2"
 heed = "0.11"
 http = "1"
+hyper-util = "0.1"
 itertools = "0.14"
 jsonwebtoken = "9.3"
 lazy_static = "1.5"
@@ -63,34 +65,37 @@ lz4_flex = "0.11"
 mockall = "0.13"
 more-asserts = "0.3"
 once_cell = "1.20"
+oneshot = "0.1"
 pin-project = "1"
 prometheus = "0.14"
 rand = "0.9"
 rand_chacha = "0.9"
 rayon = "1.5"
 regex = "1"
+reqwest = { version = "0.12", features = ["json","stream","system-proxy"], default-features = false }
+reqwest-middleware = "0.4"
+reqwest-retry = "0.7"
 rustc-hash = "1.1"
 safe-transmute = "0.11"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_repr = "0.1"
 sha2 = "0.10"
+shellexpand = "3.1"
 static_assertions = "1.1"
 tempfile = "3.20"
 thiserror = "2.0"
 tokio = { version = "1.47" }
 tokio-retry = "0.3"
 tokio-util = { version = "0.7" }
+tower-service = "0.3"
 tracing = "0.1"
 ulid = "1.2"
-uuid = "1"
 url = "2.5"
+uuid = "1"
 walkdir = "2"
-web-time = "1.1.0"
+web-time = "1.1"
 whoami = "1"
-heapify = "0.2"
-shellexpand = "3.1.1"
-oneshot = "0.1.8"
 
 # windows
 winapi = { version = "0.3", features = [

cas_client/Cargo.toml

@@ -23,26 +23,21 @@ bytes = { workspace = true }
 derivative = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
+hyper-util = { workspace = true }
+lazy_static = { workspace = true }
 more-asserts = { workspace = true }
+reqwest = { workspace = true }
+reqwest-middleware = { workspace = true }
+reqwest-retry = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-retry = { workspace = true }
+tower-service = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
-lazy_static = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-
-reqwest-middleware = "0.4"
-reqwest-retry = "0.7"
-reqwest = { version = "0.12.22", features = [
-    "json",
-    "stream",
-    "system-proxy",
-], default-features = false }
-hyper-util = "0.1.10"
-tower-service = "0.3.3"
 
 # Reqwest -- uses different flags with different features.
 [features]

cas_object/Cargo.toml

@@ -20,7 +20,6 @@ mdb_shard = { path = "../mdb_shard" }
 merklehash = { path = "../merklehash" }
 utils = { path = "../utils" }
 
-more-asserts = { workspace = true }
 anyhow = { workspace = true }
 blake3 = { workspace = true }
 bytes = { workspace = true }
@@ -30,12 +29,13 @@ csv = { workspace = true }
 futures = { workspace = true }
 half = { workspace = true }
 lz4_flex = { workspace = true }
+more-asserts = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["time", "rt", "macros", "io-util"] }
-tracing = { workspace = true }
 tokio-util = { workspace = true, features = ["io"] }
+tracing = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = [

data/Cargo.toml

@@ -18,11 +18,11 @@ path = "src/bin/xtool.rs"
 cas_client = { path = "../cas_client" }
 cas_object = { path = "../cas_object" }
 cas_types = { path = "../cas_types" }
-merklehash = { path = "../merklehash" }
-mdb_shard = { path = "../mdb_shard" }
-parutils = { path = "../parutils" }
-error_printer = { path = "../error_printer" }
 deduplication = { path = "../deduplication" }
+error_printer = { path = "../error_printer" }
+mdb_shard = { path = "../mdb_shard" }
+merklehash = { path = "../merklehash" }
+parutils = { path = "../parutils" }
 progress_tracking = { path = "../progress_tracking" }
 utils = { path = "../utils" }
 xet_threadpool = { path = "../xet_threadpool" }

deduplication/Cargo.toml

@@ -10,9 +10,9 @@ progress_tracking = { path = "../progress_tracking" }
 utils = { path = "../utils" }
 
 async-trait = { workspace = true }
+bytes = { workspace = true }
 gearhash = { workspace = true }
 more-asserts = { workspace = true }
-bytes = { workspace = true }
 
 [dev-dependencies]
 rand = { workspace = true }

hf_xet/Cargo.toml

@@ -10,31 +10,29 @@ name = "hf_xet"
 crate-type = ["cdylib"]
 
 [dependencies]
+cas_client = { path = "../cas_client" }
 data = { path = "../data" }
 error_printer = { path = "../error_printer" }
 progress_tracking = { path = "../progress_tracking" }
 utils = { path = "../utils" }
 xet_threadpool = { path = "../xet_threadpool" }
-cas_client = { path = "../cas_client" }
 
 async-trait = "0.1"
 bipbuffer = "0.1"
 chrono = "0.4"
 itertools = "0.14"
 lazy_static = "1.5"
-
 pprof = { version = "0.14", features = [
     "flamegraph",
     "prost",
     "protobuf-codec",
 ], optional = true }
-
 pyo3 = { version = "0.23", features = [
     "extension-module",
     "abi3-py37",
     "auto-initialize",
 ] }
-
+rand = "0.9.2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tracing = "0.1"
@@ -44,7 +42,6 @@ tracing-subscriber = { version = "0.3", features = [
     "env-filter",
 ] }
 tracing-appender = "0.2"
-rand = "0.9.2"
 
 # Unix-specific dependencies
 [target.'cfg(unix)'.dependencies]

hf_xet_thin_wasm/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2024"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-wasm-bindgen = "0.2.100"
+deduplication = { path = "../deduplication" }
+mdb_shard = { path = "../mdb_shard" }
+merklehash = { path = "../merklehash" }
+
 serde = { version = "1.0.219", features = ["derive"] }
 serde-wasm-bindgen = "0.6.5"
-
-deduplication = { path = "../deduplication" }
-merklehash = { path = "../merklehash" }
-mdb_shard = { path = "../mdb_shard" }
+wasm-bindgen = "0.2.100"

hf_xet_wasm/Cargo.toml

@@ -16,12 +16,31 @@ merklehash = { path = "../merklehash" }
 progress_tracking = { path = "../progress_tracking" }
 utils = { path = "../utils" }
 
-wasm-bindgen = "0.2.100"
-wasm-bindgen-futures = "0.4.50"
+anyhow = "1"
+async-channel = "2.3.1"
+async-trait = "0.1.88"
+blake3 = "1.7.0"
+bytes = "1.10.1"
+console_error_panic_hook = "0.1.7"
+console_log = { version = "1.0.0", features = ["color"] }
+env_logger = "0.11.5"
+futures = "0.3.31"
+futures-io = "0.3.31"
+getrandom = { version = "0.3", features = ["wasm_js"] }
+js-sys = "0.3.72"
+log = "0.4.22"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.140"
+serde-wasm-bindgen = "0.6.5"
+sha2 = { version = "0.10.8", features = ["asm"] }
+thiserror = "2.0"
 tokio = { version = "1.44", features = ["sync", "rt"] }
 tokio_with_wasm = { version = "0.8.2", features = ["rt"] }
 tokio-stream = "0.1.17"
-futures-io = "0.3.31"
+uuid = { version = "1", features = ["v4", "js"] }
+wasm_thread = "0.3"
+wasm-bindgen = "0.2.100"
+wasm-bindgen-futures = "0.4.50"
 web-sys = { version = "0.3.72", features = [
     "File",
     "ReadableStream",
@@ -43,26 +62,6 @@ web-sys = { version = "0.3.72", features = [
     "RequestMode",
     "Response",
 ] }
-js-sys = "0.3.72"
-futures = "0.3.31"
-sha2 = { version = "0.10.8", features = ["asm"] }
-blake3 = "1.7.0"
-getrandom = { version = "0.3", features = ["wasm_js"] }
-wasm_thread = "0.3"
-log = "0.4.22"
-env_logger = "0.11.5"
-console_log = { version = "1.0.0", features = ["color"] }
-console_error_panic_hook = "0.1.7"
-async-trait = "0.1.88"
-thiserror = "2.0"
-async-channel = "2.3.1"
-anyhow = "1"
-serde_json = "1.0.140"
-serde = { version = "1.0.217", features = ["derive"] }
-serde-wasm-bindgen = "0.6.5"
-uuid = { version = "1", features = ["v4", "js"] }
-bytes = "1.10.1"
-
 
 [package.metadata.docs.rs]
 targets = ["wasm32-unknown-unknown"]

mdb_shard/Cargo.toml

@@ -15,6 +15,7 @@ bytes = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
 futures-util = { workspace = true }
+heapify = { workspace = true }
 itertools = { workspace = true }
 lazy_static = { workspace = true }
 rand = { workspace = true, features = ["small_rng"] }
@@ -25,7 +26,6 @@ tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
-heapify = { workspace = true }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 uuid = { workspace = true, features = ["v4", "js"] }

utils/Cargo.toml

@@ -17,10 +17,10 @@ ctor = { workspace = true }
 futures = { workspace = true }
 lazy_static = { workspace = true }
 pin-project = { workspace = true }
+shellexpand = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["time", "rt", "macros", "sync"] }
 tracing = { workspace = true }
-shellexpand = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
 tempfile = { workspace = true }

xet_threadpool/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2021"
 utils = { path = "../utils" }
 error_printer = { path = "../error_printer" }
 
+oneshot = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["time", "rt", "macros", "io-util"] }
 tracing = { workspace = true }
-oneshot = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread"] }