Skip to content

Commit a20ffd6

Browse files
committed
Merge branch 'main' into feat-multipath
2 parents cb1bd74 + e1456f9 commit a20ffd6

27 files changed

+552
-677
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ keywords = ["hashing", "quic", "blake3", "streaming"]
1212
rust-version = "1.85"
1313

1414
[dependencies]
15-
anyhow = "1.0.95"
1615
bao-tree = { version = "0.16", features = ["experimental-mixed", "tokio_fsm", "validate", "serde"], default-features = false }
1716
bytes = { version = "1", features = ["serde"] }
1817
derive_more = { version = "2.0.1", features = ["from", "try_from", "into", "debug", "display", "deref", "deref_mut"] }
1918
futures-lite = "2.6.0"
2019
quinn = { package = "iroh-quinn", version = "0.14.0", optional = true }
21-
n0-future = "0.3.1"
22-
n0-snafu = "0.2.2"
20+
n0-future = "0.3.0"
2321
range-collections = { version = "0.4.6", features = ["serde"] }
2422
smallvec = { version = "1", features = ["serde", "const_new"] }
25-
snafu = "0.8.5"
2623
tokio = { version = "1.43.0", default-features = false, features = ["sync"] }
2724
tracing = "0.1.41"
2825
iroh-io = "0.6.1"
@@ -32,7 +29,6 @@ serde = "1.0.217"
3229
postcard = { version = "1.1.1", features = ["experimental-derive", "use-std"] }
3330
data-encoding = "2.8.0"
3431
chrono = "0.4.39"
35-
nested_enum_utils = "0.2.1"
3632
ref-cast = "1.0.24"
3733
arrayvec = "0.7.6"
3834
iroh = { version = "0.95", default-features = false }
@@ -45,6 +41,7 @@ iroh-metrics = { version = "0.37" }
4541
redb = { version = "2.6.3", optional = true }
4642
reflink-copy = { version = "0.1.24", optional = true }
4743
n0-error = "0.1.2"
44+
nested_enum_utils = "0.2.3"
4845

4946
[dev-dependencies]
5047
clap = { version = "4.5.31", features = ["derive"] }
@@ -63,6 +60,7 @@ atomic_refcell = "0.1.13"
6360
iroh = { version = "0.95", features = ["discovery-local-network"]}
6461
async-compression = { version = "0.4.30", features = ["lz4", "tokio"] }
6562
concat_const = "0.2.0"
63+
anyhow = "1.0.100"
6664

6765
[build-dependencies]
6866
cfg_aliases = "0.2.1"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async fn main() -> anyhow::Result<()> {
4545
// create a protocol handler using an in-memory blob store.
4646
let store = MemStore::new();
4747
let tag = store.add_slice(b"Hello world").await?;
48-
48+
4949
let _ = endpoint.online().await;
5050
let addr = endpoint.addr();
5151
let ticket = BlobTicket::new(addr, tag.hash, tag.format);
@@ -86,4 +86,4 @@ at your option.
8686

8787
Unless you explicitly state otherwise, any contribution intentionally submitted
8888
for inclusion in this project by you, as defined in the Apache-2.0 license,
89-
shall be dual licensed as above, without any additional terms or conditions.
89+
shall be dual licensed as above, without any additional terms or conditions.

0 commit comments

Comments
 (0)