From a9978e7b365cf12dfa3d25012f104b3f0a5e00e0 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Wed, 14 Oct 2026 20:31:49 -0700 Subject: [PATCH 1/2] fix(ci): quote the clippy-driver path so Windows tests run `just rs test` interpolated `require("clippy-driver")` unquoted, so bash stripped the backslashes from the Windows path and cargo could not find the wrapper. Quote it with just's `quote()`, as the other recipes do, and the same for `test/justfile`'s `justfile()` path. With the wrapper working, `CARGO_BUILD_WARNINGS=deny` also caught two moq-tokio test helpers that only the unix socket test uses; gate them to that test's cfg. Co-Authored-By: Claude Opus 5.5 --- rs/justfile | 2 +- rs/moq-tokio/src/server.rs | 2 ++ test/justfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rs/justfile b/rs/justfile index 9933309d3e8..bd463e0354a 100644 --- a/rs/justfile +++ b/rs/justfile @@ -255,7 +255,7 @@ media-features: # Run the test suite and enforce clippy findings from the same compile. [positional-arguments] test *args: - CARGO_BUILD_WARNINGS=deny RUSTC_WORKSPACE_WRAPPER={{ require("clippy-driver") }} bash sh/rs/nextest.sh cargo nextest run --locked --all-targets "$@" + CARGO_BUILD_WARNINGS=deny RUSTC_WORKSPACE_WRAPPER={{ quote(require("clippy-driver")) }} bash sh/rs/nextest.sh cargo nextest run --locked --all-targets "$@" # Exercise the ignored hardware tests for every GPU vendor on this Linux host. gpu: diff --git a/rs/moq-tokio/src/server.rs b/rs/moq-tokio/src/server.rs index 68c21da7c07..f6fb78cfe83 100644 --- a/rs/moq-tokio/src/server.rs +++ b/rs/moq-tokio/src/server.rs @@ -1878,11 +1878,13 @@ mod tests { } /// A millisecond track: the frames written here carry timestamps. + #[cfg(all(feature = "uds", unix))] fn timed() -> moq_net::track::Info { moq_net::track::Info::default().with_timescale(moq_net::Timescale::MILLI) } /// The next route and whether it is active. + #[cfg(all(feature = "uds", unix))] async fn next_update(announced: &mut moq_net::announce::Consumer) -> Option<(moq_net::announce::Announce, bool)> { match announced.next().await? { moq_net::announce::Event::Start(route) diff --git a/test/justfile b/test/justfile index 2260d37daf6..33695451923 100644 --- a/test/justfile +++ b/test/justfile @@ -15,7 +15,7 @@ set working-directory := '.' # List the cross-language suites. default: - @just --justfile {{ justfile() }} --list test + @just --justfile {{ quote(justfile()) }} --list test # Port isolation across private temp roots and keyboard activation under a canvas. # The browser check is not `*.test.ts`: plain `bun test` runs lack Playwright Chromium, From a2af7783c6fcf5acc75a11144ac34abf6b7ddbaa Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Wed, 14 Oct 2026 20:55:21 -0700 Subject: [PATCH 2/2] fix(tokio): box the KeyMismatch source so Windows clippy passes Two PathBufs are 64 bytes on Windows, so KeyMismatch reached 128 bytes and clippy's result_large_err fired on every Result<_, tls::Error>, which CARGO_BUILD_WARNINGS=deny turns into a build failure. Co-Authored-By: Claude Opus 5.5 --- rs/moq-tokio/src/tls.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rs/moq-tokio/src/tls.rs b/rs/moq-tokio/src/tls.rs index 2907b96665f..79f56ecef66 100644 --- a/rs/moq-tokio/src/tls.rs +++ b/rs/moq-tokio/src/tls.rs @@ -132,9 +132,10 @@ pub enum Error { key: PathBuf, /// Path of the certificate file it was paired with. cert: PathBuf, - /// Why rustls says the two don't match. + /// Why rustls says the two don't match. Boxed since the paths are + /// larger on Windows, where unboxed it trips clippy's `result_large_err`. #[source] - source: rustls::Error, + source: Box, }, /// A rustls error with no more specific context, e.g. building a config. @@ -3072,7 +3073,7 @@ impl ServeCerts { certified.rustls.keys_match().map_err(|source| Error::KeyMismatch { key: key_path.to_path_buf(), cert: chain_path.to_path_buf(), - source, + source: Box::new(source), })?; Ok(certified)