revert a few changes to minimize the diff

Author: rklaehn

Cargo.lock

@@ -44,7 +44,6 @@ iroh-base = "0.90"
 reflink-copy = "0.1.24"
 irpc = { version = "0.5.0", features = ["rpc", "quinn_endpoint_setup", "message_spans", "stream", "derive"], default-features = false }
 iroh-metrics = { version = "0.35" }
-atomic_refcell = "0.1.13"
 
 [dev-dependencies]
 clap = { version = "4.5.31", features = ["derive"] }
@@ -59,6 +58,7 @@ testresult = "0.4.1"
 tracing-subscriber = { version = "0.3.19", features = ["fmt"] }
 tracing-test = "0.2.5"
 walkdir = "2.5.0"
+atomic_refcell = "0.1.13"
 
 [features]
 hide-proto-docs = []

Cargo.toml

@@ -40,7 +40,7 @@ pub use bitfield::Bitfield;
 
 use crate::{store::util::Tag, util::temp_tag::TempTag, BlobFormat, Hash, HashAndFormat};
 
-pub(crate) trait HashSpecific: Send + 'static {
+pub(crate) trait HashSpecific {
     fn hash(&self) -> Hash;
 
     fn hash_short(&self) -> ArrayString<10> {

src/api/proto.rs

@@ -639,7 +639,7 @@ impl Actor {
     }
 }
 
-trait HashSpecificCommand: HashSpecific {
+trait HashSpecificCommand: HashSpecific + Send + 'static {
     fn handle(self, ctx: HashContext) -> impl Future<Output = ()> + Send + 'static;
 
     fn on_error(self) -> impl Future<Output = ()> + Send + 'static;

src/store/fs.rs

@@ -304,11 +304,7 @@ mod tests {
             assert!(data_path.exists());
             assert!(outboard_path.exists());
             assert!(sizes_path.exists());
-            assert!(
-                bitfield_path.exists(),
-                "Bitfield file {} should exist",
-                bitfield_path.display()
-            );
+            assert!(bitfield_path.exists());
             gc_run_once(store, &mut live).await?;
             assert!(!data_path.exists());
             assert!(!outboard_path.exists());