From 68465309b8b1a814916fd0de01648b662461cdbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2026 20:43:13 +0000 Subject: [PATCH 1/2] chore(deps): update kio requirement Updates the requirements on [kio](https://github.com/moq-dev/moq) to permit the latest version. Updates `kio` to 0.6.2 - [Release notes](https://github.com/moq-dev/moq/releases) - [Commits](https://github.com/moq-dev/moq/compare/kio-v0.5.4...kio-v0.6.2) --- updated-dependencies: - dependency-name: kio dependency-version: 0.6.1 dependency-type: direct:production dependency-group: cargo ... Signed-off-by: dependabot[bot] --- rs/web-transport-iroh/Cargo.toml | 2 +- rs/web-transport-noq/Cargo.toml | 2 +- rs/web-transport-quiche/Cargo.toml | 2 +- rs/web-transport-quinn/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rs/web-transport-iroh/Cargo.toml b/rs/web-transport-iroh/Cargo.toml index fcf31cad..aae03f72 100644 --- a/rs/web-transport-iroh/Cargo.toml +++ b/rs/web-transport-iroh/Cargo.toml @@ -22,7 +22,7 @@ qlog = ["iroh/qlog"] bytes = "1" http = "1" iroh = { version = "1", default-features = false, features = ["fast-apple-datapath"] } -kio = "0.5.4" +kio = "0.6.2" n0-error = "1" n0-future = "0.3.1" tokio = { version = "1", default-features = false, features = [ diff --git a/rs/web-transport-noq/Cargo.toml b/rs/web-transport-noq/Cargo.toml index 2b711b9c..158ff36f 100644 --- a/rs/web-transport-noq/Cargo.toml +++ b/rs/web-transport-noq/Cargo.toml @@ -26,7 +26,7 @@ qlog = ["noq/qlog"] bytes = "1" futures = "0.3" http = "1" -kio = "0.5.4" +kio = "0.6.2" noq = { version = "1", default-features = false, features = [ "tracing-log", "platform-verifier", diff --git a/rs/web-transport-quiche/Cargo.toml b/rs/web-transport-quiche/Cargo.toml index 3a676eaf..6d5f6372 100644 --- a/rs/web-transport-quiche/Cargo.toml +++ b/rs/web-transport-quiche/Cargo.toml @@ -26,7 +26,7 @@ bytes = "1" flume = "0.12" futures = "0.3" http = "1" -kio = "0.5.4" +kio = "0.6.2" rustls-pki-types = "1" thiserror = "2" diff --git a/rs/web-transport-quinn/Cargo.toml b/rs/web-transport-quinn/Cargo.toml index 0688a791..1577df17 100644 --- a/rs/web-transport-quinn/Cargo.toml +++ b/rs/web-transport-quinn/Cargo.toml @@ -26,7 +26,7 @@ qlog = ["quinn/qlog"] bytes = "1" futures = "0.3" http = "1" -kio = "0.5.4" +kio = "0.6.2" quinn = { version = "0.11", default-features = false, features = [ "platform-verifier", From 201639868438d4b76e13bc446b435d949a18622c Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Wed, 14 Oct 2026 14:52:53 -0700 Subject: [PATCH 2/2] fix(quiche): box the open_bi header state for kio 0.6 kio 0.6 added a 64-byte registration record to Waiter, so every ez::SendStream and ez::RecvStream (each carrying a Parked) grew. That pushed OpenBi::Header past clippy's large_enum_variant threshold. Box the stream pair so idle session clones stay small. Co-Authored-By: Claude Opus 5.5 --- rs/web-transport-quiche/src/connection.rs | 34 +++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/rs/web-transport-quiche/src/connection.rs b/rs/web-transport-quiche/src/connection.rs index c3a1e87a..e08508b7 100644 --- a/rs/web-transport-quiche/src/connection.rs +++ b/rs/web-transport-quiche/src/connection.rs @@ -112,11 +112,15 @@ enum OpenUni { enum OpenBi { #[default] Idle, - Header { - send: ez::SendStream, - recv: ez::RecvStream, - offset: usize, - }, + /// Streams taken, header partially written. Boxed because a stream pair is + /// several times larger than `Idle`, which every session clone carries. + Header(Box), +} + +struct OpenBiHeader { + send: ez::SendStream, + recv: ez::RecvStream, + offset: usize, } impl Clone for OpenUni { @@ -923,24 +927,26 @@ impl web_transport_trait::poll::Session for Connection { match &mut self.open_bi { OpenBi::Idle => { let (send, recv) = ready!(self.conn.poll_open_bi(waiter))?; - self.open_bi = OpenBi::Header { + self.open_bi = OpenBi::Header(Box::new(OpenBiHeader { send, recv, offset: 0, - }; + })); } - OpenBi::Header { send, offset, .. } => { - while *offset < self.header_bi.len() { - let size = ready!(send.poll_write(waiter, &self.header_bi[*offset..])) - .map_err(SessionError::Header)?; - *offset += size; + OpenBi::Header(header) => { + while header.offset < self.header_bi.len() { + let size = ready!(header + .send + .poll_write(waiter, &self.header_bi[header.offset..])) + .map_err(SessionError::Header)?; + header.offset += size; } - let OpenBi::Header { send, recv, .. } = - std::mem::replace(&mut self.open_bi, OpenBi::Idle) + let OpenBi::Header(header) = std::mem::replace(&mut self.open_bi, OpenBi::Idle) else { unreachable!("checked above"); }; + let OpenBiHeader { send, recv, .. } = *header; return Poll::Ready(Ok((SendStream::new(send), RecvStream::new(recv)))); }