From 071a5325f9515e4be7b7230de0e274fea1a522d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Mon, 24 Feb 2025 18:20:17 -0500 Subject: [PATCH 1/2] chore: upgrade to `iroh@v0.33 --- Cargo.lock | 121 ++++++++++------------------------------------------- Cargo.toml | 5 +-- 2 files changed, 22 insertions(+), 104 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c8a901..d1bc544 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,7 +190,6 @@ dependencies = [ "instant", "pin-project-lite", "rand 0.8.5", - "tokio", ] [[package]] @@ -540,20 +539,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "data-encoding" version = "2.8.0" @@ -928,12 +913,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.31" @@ -1026,27 +1005,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" -[[package]] -name = "governor" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0746aa765db78b521451ef74221663b57ba595bf83f75d0ce23cc09447c8139f" -dependencies = [ - "cfg-if", - "dashmap", - "futures-sink", - "futures-timer", - "futures-util", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "portable-atomic", - "quanta", - "rand 0.8.5", - "smallvec", - "spinning_top", -] - [[package]] name = "h2" version = "0.3.26" @@ -1584,6 +1542,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -1606,14 +1567,16 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iroh" -version = "0.32.1" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#f640e835494c36b7715a275fd154b86272235bcb" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4ffd6af2e000f04972068c0318e0d8fa90ee9cfcb2bc6124db38591500e0278" dependencies = [ "aead", "anyhow", "atomic-waker", "backoff", "bytes", + "cfg_aliases", "concurrent-queue", "crypto_box", "data-encoding", @@ -1621,13 +1584,10 @@ dependencies = [ "derive_more", "ed25519-dalek", "futures-util", - "governor", "hickory-resolver", "http 1.2.0", - "http-body-util", - "hyper 1.6.0", - "hyper-util", "igd-next", + "instant", "iroh-base", "iroh-metrics", "iroh-net-report", @@ -1652,12 +1612,13 @@ dependencies = [ "strum", "stun-rs", "thiserror 2.0.11", + "time", "tokio", - "tokio-rustls", "tokio-stream", "tokio-util", "tracing", "url", + "wasm-bindgen-futures", "webpki-roots", "x509-parser", "z32", @@ -1665,8 +1626,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.32.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#f640e835494c36b7715a275fd154b86272235bcb" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "011d271a95b41218d22bdaf3352f29ef1dd7d6be644ca8543941655bec5f3d35" dependencies = [ "curve25519-dalek", "data-encoding", @@ -1700,8 +1662,9 @@ dependencies = [ [[package]] name = "iroh-net-report" -version = "0.32.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#f640e835494c36b7715a275fd154b86272235bcb" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2652f42eadc63458e36c0a422569f338639dc0b5bb469db0eb4a382b4e295c" dependencies = [ "anyhow", "bytes", @@ -1783,8 +1746,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.32.0" -source = "git+https://github.com/n0-computer/iroh.git?branch=main#f640e835494c36b7715a275fd154b86272235bcb" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c930ccc4dfd0196b531344e3d0f83a0f82c45b170406e04a2491cba571faec5b" dependencies = [ "anyhow", "bytes", @@ -2213,12 +2177,6 @@ dependencies = [ "libc", ] -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "no-std-net" version = "0.6.0" @@ -2235,12 +2193,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2713,21 +2665,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "quanta" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quic-rpc" version = "0.18.1" @@ -2918,15 +2855,6 @@ dependencies = [ "zerocopy 0.8.18", ] -[[package]] -name = "raw-cpuid" -version = "11.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e" -dependencies = [ - "bitflags 2.8.0", -] - [[package]] name = "rcgen" version = "0.13.2" @@ -3497,15 +3425,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spinning_top" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -dependencies = [ - "lock_api", -] - [[package]] name = "spki" version = "0.7.3" @@ -3787,6 +3706,7 @@ checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", + "js-sys", "num-conv", "powerfmt", "serde", @@ -3895,6 +3815,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 787b7a6..d661acc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ futures-lite = "2.3.0" futures-sink = "0.3.30" futures-util = { version = "0.3.30", features = ["sink"] } hyper = { version = "0.14.16", features = ["full"], optional = true } -iroh = { version = "0.32", optional = true } +iroh = { version = "0.33", optional = true } pin-project = "1" quinn = { package = "iroh-quinn", version = "0.13", optional = true } serde = { version = "1", features = ["derive"] } @@ -101,6 +101,3 @@ required-features = ["flume-transport"] [workspace] members = ["examples/split/types", "examples/split/server", "examples/split/client", "quic-rpc-derive"] - -[patch.crates-io] -iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" } From 7c29e5025652b3ed9feac81e8a0321a7b1cf026c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cramfox=E2=80=9D?= <“kasey@n0.computer”> Date: Mon, 24 Feb 2025 18:33:39 -0500 Subject: [PATCH 2/2] clippy --- src/transport/boxed.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transport/boxed.rs b/src/transport/boxed.rs index 8f4a886..b440fd5 100644 --- a/src/transport/boxed.rs +++ b/src/transport/boxed.rs @@ -61,7 +61,7 @@ impl Sink for SendSink { match self.project().0 { #[cfg(feature = "flume-transport")] SendSinkInner::Direct(sink) => sink.start_send_unpin(item).map_err(anyhow::Error::from), - SendSinkInner::Boxed(sink) => sink.start_send_unpin(item).map_err(anyhow::Error::from), + SendSinkInner::Boxed(sink) => sink.start_send_unpin(item), } }