Skip to content

Commit 6fe2e07

Browse files
committed
Inline entity manager and streamline the dispatcher code a bit
1 parent 169261a commit 6fe2e07

File tree

8 files changed

+1165
-162
lines changed

8 files changed

+1165
-162
lines changed

Cargo.lock

Lines changed: 2 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ iroh-base = "0.90"
4444
reflink-copy = "0.1.24"
4545
irpc = { version = "0.5.0", features = ["rpc", "quinn_endpoint_setup", "message_spans", "stream", "derive"], default-features = false }
4646
iroh-metrics = { version = "0.35" }
47-
entity-manager = { path = "../entity-manager" }
4847
atomic_refcell = "0.1.13"
4948

5049
[dev-dependencies]

src/api/proto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub use bitfield::Bitfield;
4040

4141
use crate::{store::util::Tag, util::temp_tag::TempTag, BlobFormat, Hash, HashAndFormat};
4242

43-
pub(crate) trait HashSpecific {
43+
pub(crate) trait HashSpecific: Send + 'static {
4444
fn hash(&self) -> Hash;
4545

4646
fn hash_short(&self) -> ArrayString<10> {

src/hash.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl From<&[u8; 32]> for Hash {
111111

112112
impl PartialOrd for Hash {
113113
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
114-
Some(self.0.as_bytes().cmp(other.0.as_bytes()))
114+
Some(self.cmp(other))
115115
}
116116
}
117117

0 commit comments

Comments
 (0)