From ccb4cd6d257faf126b0fb9737bdbd2aa92b65cc4 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Tue, 27 Oct 2026 18:48:53 -0700 Subject: [PATCH 01/11] chore(quest): claim quest/m0/ci/hakari.md Quest-Claim: c9386df8a93a7f8a From 765c26572270038f0f96af73f76781433f866867 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Tue, 27 Oct 2026 20:31:42 -0700 Subject: [PATCH 02/11] ci: unify dependency features with a cargo-hakari workspace-hack Co-Authored-By: Claude Opus 5.5 --- .config/hakari.toml | 33 ++ Cargo.lock | 241 +++++++++++++ demo/carla/bridge/Cargo.toml | 3 + flake.nix | 2 + rs/hang/Cargo.toml | 1 + rs/justfile | 8 +- rs/libmoq/Cargo.toml | 3 + rs/moq-archive/Cargo.toml | 1 + rs/moq-auth/Cargo.toml | 1 + rs/moq-bench/Cargo.toml | 1 + rs/moq-boy/Cargo.toml | 1 + rs/moq-c/Cargo.toml | 1 + rs/moq-cli/Cargo.toml | 1 + rs/moq-clock/macros/Cargo.toml | 3 + rs/moq-congestion/Cargo.toml | 1 + rs/moq-e2ee/Cargo.toml | 1 + rs/moq-ffi/Cargo.toml | 1 + rs/moq-flate/Cargo.toml | 1 + rs/moq-gst/Cargo.toml | 1 + rs/moq-hls/Cargo.toml | 1 + rs/moq-ice/Cargo.toml | 1 + rs/moq-json/Cargo.toml | 1 + rs/moq-loc/Cargo.toml | 3 + rs/moq-msf/Cargo.toml | 3 + rs/moq-mux/Cargo.toml | 1 + rs/moq-native/Cargo.toml | 3 + rs/moq-net-tests/Cargo.toml | 1 + rs/moq-nvenc/Cargo.toml | 3 + rs/moq-pattern/Cargo.toml | 1 + rs/moq-relay/Cargo.toml | 1 + rs/moq-room/Cargo.toml | 1 + rs/moq-rtc/Cargo.toml | 1 + rs/moq-rtmp/Cargo.toml | 1 + rs/moq-rtsp/Cargo.toml | 1 + rs/moq-scene/Cargo.toml | 1 + rs/moq-shaper/Cargo.toml | 1 + rs/moq-sock/Cargo.toml | 1 + rs/moq-srt/Cargo.toml | 1 + rs/moq-stats/Cargo.toml | 1 + rs/moq-studio/Cargo.toml | 1 + rs/moq-uring/Cargo.toml | 1 + rs/moq-v4l/Cargo.toml | 3 + rs/moq-wasm/Cargo.toml | 1 + rs/qmux/Cargo.toml | 1 + rs/test-env/Cargo.toml | 3 + rs/uniffi-bindgen/Cargo.toml | 3 + rs/workspace-hack/.gitattributes | 4 + rs/workspace-hack/Cargo.toml | 561 +++++++++++++++++++++++++++++++ rs/workspace-hack/build.rs | 2 + rs/workspace-hack/src/lib.rs | 1 + sh/rs/hakari.py | 56 +++ 51 files changed, 968 insertions(+), 2 deletions(-) create mode 100644 .config/hakari.toml create mode 100644 rs/workspace-hack/.gitattributes create mode 100644 rs/workspace-hack/Cargo.toml create mode 100644 rs/workspace-hack/build.rs create mode 100644 rs/workspace-hack/src/lib.rs create mode 100755 sh/rs/hakari.py diff --git a/.config/hakari.toml b/.config/hakari.toml new file mode 100644 index 00000000000..693ab4f27c9 --- /dev/null +++ b/.config/hakari.toml @@ -0,0 +1,33 @@ +# This file contains settings for `cargo hakari`. +# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options. + +hakari-package = "workspace-hack" + +# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above. +dep-format-version = "4" + +# Setting workspace.resolver = "2" or higher in the root Cargo.toml is HIGHLY recommended. +# Hakari works much better with the v2 resolver. (The v2 and v3 resolvers are identical from +# hakari's perspective, so you're welcome to set either.) +# +# For more about the new feature resolver, see: +# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver +resolver = "2" + +# Add triples corresponding to platforms commonly used by developers here. +# https://doc.rust-lang.org/rustc/platform-support.html +platforms = [ + "aarch64-apple-darwin", + "aarch64-unknown-linux-gnu", + "x86_64-pc-windows-msvc", + "x86_64-unknown-linux-gnu", +] + +# Write out exact versions rather than a semver range. (Defaults to false.) +# exact-versions = true + +[traversal-excludes] +workspace-members = ["moq-net-fuzz", "moq-quic-fuzz"] + +[final-excludes] +workspace-members = ["kio", "moq-audio", "moq-clock", "moq-net", "moq-quic", "moq-tokio", "moq-transcode", "moq-video"] diff --git a/Cargo.lock b/Cargo.lock index f0823c5d7cc..7b12c8e93d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3580,6 +3580,7 @@ dependencies = [ "tokio", "tracing", "url", + "workspace-hack", ] [[package]] @@ -4701,6 +4702,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libmoq" version = "0.6.12" +dependencies = [ + "workspace-hack", +] [[package]] name = "libredox" @@ -5018,6 +5022,7 @@ dependencies = [ "thiserror 2.0.21", "tokio", "tracing", + "workspace-hack", ] [[package]] @@ -5085,6 +5090,7 @@ dependencies = [ "tracing", "url", "wiremock", + "workspace-hack", ] [[package]] @@ -5127,6 +5133,7 @@ dependencies = [ "toml 1.1.6+spec-1.1.0", "tracing", "usage-rs", + "workspace-hack", ] [[package]] @@ -5148,6 +5155,7 @@ dependencies = [ "tokio", "tracing", "usage-rs", + "workspace-hack", ] [[package]] @@ -5174,6 +5182,7 @@ dependencies = [ "tokio", "tracing", "url", + "workspace-hack", ] [[package]] @@ -5189,6 +5198,7 @@ dependencies = [ "parking_lot", "pollster", "tracing", + "workspace-hack", ] [[package]] @@ -5239,6 +5249,7 @@ dependencies = [ "usage-rs", "vt100", "winit", + "workspace-hack", ] [[package]] @@ -5261,6 +5272,9 @@ dependencies = [ [[package]] name = "moq-clock-macros" version = "0.1.0" +dependencies = [ + "workspace-hack", +] [[package]] name = "moq-congestion" @@ -5271,6 +5285,7 @@ dependencies = [ "rand 0.10.3", "rand_pcg", "stats_alloc", + "workspace-hack", ] [[package]] @@ -5287,6 +5302,7 @@ dependencies = [ "serde_json", "thiserror 2.0.21", "tokio", + "workspace-hack", "zeroize", ] @@ -5317,6 +5333,7 @@ dependencies = [ "web-async", "web-transport-trait", "web-transport-wasm", + "workspace-hack", ] [[package]] @@ -5330,6 +5347,7 @@ dependencies = [ "moq-net", "thiserror 2.0.21", "tracing", + "workspace-hack", ] [[package]] @@ -5354,6 +5372,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", + "workspace-hack", ] [[package]] @@ -5386,6 +5405,7 @@ dependencies = [ "tracing", "tracing-test", "url", + "workspace-hack", ] [[package]] @@ -5398,6 +5418,7 @@ dependencies = [ "thiserror 2.0.21", "tokio", "tracing", + "workspace-hack", ] [[package]] @@ -5417,6 +5438,7 @@ dependencies = [ "serde_path_to_error", "thiserror 2.0.21", "tracing", + "workspace-hack", ] [[package]] @@ -5426,6 +5448,7 @@ dependencies = [ "bytes", "moq-net", "thiserror 2.0.21", + "workspace-hack", ] [[package]] @@ -5435,6 +5458,7 @@ dependencies = [ "serde", "serde_json", "serde_with", + "workspace-hack", ] [[package]] @@ -5477,11 +5501,15 @@ dependencies = [ "tracing-test", "url", "webm-iterable", + "workspace-hack", ] [[package]] name = "moq-native" version = "0.20.0" +dependencies = [ + "workspace-hack", +] [[package]] name = "moq-net" @@ -5532,6 +5560,7 @@ dependencies = [ "moq-net", "serde_json", "tokio", + "workspace-hack", ] [[package]] @@ -5541,6 +5570,7 @@ dependencies = [ "cudarc", "libloading 0.9.0", "thiserror 2.0.21", + "workspace-hack", ] [[package]] @@ -5551,6 +5581,7 @@ dependencies = [ "moq-pattern 0.1.2", "serde", "serde_json", + "workspace-hack", ] [[package]] @@ -5663,6 +5694,7 @@ dependencies = [ "url", "usage-rs", "web-transport-trait", + "workspace-hack", "x509-parser", ] @@ -5678,6 +5710,7 @@ dependencies = [ "moq-tokio", "thiserror 2.0.21", "tokio", + "workspace-hack", ] [[package]] @@ -5701,6 +5734,7 @@ dependencies = [ "tracing-test", "url", "uuid", + "workspace-hack", ] [[package]] @@ -5727,6 +5761,7 @@ dependencies = [ "tokio-rustls", "tracing", "tracing-test", + "workspace-hack", ] [[package]] @@ -5747,6 +5782,7 @@ dependencies = [ "tracing", "tracing-test", "url", + "workspace-hack", ] [[package]] @@ -5770,6 +5806,7 @@ dependencies = [ "tokio", "toml 1.1.6+spec-1.1.0", "tracing", + "workspace-hack", ] [[package]] @@ -5786,6 +5823,7 @@ dependencies = [ "serde_json", "tokio", "toml 1.1.6+spec-1.1.0", + "workspace-hack", ] [[package]] @@ -5801,6 +5839,7 @@ dependencies = [ "tracing", "tracing-test", "windows-sys 0.61.2", + "workspace-hack", ] [[package]] @@ -5818,6 +5857,7 @@ dependencies = [ "tokio", "tracing", "tracing-test", + "workspace-hack", ] [[package]] @@ -5836,6 +5876,7 @@ dependencies = [ "tokio", "tracing", "web-async", + "workspace-hack", ] [[package]] @@ -5861,6 +5902,7 @@ dependencies = [ "tracing", "url", "usage-rs", + "workspace-hack", ] [[package]] @@ -6001,6 +6043,7 @@ dependencies = [ "url", "web-transport-proto", "web-transport-trait", + "workspace-hack", ] [[package]] @@ -6009,6 +6052,7 @@ version = "0.1.0" dependencies = [ "bitflags 2.13.2", "libc", + "workspace-hack", ] [[package]] @@ -6099,6 +6143,7 @@ dependencies = [ "web-async", "web-transport-trait", "web-transport-wasm", + "workspace-hack", ] [[package]] @@ -8237,6 +8282,7 @@ dependencies = [ "tokio-tungstenite 0.30.0", "tracing", "web-transport-trait", + "workspace-hack", ] [[package]] @@ -10432,6 +10478,9 @@ dependencies = [ [[package]] name = "test-env" version = "0.0.1" +dependencies = [ + "workspace-hack", +] [[package]] name = "textwrap" @@ -11192,6 +11241,7 @@ name = "uniffi-bindgen" version = "0.1.0" dependencies = [ "uniffi 0.32.2 (git+https://github.com/kixelated/uniffi-rs?rev=88d835d)", + "workspace-hack", ] [[package]] @@ -12747,6 +12797,197 @@ dependencies = [ "primefield", ] +[[package]] +name = "workspace-hack" +version = "0.1.0" +dependencies = [ + "anyhow", + "arrayvec", + "aws-lc-rs", + "aws-lc-sys", + "axum", + "base16ct 1.0.0", + "base64 0.23.1", + "bitflags 2.13.2", + "block2 0.6.2", + "bytemuck", + "byteorder", + "bytes", + "camino", + "cc", + "chrono", + "clang-sys", + "clap", + "clap_builder", + "const-oid 0.9.6", + "cpal", + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "crypto-common 0.1.7", + "crypto-common 0.2.2", + "ctutils", + "cudarc", + "data-encoding", + "der 0.7.10", + "der 0.8.2", + "derive_more 2.1.1", + "derive_more-impl", + "digest 0.10.7", + "digest 0.11.3", + "dispatch2", + "displaydoc", + "either", + "errno", + "event-listener", + "event-listener-strategy", + "fastrand", + "flate2", + "flume", + "foldhash", + "form_urlencoded", + "fs-err", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-lite", + "futures-sink", + "futures-task", + "futures-util", + "getrandom 0.2.17", + "getrandom 0.3.4", + "getrandom 0.4.3", + "half", + "hashbrown 0.17.1", + "hex", + "hmac 0.12.1", + "hybrid-array", + "hyper", + "hyper-rustls", + "hyper-util", + "image", + "indexmap 2.14.2", + "itertools 0.13.0", + "lazy_static", + "libc", + "libspa", + "linux-raw-sys 0.12.1", + "log", + "md-5 0.10.6", + "md-5 0.11.0", + "memchr", + "miniz_oxide 0.8.9", + "mio", + "nix", + "nom 7.1.3", + "nom 8.0.0", + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-traits", + "objc2 0.6.5", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", + "object_store", + "once_cell", + "percent-encoding", + "pipewire", + "pkcs1", + "pkcs8 0.10.2", + "pkcs8 0.11.0", + "portable-atomic", + "postcard", + "ppv-lite86", + "proc-macro2", + "proptest", + "quick-xml 0.41.0", + "quick-xml 0.42.0", + "quote", + "rand 0.8.8", + "rand 0.9.5", + "rand_chacha 0.3.1", + "rcgen 0.14.10", + "regex", + "regex-automata", + "regex-syntax", + "reqwest", + "rustc-hash 1.1.0", + "rustix 1.1.5", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "security-framework-sys", + "semver", + "serde", + "serde_core", + "serde_json", + "serde_spanned 1.1.1", + "serde_with", + "sha1 0.10.7", + "sha2 0.10.9", + "sha2 0.11.1", + "signature 2.2.0", + "signature 3.0.0", + "simd-adler32", + "simdutf8", + "siphasher", + "slab", + "smallvec", + "socket2 0.6.5", + "spin 0.10.1", + "spin 0.9.9", + "spki 0.7.3", + "spki 0.8.1", + "subtle", + "syn 2.0.119", + "syn 3.0.6", + "time", + "tokio", + "tokio-rustls", + "tokio-tungstenite 0.30.0", + "tokio-util", + "toml 1.1.6+spec-1.1.0", + "toml_datetime 1.1.1+spec-1.1.0", + "toml_parser", + "tower", + "tower-http 0.6.11", + "tracing", + "tracing-core", + "tracing-subscriber", + "tracing-test", + "tracing-test-macro", + "tungstenite 0.30.0", + "typenum", + "url", + "usage-argv", + "usage-rs", + "uuid", + "wgpu", + "wgpu-core", + "wgpu-hal", + "wgpu-types", + "winapi", + "windows", + "windows-core", + "windows-result", + "windows-sys 0.52.0", + "windows-sys 0.61.2", + "winit", + "winnow 0.7.15", + "winnow 1.0.4", + "x509-parser", + "zerocopy", + "zeroize", +] + [[package]] name = "writeable" version = "0.6.4" diff --git a/demo/carla/bridge/Cargo.toml b/demo/carla/bridge/Cargo.toml index 8809275a994..bd2c67d2f16 100644 --- a/demo/carla/bridge/Cargo.toml +++ b/demo/carla/bridge/Cargo.toml @@ -31,6 +31,9 @@ parking_lot = "0.12" pollster = { workspace = true } tracing = { workspace = true } +[dev-dependencies] +workspace-hack = { path = "../../../rs/workspace-hack" } + [target.'cfg(target_os = "linux")'.dev-dependencies] # The stand-in producer: a native Vulkan renderer that hands the bridge # exportable slots exactly the way the CARLA plugin does. diff --git a/flake.nix b/flake.nix index 9351d405e05..bea5061d3f0 100644 --- a/flake.nix +++ b/flake.nix @@ -156,6 +156,8 @@ # Per-crate feature matrices (`just rs features`), where workspace # unification would otherwise hide a broken single-crate build. cargo-hack + # The workspace-hack that gives every build one feature set per dependency. + cargo-hakari cargo-nextest # Source-based test coverage (`just rs coverage`). # Its LLVM test helpers must read the compiler's profile format. diff --git a/rs/hang/Cargo.toml b/rs/hang/Cargo.toml index 3c59a1a0ddb..a6cad1dc50d 100644 --- a/rs/hang/Cargo.toml +++ b/rs/hang/Cargo.toml @@ -37,6 +37,7 @@ moq-tokio = { path = "../moq-tokio", default-features = false, features = ["quic tokio = { workspace = true, features = ["macros", "fs"] } tracing = { workspace = true } url = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/justfile b/rs/justfile index 437114da920..621774f1f95 100644 --- a/rs/justfile +++ b/rs/justfile @@ -51,7 +51,10 @@ lint *args: cargo fmt --all --check RUSTDOCFLAGS="-D warnings" bash sh/local.sh cargo doc --locked --no-deps "$@" cargo shear - cargo sort --workspace --check --no-format + # The workspace-hack's table order is `cargo hakari`'s, which `cargo sort` disagrees with. + cargo sort --check --no-format . $(cargo metadata --locked --no-deps --format-version 1 | jq -r '.packages[] | select(.name != "workspace-hack") | .manifest_path | rtrimstr("/Cargo.toml")') + cargo hakari generate --diff + python3 sh/rs/hakari.py # Auto-fix clippy/format/shear/sort. [positional-arguments] @@ -59,7 +62,8 @@ fix *args: bash sh/local.sh cargo clippy --locked --fix --allow-staged --allow-dirty --all-targets "$@" cargo fmt --all cargo shear --fix - cargo sort --workspace --no-format + cargo hakari generate + cargo sort --no-format . $(cargo metadata --locked --no-deps --format-version 1 | jq -r '.packages[] | select(.name != "workspace-hack") | .manifest_path | rtrimstr("/Cargo.toml")') # Like `check`, but only the crates in a changed-file list plus their dependents. check-changed $LIST: diff --git a/rs/libmoq/Cargo.toml b/rs/libmoq/Cargo.toml index 79dce540ac6..81eb3d6825d 100644 --- a/rs/libmoq/Cargo.toml +++ b/rs/libmoq/Cargo.toml @@ -12,5 +12,8 @@ rust-version.workspace = true keywords = ["quic", "media", "live"] categories = ["multimedia", "network-programming"] +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-archive/Cargo.toml b/rs/moq-archive/Cargo.toml index a3d6fa17971..255c099db35 100644 --- a/rs/moq-archive/Cargo.toml +++ b/rs/moq-archive/Cargo.toml @@ -35,6 +35,7 @@ s3s = "0.17" s3s-fs = "0.17" tempfile = { workspace = true } tokio = { workspace = true, features = ["macros", "net", "rt", "sync", "test-util", "time"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "producer" diff --git a/rs/moq-auth/Cargo.toml b/rs/moq-auth/Cargo.toml index 90e4990e932..4ca163e8ebc 100644 --- a/rs/moq-auth/Cargo.toml +++ b/rs/moq-auth/Cargo.toml @@ -48,6 +48,7 @@ moq-token = "0.7" tempfile = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread", "test-util"] } wiremock = "0.6" +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-bench/Cargo.toml b/rs/moq-bench/Cargo.toml index 578e83465c8..c371e9148fe 100644 --- a/rs/moq-bench/Cargo.toml +++ b/rs/moq-bench/Cargo.toml @@ -65,6 +65,7 @@ procfs = "0.18" test-env = { path = "../test-env" } # test-util enables tokio::time::pause/advance for the deterministic produce tests. tokio = { workspace = true, features = ["test-util"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-boy/Cargo.toml b/rs/moq-boy/Cargo.toml index cec2ba135d4..18e64cfef4f 100644 --- a/rs/moq-boy/Cargo.toml +++ b/rs/moq-boy/Cargo.toml @@ -49,6 +49,7 @@ usage-rs = { workspace = true, features = ["completions", "config"] } [dev-dependencies] tokio = { workspace = true, features = ["test-util"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-c/Cargo.toml b/rs/moq-c/Cargo.toml index f9973efee35..ee1515d7ac4 100644 --- a/rs/moq-c/Cargo.toml +++ b/rs/moq-c/Cargo.toml @@ -57,6 +57,7 @@ moq-video = { path = "../moq-video", features = ["openh264"] } # Runs the tests that need a variable set or unset in a child process given it. test-env = { path = "../test-env" } tokio = { workspace = true, features = ["test-util"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-cli/Cargo.toml b/rs/moq-cli/Cargo.toml index 700a8f74b6f..1e99ac6fc7e 100644 --- a/rs/moq-cli/Cargo.toml +++ b/rs/moq-cli/Cargo.toml @@ -164,6 +164,7 @@ test-env = { path = "../test-env" } tokio = { workspace = true, features = ["test-util"] } # Plays the `announced` view's frames on a virtual terminal, scrolling included. vt100 = "0.17.0" +workspace-hack = { path = "../workspace-hack" } [target.'cfg(unix)'.dev-dependencies] # Sends the signals the `auth serve` shutdown test checks. diff --git a/rs/moq-clock/macros/Cargo.toml b/rs/moq-clock/macros/Cargo.toml index 6af8280d5ce..335518e261f 100644 --- a/rs/moq-clock/macros/Cargo.toml +++ b/rs/moq-clock/macros/Cargo.toml @@ -17,5 +17,8 @@ categories = ["development-tools::testing"] [lib] proc-macro = true +[dev-dependencies] +workspace-hack = { path = "../../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-congestion/Cargo.toml b/rs/moq-congestion/Cargo.toml index d79e64598f9..f151431a1e0 100644 --- a/rs/moq-congestion/Cargo.toml +++ b/rs/moq-congestion/Cargo.toml @@ -19,6 +19,7 @@ rand_pcg = { workspace = true } [dev-dependencies] moq-clock = { path = "../moq-clock" } stats_alloc = "0.1.10" +workspace-hack = { path = "../workspace-hack" } [target.'cfg(not(target_family = "wasm"))'.dev-dependencies] cpu-time = "1.0.0" diff --git a/rs/moq-e2ee/Cargo.toml b/rs/moq-e2ee/Cargo.toml index 62fac64ecd8..3b07173f6d4 100644 --- a/rs/moq-e2ee/Cargo.toml +++ b/rs/moq-e2ee/Cargo.toml @@ -27,6 +27,7 @@ criterion = { workspace = true } hex = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true, features = ["macros", "rt", "sync", "time"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "protect" diff --git a/rs/moq-ffi/Cargo.toml b/rs/moq-ffi/Cargo.toml index af8e9c0d83f..1849905096d 100644 --- a/rs/moq-ffi/Cargo.toml +++ b/rs/moq-ffi/Cargo.toml @@ -98,6 +98,7 @@ pollster = { workspace = true } test-env = { path = "../test-env" } tokio = { workspace = true, features = ["test-util"] } web-transport-trait = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] # The video tests encode with OpenH264, the one encoder a GPU-less host has, so diff --git a/rs/moq-flate/Cargo.toml b/rs/moq-flate/Cargo.toml index 9e75bddcfef..55c6602f780 100644 --- a/rs/moq-flate/Cargo.toml +++ b/rs/moq-flate/Cargo.toml @@ -24,6 +24,7 @@ tracing = { workspace = true } [dev-dependencies] futures = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-gst/Cargo.toml b/rs/moq-gst/Cargo.toml index f58ec7d8335..e3fd44ac567 100644 --- a/rs/moq-gst/Cargo.toml +++ b/rs/moq-gst/Cargo.toml @@ -43,6 +43,7 @@ moq-audio = { path = "../moq-audio", default-features = false } # Runs the tests that need a variable set or unset in a child process given it. test-env = { path = "../test-env" } tokio = { workspace = true, features = ["test-util"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "catalog" diff --git a/rs/moq-hls/Cargo.toml b/rs/moq-hls/Cargo.toml index 85d2c4c6acf..dabe897f44b 100644 --- a/rs/moq-hls/Cargo.toml +++ b/rs/moq-hls/Cargo.toml @@ -47,6 +47,7 @@ moq-tokio = { path = "../moq-tokio", default-features = false, features = ["tcp" tokio = { workspace = true, features = ["test-util"] } tower = { version = "0.5", features = ["util"] } tracing-test = { workspace = true, features = ["no-env-filter"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-ice/Cargo.toml b/rs/moq-ice/Cargo.toml index 58956326500..7aa2ab2854b 100644 --- a/rs/moq-ice/Cargo.toml +++ b/rs/moq-ice/Cargo.toml @@ -22,6 +22,7 @@ tracing = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-json/Cargo.toml b/rs/moq-json/Cargo.toml index 4764208414c..1393a6fce7c 100644 --- a/rs/moq-json/Cargo.toml +++ b/rs/moq-json/Cargo.toml @@ -28,6 +28,7 @@ criterion = { workspace = true } futures = { workspace = true } json-patch = "4" proptest = { workspace = true, features = ["handle-panics"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "codec" diff --git a/rs/moq-loc/Cargo.toml b/rs/moq-loc/Cargo.toml index 0507e77e3ea..3ee83e561b6 100644 --- a/rs/moq-loc/Cargo.toml +++ b/rs/moq-loc/Cargo.toml @@ -17,5 +17,8 @@ bytes = { workspace = true } moq-net = { workspace = true } thiserror = { workspace = true } +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-msf/Cargo.toml b/rs/moq-msf/Cargo.toml index 931c0563b6f..8da5ddeb3ed 100644 --- a/rs/moq-msf/Cargo.toml +++ b/rs/moq-msf/Cargo.toml @@ -17,5 +17,8 @@ serde = { workspace = true } serde_json = { workspace = true } serde_with = { workspace = true } +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-mux/Cargo.toml b/rs/moq-mux/Cargo.toml index ff9da615d99..9b4cd6a6b87 100644 --- a/rs/moq-mux/Cargo.toml +++ b/rs/moq-mux/Cargo.toml @@ -52,6 +52,7 @@ moq-clock = { workspace = true, features = ["sim"] } proptest = { workspace = true } tokio = { workspace = true, features = ["test-util"] } tracing-test = { workspace = true, features = ["no-env-filter"] } +workspace-hack = { path = "../workspace-hack" } # The ts_schedule bench pins glibc's heap. [target.'cfg(all(target_os = "linux", target_env = "gnu"))'.dev-dependencies] diff --git a/rs/moq-native/Cargo.toml b/rs/moq-native/Cargo.toml index c9c38e89c14..1b6bc24ea4a 100644 --- a/rs/moq-native/Cargo.toml +++ b/rs/moq-native/Cargo.toml @@ -27,5 +27,8 @@ uds = [] ring = [] android-logcat = [] +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-net-tests/Cargo.toml b/rs/moq-net-tests/Cargo.toml index 73fe5cb3933..8d187629362 100644 --- a/rs/moq-net-tests/Cargo.toml +++ b/rs/moq-net-tests/Cargo.toml @@ -19,6 +19,7 @@ moq-json = { path = "../moq-json" } moq-net = { path = "../moq-net", features = ["fuzz"] } serde_json = { workspace = true } tokio = { workspace = true, features = ["rt"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-nvenc/Cargo.toml b/rs/moq-nvenc/Cargo.toml index a608e0681a7..02853b48f65 100644 --- a/rs/moq-nvenc/Cargo.toml +++ b/rs/moq-nvenc/Cargo.toml @@ -21,5 +21,8 @@ cudarc = { workspace = true } libloading = { workspace = true } thiserror = { workspace = true } +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-pattern/Cargo.toml b/rs/moq-pattern/Cargo.toml index 02ee8784381..e9e42a5b320 100644 --- a/rs/moq-pattern/Cargo.toml +++ b/rs/moq-pattern/Cargo.toml @@ -24,6 +24,7 @@ criterion = { workspace = true } # Enable serde so the crate's own tests cover the optional impls in the merge gate. moq-pattern = { path = ".", features = ["serde"] } serde_json = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "matching" diff --git a/rs/moq-relay/Cargo.toml b/rs/moq-relay/Cargo.toml index bf0f01f892d..e65dc2b1670 100644 --- a/rs/moq-relay/Cargo.toml +++ b/rs/moq-relay/Cargo.toml @@ -126,6 +126,7 @@ test-env = { path = "../test-env" } time = { workspace = true } tokio = { workspace = true, features = ["test-util"] } tracing-subscriber = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [target.'cfg(target_os = "linux")'.dev-dependencies] # Workers built inside a runtime with a manual clock installed run on that clock. diff --git a/rs/moq-room/Cargo.toml b/rs/moq-room/Cargo.toml index 23bb15d19c4..fb07d0c50db 100644 --- a/rs/moq-room/Cargo.toml +++ b/rs/moq-room/Cargo.toml @@ -24,6 +24,7 @@ thiserror = { workspace = true } [dev-dependencies] moq-tokio = { path = "../moq-tokio", default-features = false, features = ["net"] } tokio = { workspace = true, features = ["macros", "rt", "test-util"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-rtc/Cargo.toml b/rs/moq-rtc/Cargo.toml index e3ec0e5385b..f93493998cd 100644 --- a/rs/moq-rtc/Cargo.toml +++ b/rs/moq-rtc/Cargo.toml @@ -49,6 +49,7 @@ aws-lc-rs = { workspace = true } moq-tokio = { workspace = true, features = ["net", "tcp"] } tokio = { workspace = true, features = ["test-util"] } tracing-test = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-rtmp/Cargo.toml b/rs/moq-rtmp/Cargo.toml index 9dc64a44eb4..af3dee34329 100644 --- a/rs/moq-rtmp/Cargo.toml +++ b/rs/moq-rtmp/Cargo.toml @@ -62,6 +62,7 @@ moq-clock = { path = "../moq-clock", features = ["sim"] } moq-tokio = { path = "../moq-tokio", default-features = false, features = ["aws-lc-rs", "net"] } tokio = { workspace = true, features = ["test-util"] } tracing-test = { workspace = true, features = ["no-env-filter"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "chunk_interleaving" diff --git a/rs/moq-rtsp/Cargo.toml b/rs/moq-rtsp/Cargo.toml index 29ffbee6b2f..500d32878e9 100644 --- a/rs/moq-rtsp/Cargo.toml +++ b/rs/moq-rtsp/Cargo.toml @@ -41,6 +41,7 @@ base64 = { workspace = true } moq-clock = { path = "../moq-clock", features = ["manual"] } tokio = { workspace = true, features = ["full", "test-util"] } tracing-test = { workspace = true, features = ["no-env-filter"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-scene/Cargo.toml b/rs/moq-scene/Cargo.toml index 1fc6845e0ba..bd89113eba6 100644 --- a/rs/moq-scene/Cargo.toml +++ b/rs/moq-scene/Cargo.toml @@ -51,6 +51,7 @@ tracing = { workspace = true } [dev-dependencies] tempfile = { workspace = true } tokio = { workspace = true, features = ["macros", "rt", "test-util"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-shaper/Cargo.toml b/rs/moq-shaper/Cargo.toml index 54184d88d4a..8ec32fa132e 100644 --- a/rs/moq-shaper/Cargo.toml +++ b/rs/moq-shaper/Cargo.toml @@ -34,6 +34,7 @@ toml = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["test-util"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-sock/Cargo.toml b/rs/moq-sock/Cargo.toml index 839c1fb9022..12f90ebce3e 100644 --- a/rs/moq-sock/Cargo.toml +++ b/rs/moq-sock/Cargo.toml @@ -32,6 +32,7 @@ cfg_aliases = "0.2" [dev-dependencies] rand = "0.10" tracing-test = "0.2" +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-srt/Cargo.toml b/rs/moq-srt/Cargo.toml index 265cef7bf79..15a245a974c 100644 --- a/rs/moq-srt/Cargo.toml +++ b/rs/moq-srt/Cargo.toml @@ -30,6 +30,7 @@ tracing = { workspace = true } hang = { path = "../hang" } srt-protocol = "0.4" tracing-test = { workspace = true, features = ["no-env-filter"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-stats/Cargo.toml b/rs/moq-stats/Cargo.toml index 194ebd6f839..1353b6f578c 100644 --- a/rs/moq-stats/Cargo.toml +++ b/rs/moq-stats/Cargo.toml @@ -33,6 +33,7 @@ web-async = { workspace = true } criterion = { workspace = true } futures = { workspace = true } tokio = { workspace = true, features = ["macros", "rt", "test-util", "time"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "decode" diff --git a/rs/moq-studio/Cargo.toml b/rs/moq-studio/Cargo.toml index 348f39d50f2..da911290044 100644 --- a/rs/moq-studio/Cargo.toml +++ b/rs/moq-studio/Cargo.toml @@ -60,6 +60,7 @@ usage-rs = { workspace = true, features = ["completions", "config"] } [dev-dependencies] moq-relay = { path = "../moq-relay", default-features = false, features = ["test-support"] } tempfile = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-uring/Cargo.toml b/rs/moq-uring/Cargo.toml index 092b17e6058..c7dbaadc46a 100644 --- a/rs/moq-uring/Cargo.toml +++ b/rs/moq-uring/Cargo.toml @@ -58,6 +58,7 @@ moq-net = { path = "../moq-net" } thiserror = { workspace = true } tokio = { workspace = true, features = ["macros", "net", "rt", "sync", "time"] } web-transport-trait = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [target.'cfg(target_os = "linux")'.dev-dependencies] io-uring = { workspace = true } diff --git a/rs/moq-v4l/Cargo.toml b/rs/moq-v4l/Cargo.toml index 5e8c23eb269..e48891634aa 100644 --- a/rs/moq-v4l/Cargo.toml +++ b/rs/moq-v4l/Cargo.toml @@ -16,5 +16,8 @@ categories = ["multimedia::video", "os::linux-apis"] bitflags = { workspace = true } libc = { workspace = true } +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/moq-wasm/Cargo.toml b/rs/moq-wasm/Cargo.toml index 17e1b9c5f24..eb37e29b4e7 100644 --- a/rs/moq-wasm/Cargo.toml +++ b/rs/moq-wasm/Cargo.toml @@ -47,6 +47,7 @@ bytes = { workspace = true } moq-net = { path = "../moq-net" } thiserror = { workspace = true } web-transport-trait = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/qmux/Cargo.toml b/rs/qmux/Cargo.toml index 5042b92682b..0449fbbf6a9 100644 --- a/rs/qmux/Cargo.toml +++ b/rs/qmux/Cargo.toml @@ -46,6 +46,7 @@ qmux06 = { package = "qmux", version = "0.6.3", default-features = false, featur tokio = { workspace = true, features = ["full", "test-util"] } # The 0.6 release's stream API, for driving it in the interop tests. web-transport-trait = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [[example]] name = "interop-client" diff --git a/rs/test-env/Cargo.toml b/rs/test-env/Cargo.toml index 2365060b4c6..1765a9aba4a 100644 --- a/rs/test-env/Cargo.toml +++ b/rs/test-env/Cargo.toml @@ -10,3 +10,6 @@ edition = "2024" rust-version.workspace = true publish = false + +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } diff --git a/rs/uniffi-bindgen/Cargo.toml b/rs/uniffi-bindgen/Cargo.toml index 448ea829e81..f4c43377d56 100644 --- a/rs/uniffi-bindgen/Cargo.toml +++ b/rs/uniffi-bindgen/Cargo.toml @@ -23,5 +23,8 @@ cli = ["dep:uniffi"] # published package has no git dependencies. uniffi = { git = "https://github.com/kixelated/uniffi-rs", rev = "88d835d", features = ["cli"], optional = true } +[dev-dependencies] +workspace-hack = { path = "../workspace-hack" } + [lints] workspace = true diff --git a/rs/workspace-hack/.gitattributes b/rs/workspace-hack/.gitattributes new file mode 100644 index 00000000000..3e9dba4b64b --- /dev/null +++ b/rs/workspace-hack/.gitattributes @@ -0,0 +1,4 @@ +# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks +# Cargo. +# Also do not check out the file as CRLF on Windows, as that's what hakari needs. +Cargo.toml merge=binary -crlf diff --git a/rs/workspace-hack/Cargo.toml b/rs/workspace-hack/Cargo.toml new file mode 100644 index 00000000000..7558b1d7670 --- /dev/null +++ b/rs/workspace-hack/Cargo.toml @@ -0,0 +1,561 @@ +# This file is generated by `cargo hakari`. +# To regenerate, run: +# cargo hakari generate + +# Every member dev-depends on this crate by path (`sh/rs/hakari.py` checks), so +# a test or lint build compiles each third-party crate with one feature set +# whichever packages it selects, and mbx reuses that build across jobs. +# `cargo publish` strips path-only dev-dependencies, so it is never published. +[package] +name = "workspace-hack" +description = "Media over QUIC - One feature set per dependency, managed by cargo hakari" +authors = ["Luke Curley "] +repository = "https://github.com/moq-dev/moq" +license = "MIT OR Apache-2.0" + +version = "0.1.0" +edition = "2024" +rust-version.workspace = true + +publish = false + +# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments +# are managed by hakari. + +### BEGIN HAKARI SECTION +[dependencies] +anyhow = { version = "1", features = ["backtrace"] } +aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } +aws-lc-sys = { version = "0.46", default-features = false, features = ["prebuilt-nasm"] } +axum = { version = "0.8", default-features = false, features = ["form", "http1", "json", "matched-path", "original-uri", "query", "tracing", "ws"] } +base16ct = { version = "1", default-features = false, features = ["alloc"] } +base64 = { version = "0.23" } +bitflags = { version = "2", default-features = false, features = ["std"] } +bytemuck = { version = "1", default-features = false, features = ["derive", "extern_crate_alloc", "min_const_generics"] } +byteorder = { version = "1" } +bytes = { version = "1", features = ["serde"] } +camino = { version = "1", default-features = false, features = ["serde1"] } +chrono = { version = "0.4", features = ["serde"] } +clap = { version = "4", features = ["cargo", "derive"] } +clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "help", "std", "suggestions", "usage"] } +const-oid = { version = "0.9", default-features = false, features = ["db"] } +cpal = { version = "0.18", features = ["pipewire", "pulseaudio"] } +crc32fast = { version = "1" } +crossbeam-epoch = { version = "0.9" } +crossbeam-utils = { version = "0.8" } +crypto-common-6f8ce4dd05d13bba = { package = "crypto-common", version = "0.2", default-features = false, features = ["getrandom"] } +crypto-common-c65f7effa3be6d31 = { package = "crypto-common", version = "0.1", default-features = false, features = ["std"] } +ctutils = { version = "0.4", default-features = false, features = ["subtle"] } +data-encoding = { version = "2" } +der-c38e5c1d305a1b54 = { package = "der", version = "0.8", default-features = false, features = ["oid", "pem", "std"] } +der-ca01ad9e24f5d932 = { package = "der", version = "0.7", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } +derive_more = { version = "2", features = ["add", "add_assign", "debug", "deref", "deref_mut", "display", "error", "from", "from_str", "into_iterator", "try_into"] } +digest-93f6ce9d446188ac = { package = "digest", version = "0.10", features = ["mac", "oid", "std"] } +digest-a6292c17cd707f01 = { package = "digest", version = "0.11", features = ["alloc", "mac", "oid", "rand_core"] } +either = { version = "1", features = ["use_std"] } +fastrand = { version = "2", features = ["js"] } +flate2 = { version = "1", features = ["zlib-rs"] } +flume = { version = "0.12" } +foldhash = { version = "0.2" } +form_urlencoded = { version = "1" } +fs-err = { version = "3", default-features = false, features = ["tokio"] } +futures-channel = { version = "0.3", features = ["sink"] } +futures-core = { version = "0.3" } +futures-executor = { version = "0.3" } +futures-io = { version = "0.3" } +futures-sink = { version = "0.3" } +futures-task = { version = "0.3", default-features = false, features = ["std"] } +futures-util = { version = "0.3", features = ["channel", "io", "sink"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } +getrandom-9fbad63c4bcf4a8f = { package = "getrandom", version = "0.4", default-features = false, features = ["std", "sys_rng"] } +hashbrown = { version = "0.17", default-features = false, features = ["default-hasher", "inline-more"] } +hex = { version = "0.4" } +hmac = { version = "0.12", default-features = false, features = ["reset"] } +hybrid-array = { version = "0.4", default-features = false, features = ["alloc", "subtle", "zeroize"] } +hyper = { version = "1", features = ["full"] } +hyper-util = { version = "0.1", features = ["server-auto", "service", "tokio"] } +indexmap = { version = "2", features = ["serde"] } +lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } +log = { version = "0.4", default-features = false, features = ["std"] } +md-5-93f6ce9d446188ac = { package = "md-5", version = "0.10" } +md-5-a6292c17cd707f01 = { package = "md-5", version = "0.11" } +memchr = { version = "2" } +mio = { version = "1", features = ["net", "os-ext"] } +nom-181b0d20215bb231 = { package = "nom", version = "8" } +num-bigint = { version = "0.4" } +num-complex = { version = "0.4" } +num-integer = { version = "0.1", features = ["i128"] } +num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } +num-traits = { version = "0.2", features = ["i128", "libm"] } +object_store = { version = "0.14", default-features = false, features = ["aws", "azure", "fs", "gcp"] } +once_cell = { version = "1" } +percent-encoding = { version = "2" } +pkcs1 = { version = "0.7", default-features = false, features = ["pem", "pkcs8", "std"] } +pkcs8-93f6ce9d446188ac = { package = "pkcs8", version = "0.10", default-features = false, features = ["pem", "std"] } +pkcs8-a6292c17cd707f01 = { package = "pkcs8", version = "0.11", default-features = false, features = ["pem", "std"] } +portable-atomic = { version = "1", features = ["serde"] } +postcard = { version = "1", default-features = false, features = ["experimental-derive", "use-std"] } +ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } +proptest = { version = "1", default-features = false, features = ["handle-panics"] } +rand-274715c4dabd11b0 = { package = "rand", version = "0.9" } +rand-c38e5c1d305a1b54 = { package = "rand", version = "0.8" } +rand_chacha = { version = "0.3", default-features = false, features = ["std"] } +rcgen = { version = "0.14", default-features = false, features = ["aws_lc_rs", "pem", "ring", "x509-parser"] } +regex = { version = "1" } +regex-automata = { version = "0.4", default-features = false, features = ["dfa-build", "dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "std", "unicode"] } +regex-syntax = { version = "0.8" } +reqwest = { version = "0.13", default-features = false, features = ["gzip", "http2", "json", "rustls", "rustls-no-provider", "stream"] } +rustls = { version = "0.23", features = ["ring"] } +rustls-pki-types = { version = "1", features = ["std"] } +rustls-webpki = { version = "0.103", features = ["aws-lc-rs", "ring"] } +semver = { version = "1", features = ["serde"] } +serde = { version = "1", features = ["alloc", "derive", "rc"] } +serde_core = { version = "1", features = ["alloc", "rc"] } +serde_json = { version = "1", features = ["preserve_order", "raw_value", "unbounded_depth"] } +serde_spanned = { version = "1", default-features = false, features = ["serde", "std"] } +serde_with = { version = "3", features = ["base64", "hex", "json"] } +sha1 = { version = "0.10" } +sha2-93f6ce9d446188ac = { package = "sha2", version = "0.10" } +sha2-a6292c17cd707f01 = { package = "sha2", version = "0.11" } +signature-7b89eefb6aaa9bf3 = { package = "signature", version = "3", default-features = false, features = ["alloc", "digest", "rand_core"] } +signature-f595c2ba2a3f28df = { package = "signature", version = "2", default-features = false, features = ["digest", "rand_core", "std"] } +simd-adler32 = { version = "0.3" } +simdutf8 = { version = "0.1", default-features = false, features = ["aarch64_neon", "std"] } +siphasher = { version = "1" } +slab = { version = "0.4" } +smallvec = { version = "1", default-features = false, features = ["const_new", "union", "write"] } +socket2 = { version = "0.6", default-features = false, features = ["all"] } +spin-274715c4dabd11b0 = { package = "spin", version = "0.9" } +spki-c38e5c1d305a1b54 = { package = "spki", version = "0.8", default-features = false, features = ["pem", "std"] } +spki-ca01ad9e24f5d932 = { package = "spki", version = "0.7", default-features = false, features = ["pem", "std"] } +subtle = { version = "2", features = ["const-generics"] } +time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } +tokio = { version = "1", features = ["full", "test-util"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "logging"] } +tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } +tokio-util = { version = "0.7", features = ["codec", "io-util", "rt"] } +toml = { version = "1" } +toml_datetime = { version = "1", features = ["serde"] } +toml_parser = { version = "1" } +tower = { version = "0.5", default-features = false, features = ["make", "util"] } +tracing = { version = "0.1" } +tracing-core = { version = "0.1" } +tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time"] } +tracing-test = { version = "0.2", default-features = false, features = ["no-env-filter"] } +tungstenite = { version = "0.30", default-features = false, features = ["__rustls-tls", "handshake"] } +typenum = { version = "1", default-features = false, features = ["const-generics"] } +url = { version = "2", features = ["serde"] } +usage-argv = { version = "7", default-features = false, features = ["complete", "diagnostics", "help-advanced"] } +usage-rs = { version = "7", features = ["completions", "config"] } +uuid = { version = "1", features = ["js", "v4", "v7"] } +winnow-dff4ba8e3ae991db = { package = "winnow", version = "1", features = ["simd"] } +x509-parser = { version = "0.18", features = ["verify", "verify-aws"] } +zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } +zeroize = { version = "1", features = ["derive"] } + +[build-dependencies] +anyhow = { version = "1", features = ["backtrace"] } +aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } +aws-lc-sys = { version = "0.46", default-features = false, features = ["prebuilt-nasm"] } +axum = { version = "0.8", default-features = false, features = ["form", "http1", "json", "matched-path", "original-uri", "query", "tracing", "ws"] } +base16ct = { version = "1", default-features = false, features = ["alloc"] } +base64 = { version = "0.23" } +bitflags = { version = "2", default-features = false, features = ["std"] } +bytemuck = { version = "1", default-features = false, features = ["derive", "extern_crate_alloc", "min_const_generics"] } +byteorder = { version = "1" } +bytes = { version = "1", features = ["serde"] } +camino = { version = "1", default-features = false, features = ["serde1"] } +cc = { version = "1", default-features = false, features = ["parallel"] } +chrono = { version = "0.4", features = ["serde"] } +clap = { version = "4", features = ["cargo", "derive"] } +clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "help", "std", "suggestions", "usage"] } +const-oid = { version = "0.9", default-features = false, features = ["db"] } +cpal = { version = "0.18", features = ["pipewire", "pulseaudio"] } +crc32fast = { version = "1" } +crossbeam-epoch = { version = "0.9" } +crossbeam-utils = { version = "0.8" } +crypto-common-6f8ce4dd05d13bba = { package = "crypto-common", version = "0.2", default-features = false, features = ["getrandom"] } +crypto-common-c65f7effa3be6d31 = { package = "crypto-common", version = "0.1", default-features = false, features = ["std"] } +ctutils = { version = "0.4", default-features = false, features = ["subtle"] } +data-encoding = { version = "2" } +der-c38e5c1d305a1b54 = { package = "der", version = "0.8", default-features = false, features = ["oid", "pem", "std"] } +der-ca01ad9e24f5d932 = { package = "der", version = "0.7", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } +derive_more = { version = "2", features = ["add", "add_assign", "debug", "deref", "deref_mut", "display", "error", "from", "from_str", "into_iterator", "try_into"] } +derive_more-impl = { version = "2", features = ["add", "add_assign", "debug", "deref", "deref_mut", "display", "error", "from", "from_str", "into_iterator", "try_into"] } +digest-93f6ce9d446188ac = { package = "digest", version = "0.10", features = ["mac", "oid", "std"] } +digest-a6292c17cd707f01 = { package = "digest", version = "0.11", features = ["alloc", "mac", "oid", "rand_core"] } +displaydoc = { version = "0.2" } +either = { version = "1", features = ["use_std"] } +fastrand = { version = "2", features = ["js"] } +flate2 = { version = "1", features = ["zlib-rs"] } +flume = { version = "0.12" } +foldhash = { version = "0.2" } +form_urlencoded = { version = "1" } +fs-err = { version = "3", default-features = false, features = ["tokio"] } +futures-channel = { version = "0.3", features = ["sink"] } +futures-core = { version = "0.3" } +futures-executor = { version = "0.3" } +futures-io = { version = "0.3" } +futures-sink = { version = "0.3" } +futures-task = { version = "0.3", default-features = false, features = ["std"] } +futures-util = { version = "0.3", features = ["channel", "io", "sink"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } +getrandom-9fbad63c4bcf4a8f = { package = "getrandom", version = "0.4", default-features = false, features = ["std", "sys_rng"] } +hashbrown = { version = "0.17", default-features = false, features = ["default-hasher", "inline-more"] } +hex = { version = "0.4" } +hmac = { version = "0.12", default-features = false, features = ["reset"] } +hybrid-array = { version = "0.4", default-features = false, features = ["alloc", "subtle", "zeroize"] } +hyper = { version = "1", features = ["full"] } +hyper-util = { version = "0.1", features = ["server-auto", "service", "tokio"] } +indexmap = { version = "2", features = ["serde"] } +lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } +log = { version = "0.4", default-features = false, features = ["std"] } +md-5-93f6ce9d446188ac = { package = "md-5", version = "0.10" } +md-5-a6292c17cd707f01 = { package = "md-5", version = "0.11" } +memchr = { version = "2" } +mio = { version = "1", features = ["net", "os-ext"] } +nom-181b0d20215bb231 = { package = "nom", version = "8" } +num-bigint = { version = "0.4" } +num-complex = { version = "0.4" } +num-integer = { version = "0.1", features = ["i128"] } +num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } +num-traits = { version = "0.2", features = ["i128", "libm"] } +object_store = { version = "0.14", default-features = false, features = ["aws", "azure", "fs", "gcp"] } +once_cell = { version = "1" } +percent-encoding = { version = "2" } +pkcs1 = { version = "0.7", default-features = false, features = ["pem", "pkcs8", "std"] } +pkcs8-93f6ce9d446188ac = { package = "pkcs8", version = "0.10", default-features = false, features = ["pem", "std"] } +pkcs8-a6292c17cd707f01 = { package = "pkcs8", version = "0.11", default-features = false, features = ["pem", "std"] } +portable-atomic = { version = "1", features = ["serde"] } +postcard = { version = "1", default-features = false, features = ["experimental-derive", "use-std"] } +ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } +proc-macro2 = { version = "1" } +proptest = { version = "1", default-features = false, features = ["handle-panics"] } +quote = { version = "1" } +rand-274715c4dabd11b0 = { package = "rand", version = "0.9" } +rand-c38e5c1d305a1b54 = { package = "rand", version = "0.8" } +rand_chacha = { version = "0.3", default-features = false, features = ["std"] } +rcgen = { version = "0.14", default-features = false, features = ["aws_lc_rs", "pem", "ring", "x509-parser"] } +regex = { version = "1" } +regex-automata = { version = "0.4", default-features = false, features = ["dfa-build", "dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "std", "unicode"] } +regex-syntax = { version = "0.8" } +reqwest = { version = "0.13", default-features = false, features = ["gzip", "http2", "json", "rustls", "rustls-no-provider", "stream"] } +rustls = { version = "0.23", features = ["ring"] } +rustls-pki-types = { version = "1", features = ["std"] } +rustls-webpki = { version = "0.103", features = ["aws-lc-rs", "ring"] } +semver = { version = "1", features = ["serde"] } +serde = { version = "1", features = ["alloc", "derive", "rc"] } +serde_core = { version = "1", features = ["alloc", "rc"] } +serde_json = { version = "1", features = ["preserve_order", "raw_value", "unbounded_depth"] } +serde_spanned = { version = "1", default-features = false, features = ["serde", "std"] } +serde_with = { version = "3", features = ["base64", "hex", "json"] } +sha1 = { version = "0.10" } +sha2-93f6ce9d446188ac = { package = "sha2", version = "0.10" } +sha2-a6292c17cd707f01 = { package = "sha2", version = "0.11" } +signature-7b89eefb6aaa9bf3 = { package = "signature", version = "3", default-features = false, features = ["alloc", "digest", "rand_core"] } +signature-f595c2ba2a3f28df = { package = "signature", version = "2", default-features = false, features = ["digest", "rand_core", "std"] } +simd-adler32 = { version = "0.3" } +simdutf8 = { version = "0.1", default-features = false, features = ["aarch64_neon", "std"] } +siphasher = { version = "1" } +slab = { version = "0.4" } +smallvec = { version = "1", default-features = false, features = ["const_new", "union", "write"] } +socket2 = { version = "0.6", default-features = false, features = ["all"] } +spin-274715c4dabd11b0 = { package = "spin", version = "0.9" } +spki-c38e5c1d305a1b54 = { package = "spki", version = "0.8", default-features = false, features = ["pem", "std"] } +spki-ca01ad9e24f5d932 = { package = "spki", version = "0.7", default-features = false, features = ["pem", "std"] } +subtle = { version = "2", features = ["const-generics"] } +syn-7b89eefb6aaa9bf3 = { package = "syn", version = "3", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } +tokio = { version = "1", features = ["full", "test-util"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "logging"] } +tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } +tokio-util = { version = "0.7", features = ["codec", "io-util", "rt"] } +toml = { version = "1" } +toml_datetime = { version = "1", features = ["serde"] } +toml_parser = { version = "1" } +tower = { version = "0.5", default-features = false, features = ["make", "util"] } +tracing = { version = "0.1" } +tracing-core = { version = "0.1" } +tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time"] } +tracing-test = { version = "0.2", default-features = false, features = ["no-env-filter"] } +tracing-test-macro = { version = "0.2", default-features = false, features = ["no-env-filter"] } +tungstenite = { version = "0.30", default-features = false, features = ["__rustls-tls", "handshake"] } +typenum = { version = "1", default-features = false, features = ["const-generics"] } +url = { version = "2", features = ["serde"] } +usage-argv = { version = "7", default-features = false, features = ["complete", "diagnostics", "help-advanced"] } +usage-rs = { version = "7", features = ["completions", "config"] } +uuid = { version = "1", features = ["js", "v4", "v7"] } +winnow-ca01ad9e24f5d932 = { package = "winnow", version = "0.7" } +winnow-dff4ba8e3ae991db = { package = "winnow", version = "1", features = ["simd"] } +x509-parser = { version = "0.18", features = ["verify", "verify-aws"] } +zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } +zeroize = { version = "1", features = ["derive"] } + +[target.aarch64-apple-darwin.dependencies] +arrayvec = { version = "0.7" } +block2 = { version = "0.6" } +dispatch2 = { version = "0.3" } +errno = { version = "0.3" } +half = { version = "2", features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +image = { version = "0.25", default-features = false, features = ["jpeg", "png", "tiff"] } +libc = { version = "0.2", features = ["extra_traits"] } +miniz_oxide = { version = "0.8", features = ["simd"] } +objc2 = { version = "0.6" } +objc2-core-audio = { version = "0.3", default-features = false, features = ["AudioHardware", "AudioHardwareDeprecated", "objc2", "objc2-core-audio-types", "objc2-foundation", "std"] } +objc2-core-audio-types = { version = "0.3" } +objc2-core-foundation = { version = "0.3", features = ["CFBase"] } +objc2-core-graphics = { version = "0.3" } +objc2-core-video = { version = "0.3" } +objc2-foundation = { version = "0.3" } +objc2-metal = { version = "0.3" } +objc2-quartz-core = { version = "0.3", default-features = false, features = ["CALayer", "CAMediaTiming", "CAMetalLayer", "objc2-core-foundation", "objc2-core-graphics", "objc2-metal", "std"] } +quick-xml-b32c9ddb6d93a9d2 = { package = "quick-xml", version = "0.42", features = ["serialize"] } +rustix = { version = "1", features = ["event", "fs", "net", "pipe", "process", "termios", "time"] } +security-framework-sys = { version = "2" } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "metal", "portable-atomic"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winit = { version = "0.30" } + +[target.aarch64-apple-darwin.build-dependencies] +arrayvec = { version = "0.7" } +block2 = { version = "0.6" } +dispatch2 = { version = "0.3" } +errno = { version = "0.3" } +half = { version = "2", features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +image = { version = "0.25", default-features = false, features = ["jpeg", "png", "tiff"] } +libc = { version = "0.2", features = ["extra_traits"] } +miniz_oxide = { version = "0.8", features = ["simd"] } +objc2 = { version = "0.6" } +objc2-core-audio = { version = "0.3", default-features = false, features = ["AudioHardware", "AudioHardwareDeprecated", "objc2", "objc2-core-audio-types", "objc2-foundation", "std"] } +objc2-core-audio-types = { version = "0.3" } +objc2-core-foundation = { version = "0.3", features = ["CFBase"] } +objc2-core-graphics = { version = "0.3" } +objc2-core-video = { version = "0.3" } +objc2-foundation = { version = "0.3" } +objc2-metal = { version = "0.3" } +objc2-quartz-core = { version = "0.3", default-features = false, features = ["CALayer", "CAMediaTiming", "CAMetalLayer", "objc2-core-foundation", "objc2-core-graphics", "objc2-metal", "std"] } +quick-xml-b32c9ddb6d93a9d2 = { package = "quick-xml", version = "0.42", features = ["serialize"] } +rustix = { version = "1", features = ["event", "fs", "net", "pipe", "process", "termios", "time"] } +security-framework-sys = { version = "2" } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "metal", "portable-atomic"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winit = { version = "0.30" } + +[target.aarch64-unknown-linux-gnu.dependencies] +arrayvec = { version = "0.7" } +bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } +cudarc = { version = "0.19", default-features = false, features = ["cuda-12020", "driver", "fallback-dynamic-loading", "nvrtc"] } +event-listener = { version = "5" } +event-listener-strategy = { version = "0.5" } +futures-lite = { version = "2" } +getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +half = { version = "2", default-features = false, features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +itertools = { version = "0.13" } +libc = { version = "0.2", features = ["extra_traits"] } +libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] } +linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } +log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] } +miniz_oxide = { version = "0.8", features = ["simd"] } +nix = { version = "0.31", features = ["net", "uio"] } +nom-15128469a54ed75a = { package = "nom", version = "7" } +pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] } +proc-macro2 = { version = "1" } +quick-xml-4beaf6d1349630b6 = { package = "quick-xml", version = "0.41", features = ["overlapped-lists", "serialize"] } +quote = { version = "1" } +rustc-hash = { version = "1" } +rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +syn-7b89eefb6aaa9bf3 = { package = "syn", version = "3", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +tokio = { version = "1", default-features = false, features = ["tracing"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +uuid = { version = "1", default-features = false, features = ["serde"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "portable-atomic", "renderdoc", "vulkan"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winit = { version = "0.30" } + +[target.aarch64-unknown-linux-gnu.build-dependencies] +arrayvec = { version = "0.7" } +bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } +clang-sys = { version = "1", default-features = false, features = ["clang_11_0", "runtime"] } +cudarc = { version = "0.19", default-features = false, features = ["cuda-12020", "driver", "fallback-dynamic-loading", "nvrtc"] } +event-listener = { version = "5" } +event-listener-strategy = { version = "0.5" } +futures-lite = { version = "2" } +getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +half = { version = "2", default-features = false, features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +itertools = { version = "0.13" } +libc = { version = "0.2", features = ["extra_traits"] } +libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] } +linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } +log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] } +miniz_oxide = { version = "0.8", features = ["simd"] } +nix = { version = "0.31", features = ["net", "uio"] } +nom-15128469a54ed75a = { package = "nom", version = "7" } +pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] } +quick-xml-4beaf6d1349630b6 = { package = "quick-xml", version = "0.41", features = ["overlapped-lists", "serialize"] } +rustc-hash = { version = "1" } +rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +tokio = { version = "1", default-features = false, features = ["tracing"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +uuid = { version = "1", default-features = false, features = ["serde"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "portable-atomic", "renderdoc", "vulkan"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winit = { version = "0.30" } + +[target.x86_64-pc-windows-msvc.dependencies] +arrayvec = { version = "0.7" } +half = { version = "2", default-features = false, features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +image = { version = "0.25", default-features = false, features = ["bmp", "jpeg", "png"] } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "portable-atomic", "renderdoc", "vulkan"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winapi = { version = "0.3", default-features = false, features = ["cfg", "evntrace", "in6addr", "inaddr", "minwinbase", "minwindef", "ntsecapi", "processthreadsapi", "sysinfoapi", "winbase", "windef", "winioctl"] } +windows = { version = "0.62", features = ["Foundation_Metadata", "Graphics_Capture", "Graphics_DirectX_Direct3D11", "Security_Authorization_AppCapabilityAccess", "Wdk_System_SystemInformation", "Wdk_System_SystemServices", "Wdk_System_Threading", "Win32_Devices_DeviceAndDriverInstallation", "Win32_Devices_Display", "Win32_Devices_Properties", "Win32_Graphics_Direct3D10", "Win32_Graphics_Direct3D11", "Win32_Graphics_Direct3D12", "Win32_Graphics_Direct3D_Dxc", "Win32_Graphics_Direct3D_Fxc", "Win32_Graphics_DirectComposition", "Win32_Graphics_Dwm", "Win32_Graphics_Dxgi_Common", "Win32_Graphics_Gdi", "Win32_Graphics_OpenGL", "Win32_Media_Audio", "Win32_Media_KernelStreaming", "Win32_Media_MediaFoundation", "Win32_Media_Multimedia", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_Security_Authorization", "Win32_System_Com_StructuredStorage", "Win32_System_Diagnostics_Debug", "Win32_System_Diagnostics_ToolHelp", "Win32_System_Kernel", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Ole", "Win32_System_Performance", "Win32_System_Power", "Win32_System_ProcessStatus", "Win32_System_Registry", "Win32_System_RemoteDesktop", "Win32_System_Rpc", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_Variant", "Win32_System_WinRT_Direct3D11", "Win32_System_WinRT_Graphics_Capture", "Win32_System_Wmi", "Win32_UI_HiDpi", "Win32_UI_Shell_PropertiesSystem", "Win32_UI_WindowsAndMessaging"] } +windows-core = { version = "0.62" } +windows-result = { version = "0.4" } +windows-sys-b21d60becc0929df = { package = "windows-sys", version = "0.52", features = ["Win32_Devices_HumanInterfaceDevice", "Win32_Foundation", "Win32_Globalization", "Win32_Graphics_Dwm", "Win32_Graphics_Gdi", "Win32_Media", "Win32_Networking_WinSock", "Win32_Security", "Win32_System_Com_StructuredStorage", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Ole", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_WindowsProgramming", "Win32_UI_Accessibility", "Win32_UI_Controls", "Win32_UI_HiDpi", "Win32_UI_Input_Ime", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Input_Pointer", "Win32_UI_Input_Touch", "Win32_UI_Shell", "Win32_UI_TextServices", "Win32_UI_WindowsAndMessaging"] } +windows-sys-d4189bed749088b6 = { package = "windows-sys", version = "0.61", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Wdk_System_IO", "Win32_Graphics_Gdi", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Console", "Win32_System_DataExchange", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Ole", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_WindowsProgramming", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] } +winit = { version = "0.30" } + +[target.x86_64-pc-windows-msvc.build-dependencies] +arrayvec = { version = "0.7" } +half = { version = "2", default-features = false, features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +image = { version = "0.25", default-features = false, features = ["bmp", "jpeg", "png"] } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "portable-atomic", "renderdoc", "vulkan"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winapi = { version = "0.3", default-features = false, features = ["cfg", "evntrace", "in6addr", "inaddr", "minwinbase", "minwindef", "ntsecapi", "processthreadsapi", "sysinfoapi", "winbase", "windef", "winioctl"] } +windows = { version = "0.62", features = ["Foundation_Metadata", "Graphics_Capture", "Graphics_DirectX_Direct3D11", "Security_Authorization_AppCapabilityAccess", "Wdk_System_SystemInformation", "Wdk_System_SystemServices", "Wdk_System_Threading", "Win32_Devices_DeviceAndDriverInstallation", "Win32_Devices_Display", "Win32_Devices_Properties", "Win32_Graphics_Direct3D10", "Win32_Graphics_Direct3D11", "Win32_Graphics_Direct3D12", "Win32_Graphics_Direct3D_Dxc", "Win32_Graphics_Direct3D_Fxc", "Win32_Graphics_DirectComposition", "Win32_Graphics_Dwm", "Win32_Graphics_Dxgi_Common", "Win32_Graphics_Gdi", "Win32_Graphics_OpenGL", "Win32_Media_Audio", "Win32_Media_KernelStreaming", "Win32_Media_MediaFoundation", "Win32_Media_Multimedia", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_Security_Authorization", "Win32_System_Com_StructuredStorage", "Win32_System_Diagnostics_Debug", "Win32_System_Diagnostics_ToolHelp", "Win32_System_Kernel", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Ole", "Win32_System_Performance", "Win32_System_Power", "Win32_System_ProcessStatus", "Win32_System_Registry", "Win32_System_RemoteDesktop", "Win32_System_Rpc", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_Variant", "Win32_System_WinRT_Direct3D11", "Win32_System_WinRT_Graphics_Capture", "Win32_System_Wmi", "Win32_UI_HiDpi", "Win32_UI_Shell_PropertiesSystem", "Win32_UI_WindowsAndMessaging"] } +windows-core = { version = "0.62" } +windows-result = { version = "0.4" } +windows-sys-b21d60becc0929df = { package = "windows-sys", version = "0.52", features = ["Win32_Devices_HumanInterfaceDevice", "Win32_Foundation", "Win32_Globalization", "Win32_Graphics_Dwm", "Win32_Graphics_Gdi", "Win32_Media", "Win32_Networking_WinSock", "Win32_Security", "Win32_System_Com_StructuredStorage", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Ole", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_WindowsProgramming", "Win32_UI_Accessibility", "Win32_UI_Controls", "Win32_UI_HiDpi", "Win32_UI_Input_Ime", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Input_Pointer", "Win32_UI_Input_Touch", "Win32_UI_Shell", "Win32_UI_TextServices", "Win32_UI_WindowsAndMessaging"] } +windows-sys-d4189bed749088b6 = { package = "windows-sys", version = "0.61", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Wdk_System_IO", "Win32_Graphics_Gdi", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Console", "Win32_System_DataExchange", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Ole", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_WindowsProgramming", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] } +winit = { version = "0.30" } + +[target.x86_64-unknown-linux-gnu.dependencies] +arrayvec = { version = "0.7" } +bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } +cudarc = { version = "0.19", default-features = false, features = ["cuda-12020", "driver", "fallback-dynamic-loading", "nvrtc"] } +event-listener = { version = "5" } +event-listener-strategy = { version = "0.5" } +futures-lite = { version = "2" } +getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +half = { version = "2", default-features = false, features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +itertools = { version = "0.13" } +libc = { version = "0.2", features = ["extra_traits"] } +libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] } +linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } +log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] } +miniz_oxide = { version = "0.8", features = ["simd"] } +nix = { version = "0.31", features = ["net", "uio"] } +nom-15128469a54ed75a = { package = "nom", version = "7" } +pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] } +proc-macro2 = { version = "1" } +quick-xml-4beaf6d1349630b6 = { package = "quick-xml", version = "0.41", features = ["overlapped-lists", "serialize"] } +quote = { version = "1" } +rustc-hash = { version = "1" } +rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +syn-7b89eefb6aaa9bf3 = { package = "syn", version = "3", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +tokio = { version = "1", default-features = false, features = ["tracing"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +uuid = { version = "1", default-features = false, features = ["serde"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "portable-atomic", "renderdoc", "vulkan"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winit = { version = "0.30" } + +[target.x86_64-unknown-linux-gnu.build-dependencies] +arrayvec = { version = "0.7" } +bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } +clang-sys = { version = "1", default-features = false, features = ["clang_11_0", "runtime"] } +cudarc = { version = "0.19", default-features = false, features = ["cuda-12020", "driver", "fallback-dynamic-loading", "nvrtc"] } +event-listener = { version = "5" } +event-listener-strategy = { version = "0.5" } +futures-lite = { version = "2" } +getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +half = { version = "2", default-features = false, features = ["num-traits"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +itertools = { version = "0.13" } +libc = { version = "0.2", features = ["extra_traits"] } +libspa = { version = "0.10", default-features = false, features = ["v0_3_33"] } +linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } +log = { version = "0.4", default-features = false, features = ["release_max_level_debug"] } +miniz_oxide = { version = "0.8", features = ["simd"] } +nix = { version = "0.31", features = ["net", "uio"] } +nom-15128469a54ed75a = { package = "nom", version = "7" } +pipewire = { version = "0.10", default-features = false, features = ["v0_3_53"] } +quick-xml-4beaf6d1349630b6 = { package = "quick-xml", version = "0.41", features = ["overlapped-lists", "serialize"] } +rustc-hash = { version = "1" } +rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } +spin-93f6ce9d446188ac = { package = "spin", version = "0.10", default-features = false, features = ["once", "rwlock", "spin_mutex"] } +tokio = { version = "1", default-features = false, features = ["tracing"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } +tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } +tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } +tracing = { version = "0.1", default-features = false, features = ["log"] } +uuid = { version = "1", default-features = false, features = ["serde"] } +wgpu = { version = "30", features = ["fragile-send-sync-non-atomic-wasm", "webgl"] } +wgpu-core = { version = "30", features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "metal", "portable-atomic", "renderdoc", "vulkan", "webgl", "wgsl"] } +wgpu-hal = { version = "30", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "gles", "portable-atomic", "renderdoc", "vulkan"] } +wgpu-types = { version = "30", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "std", "web"] } +winit = { version = "0.30" } + +### END HAKARI SECTION diff --git a/rs/workspace-hack/build.rs b/rs/workspace-hack/build.rs new file mode 100644 index 00000000000..92518ef04cb --- /dev/null +++ b/rs/workspace-hack/build.rs @@ -0,0 +1,2 @@ +// A build script is required for cargo to consider build dependencies. +fn main() {} diff --git a/rs/workspace-hack/src/lib.rs b/rs/workspace-hack/src/lib.rs new file mode 100644 index 00000000000..22489f632bd --- /dev/null +++ b/rs/workspace-hack/src/lib.rs @@ -0,0 +1 @@ +// This is a stub lib.rs. diff --git a/sh/rs/hakari.py b/sh/rs/hakari.py new file mode 100755 index 00000000000..de33f75b734 --- /dev/null +++ b/sh/rs/hakari.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python3 +"""Fail when a workspace member's edge to the workspace-hack is missing or wrong. + +The hack is a path-only dev-dependency, so tests and lints share one build of +every third-party crate while `cargo publish` strips it. `cargo hakari +manage-deps` only writes normal dependencies, so this checks the edges instead: +every member dev-depends on the hack, except those `.config/hakari.toml` +excludes, which must not depend on it at all. Run from `just rs lint`. +""" + +import json +import subprocess +import sys +import tomllib +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[2] + +config = tomllib.loads((ROOT / ".config/hakari.toml").read_text()) +hack = config["hakari-package"] +excluded = {hack} +for section in ("final-excludes", "traversal-excludes"): + excluded |= set(config.get(section, {}).get("workspace-members", [])) + +metadata = json.loads( + subprocess.run( + ["cargo", "metadata", "--locked", "--no-deps", "--format-version", "1"], + cwd=ROOT, + check=True, + capture_output=True, + text=True, + ).stdout +) + +errors = [] +for package in metadata["packages"]: + name = package["name"] + edges = [dep for dep in package["dependencies"] if dep["name"] == hack] + manifest = Path(package["manifest_path"]).relative_to(ROOT) + if name in excluded: + if edges: + errors.append(f"{manifest}: {name} is excluded in .config/hakari.toml but depends on {hack}") + continue + # A version requirement would survive `cargo publish` and point at a crate + # that was never published. + if not any(dep["kind"] == "dev" and dep.get("path") and dep["req"] == "*" for dep in edges): + hack_dir = Path(next(p["manifest_path"] for p in metadata["packages"] if p["name"] == hack)).parent + rel = Path(*[".."] * len(manifest.parent.parts)) / hack_dir.relative_to(ROOT) + errors.append(f'{manifest}: add `{hack} = {{ path = "{rel}" }}` under [dev-dependencies]') + for dep in edges: + if dep["kind"] != "dev": + errors.append(f"{manifest}: {hack} must be a dev-dependency only, or publishing {name} fails") + +if errors: + print("\n".join(errors), file=sys.stderr) + sys.exit(1) From 5bb9a8438cd4e20717f0b2b75920b7c74c4aeb73 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Tue, 27 Oct 2026 21:42:14 -0700 Subject: [PATCH 03/11] ci: isolate third-party features per crate nightly Co-Authored-By: Claude Opus 5.5 --- rs/justfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rs/justfile b/rs/justfile index 621774f1f95..ac011ef7a8e 100644 --- a/rs/justfile +++ b/rs/justfile @@ -237,6 +237,8 @@ c-tests: # Benchmarks and examples stay in Nightly; the gate compiles the same targets # it tests, with both extremes exercising feature-gated implementation arms. +# Third-party features come from the workspace-hack here; `features` isolates +# those nightly. # Isolate selected packages so a dependent cannot enable a feature that hides a warning. [positional-arguments] @@ -251,6 +253,10 @@ features: just rs tokio-features --all just rs media-features --all bash sh/local.sh cargo check --locked --workspace {{ no_fuzz }} --all-targets --no-default-features + # The workspace-hack is a dev-dependency, so only library and binary builds + # prove that each crate declares the third-party features it uses. + bash sh/local.sh cargo hack check --locked --workspace {{ no_fuzz }} --no-default-features + bash sh/local.sh cargo hack check --locked --workspace {{ no_fuzz }} --all-features bash sh/local.sh cargo hack check --locked -p moq-tokio --each-feature --exclude-features _transport --features aws-lc-rs bash sh/local.sh cargo check --locked -p moq-relay --no-default-features just rs relay-minimal From a1b9b437ef82f86df207aea6e1cb55d22343f93f Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Tue, 27 Oct 2026 21:42:58 -0700 Subject: [PATCH 04/11] chore(quest): narrow hakari to the FFI builds and hosted numbers Co-Authored-By: Claude Opus 5.5 --- quest/m0/ci/README.md | 2 +- quest/m0/ci/hakari.md | 47 ++++++++++++++++--------------------------- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/quest/m0/ci/README.md b/quest/m0/ci/README.md index 2c991353a34..216bb291f37 100644 --- a/quest/m0/ci/README.md +++ b/quest/m0/ci/README.md @@ -131,7 +131,7 @@ The historical samples locate candidates; they are not controlled benchmarks. - [Measure the parallel frontend](/quest/m0/ci/nightly-levers.md) - a pinned nightly's parallel frontend, adopted only if the numbers beat its risks; Cranelift is ruled out - [Verify the R2 Rust cache](/quest/m0/ci/mbx-r2-verify.md) - measure the hosted Nightly jobs' hits, restore time, and expiry once the bump lands - [Verify the Nix cache](/quest/m0/ci/nix-cache-verify.md) - confirm CI and releases use `nix.moq.dev` and retire Cachix -- [Unify dependency features](/quest/m0/ci/hakari.md) - a cargo-hakari workspace-hack so every job compiles each dependency alike and mbx hits across jobs +- [Unify dependency features](/quest/m0/ci/hakari.md) - align the FFI builds' features and record the hosted platform jobs' hits once the workspace-hack lands - [Replay full-run failures against the selected gate](/quest/m0/ci/select-audit.md) - every dependency edge `just ci` misses is found and fixed with a test - [First shared FFI release](/quest/m0/ci/nightly-ffi-reuse.md) - condition: the backport merges and the next `moq-ffi-v*` tag runs `Release FFI`; verify the wrappers - [Fewer BTreeMap instantiations](/quest/m0/ci/btree-keys.md) - moq-net shares BTreeMap key and value types, kept only if its CPU time drops diff --git a/quest/m0/ci/hakari.md b/quest/m0/ci/hakari.md index 16ae437e734..377f473477f 100644 --- a/quest/m0/ci/hakari.md +++ b/quest/m0/ci/hakari.md @@ -1,12 +1,10 @@ -# [M] Unify dependency features with cargo-hakari +# [S] Unify dependency features with cargo-hakari ## Goal -Every CI job, the queue gate, Nightly's platform jobs, and the FFI builds -compile each dependency with the same features, so mbx's cache hits across -them. A cargo-hakari workspace-hack crate pins the union of the dependency -features, and the gate fails when it is out of date. Record mbx's hit rate across -jobs, and their CPU time, before and after. +The FFI builds compile each dependency with the same features as each other, +so mbx's cache hits across them, and Nightly's hosted platform jobs record +their hit rate and CPU time before and after the workspace-hack. ## Plan @@ -15,30 +13,19 @@ from guppy's authors, rather than only trimming CI's feature permutations. mbx keys every compilation on its inputs, so a dependency built with a different feature set in another job is a miss, however warm the cache. -- Generate the workspace-hack crate with `cargo hakari generate`, and add a - `cargo hakari generate --diff` and `cargo hakari manage-deps --dry-run` check to - `just check`. -- moq publishes crates with release-plz, and a published crate cannot depend on - an unpublished workspace-hack. Use hakari's supported setup for published - workspaces, and prove a release-plz dry run still publishes. -- Keep the feature-contract checks testing each crate's own declarations: the - `quic-features` recipe in `rs/justfile` (moq-quic has no native runtime), - `sh/rs/media-features.sh` (minimal builds exclude codecs and rendering), and - `sh/rs/net-features.sh` and `sh/rs/tokio-features.sh`. A workspace-hack would - inject the union into them and hide a missing declaration. Exclude the crates - they guard from the hack, or run those checks with it disabled - (`cargo hakari disable`), and show each still fails on a planted violation. -- Unifying features means some packages build features they don't use. Measure - whether that costs more CPU than the cache hits save; target, profile, and - `RUSTFLAGS` differences still split keys. -- Measure the baseline here, before generating the hack: across jobs, which - compilations one job misses although another job built the same crate at - the same version, grouped by what differs (features, profile, `RUSTFLAGS`, - target). Repeat it after, from the same commit. +[moq-dev/moq#6985](https://github.com/moq-dev/moq/pull/6985) added +`rs/workspace-hack` as a path-only dev-dependency of every member outside +`.config/hakari.toml`'s excludes. Test, lint, and bench builds now unify; +library-only builds do not, since dev-dependencies stay out of them. That +leaves the FFI builds (`cargo build --release -p moq-ffi` in the bindings and +release workflows), which also split on their own flags: the Dart build passes +the host triple as `--target` and adds the `testing` feature. Align those +invocations rather than add the hack to them, unless the PR's decision on the +layout says otherwise. -Decided 2026-10-27 (maintainer): this quest no longer waits on -[Verify the R2 Rust cache](/quest/m0/ci/mbx-r2-verify.md). It measures its own -before and after baseline, so the cross-job miss report moved here from that -quest, which stays a waiting quest for the R2 numbers alone. +Nightly's macOS and Windows jobs read and write R2, so their before and after +can only come from scheduled Nightlies on `main` +(`gh run list --workflow nightly.yml --branch main --event schedule`): compare +the mbx summaries of the last run before the merge with the first two after. Public API: none; the workspace-hack crate is not published. From cf2ca1e82de4b67ce23a086ad87af59fc838a529 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Tue, 27 Oct 2026 22:43:32 -0700 Subject: [PATCH 05/11] ci: leave the workspace-hack's formatting to cargo hakari Co-Authored-By: Claude Opus 5.5 --- .config/hakari.toml | 7 +------ .taplo.toml | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index 693ab4f27c9..65714649f33 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -16,12 +16,7 @@ resolver = "2" # Add triples corresponding to platforms commonly used by developers here. # https://doc.rust-lang.org/rustc/platform-support.html -platforms = [ - "aarch64-apple-darwin", - "aarch64-unknown-linux-gnu", - "x86_64-pc-windows-msvc", - "x86_64-unknown-linux-gnu", -] +platforms = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu"] # Write out exact versions rather than a semver range. (Defaults to false.) # exact-versions = true diff --git a/.taplo.toml b/.taplo.toml index f248b5f2cb8..be6e5af518b 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -1,5 +1,6 @@ # Skip vendored / build trees so `taplo format` doesn't recurse into them. -exclude = ["**/node_modules/**", "**/target/**", "**/dist/**", "**/.venv/**", "**/.direnv/**"] +# `cargo hakari` owns the workspace-hack's formatting; `just rs lint` checks it. +exclude = ["**/node_modules/**", "**/target/**", "**/dist/**", "**/.venv/**", "**/.direnv/**", "rs/workspace-hack/Cargo.toml"] # Match the existing repo style (4-space indent on Cargo.toml, lines up # to ~120 chars) so the initial format pass stays minimal. From 0c09d2a4b786c07828be0c4aae862e3aa315210c Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Thu, 29 Oct 2026 19:44:51 -0700 Subject: [PATCH 06/11] Give kio-macros its workspace-hack edge kio-macros landed on main in #7148 after this branch's last merge. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 1 + rs/kio/macros/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 4c15acacc9e..15dbbe7c994 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4723,6 +4723,7 @@ dependencies = [ "syn 2.0.119", "test-env", "trybuild", + "workspace-hack", ] [[package]] diff --git a/rs/kio/macros/Cargo.toml b/rs/kio/macros/Cargo.toml index fa1c926d4d5..5ec60ea4b57 100644 --- a/rs/kio/macros/Cargo.toml +++ b/rs/kio/macros/Cargo.toml @@ -30,6 +30,7 @@ kio = { path = "..", features = ["macros"] } test-env = { path = "../../test-env" } # Compiles each mistake in `tests/ui/` and checks the diagnostic it reports. trybuild = "1" +workspace-hack = { path = "../../workspace-hack" } [lints] workspace = true From 4ec3011d81b091a9731cec2ad035c9409ceaa546 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 30 Oct 2026 20:57:25 -0700 Subject: [PATCH 07/11] Keep kio-macros out of the workspace-hack trybuild copies a crate's dev-dependencies into the project it compiles each UI case in, so the workspace-hack edge made `kio-macros::ui` build the whole hack in trybuild's own target. In the land queue that took 88-120 s, timed out twice, and starved the timing-sensitive moq-c and moq-cli tests running beside it. Exclude kio-macros like kio; the hack itself is unchanged. Co-Authored-By: Claude Opus 5.5 --- .config/hakari.toml | 2 +- Cargo.lock | 1 - rs/kio/macros/Cargo.toml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index 65714649f33..d2bd0625237 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -25,4 +25,4 @@ platforms = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-pc-win workspace-members = ["moq-net-fuzz", "moq-quic-fuzz"] [final-excludes] -workspace-members = ["kio", "moq-audio", "moq-clock", "moq-net", "moq-quic", "moq-tokio", "moq-transcode", "moq-video"] +workspace-members = ["kio", "kio-macros", "moq-audio", "moq-clock", "moq-net", "moq-quic", "moq-tokio", "moq-transcode", "moq-video"] diff --git a/Cargo.lock b/Cargo.lock index 13c71a04d92..dab705619bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4723,7 +4723,6 @@ dependencies = [ "syn 2.0.119", "test-env", "trybuild", - "workspace-hack", ] [[package]] diff --git a/rs/kio/macros/Cargo.toml b/rs/kio/macros/Cargo.toml index 5ec60ea4b57..fa1c926d4d5 100644 --- a/rs/kio/macros/Cargo.toml +++ b/rs/kio/macros/Cargo.toml @@ -30,7 +30,6 @@ kio = { path = "..", features = ["macros"] } test-env = { path = "../../test-env" } # Compiles each mistake in `tests/ui/` and checks the diagnostic it reports. trybuild = "1" -workspace-hack = { path = "../../workspace-hack" } [lints] workspace = true From 56bb115ce796dc014938dbd286b773335cf6d3db Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 31 Oct 2026 22:07:11 -0700 Subject: [PATCH 08/11] ci: give every crate but kio-macros the workspace-hack edge wasm and loom are gone, so moq-clock and kio no longer need to stay out. The contract crates join too, maximizing the gate's cache sharing; features.yml disables the hack before their contract checks instead. Co-Authored-By: Claude Opus 5.5 --- .config/hakari.toml | 2 +- Cargo.lock | 9 +++++++++ rs/kio/Cargo.toml | 1 + rs/moq-audio/Cargo.toml | 1 + rs/moq-clock/Cargo.toml | 1 + rs/moq-net/Cargo.toml | 1 + rs/moq-quic/Cargo.toml | 1 + rs/moq-sign/Cargo.toml | 1 + rs/moq-tokio/Cargo.toml | 1 + rs/moq-transcode/Cargo.toml | 1 + rs/moq-video/Cargo.toml | 1 + 11 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index d2bd0625237..1cf0c2ee789 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -25,4 +25,4 @@ platforms = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-pc-win workspace-members = ["moq-net-fuzz", "moq-quic-fuzz"] [final-excludes] -workspace-members = ["kio", "kio-macros", "moq-audio", "moq-clock", "moq-net", "moq-quic", "moq-tokio", "moq-transcode", "moq-video"] +workspace-members = ["kio-macros"] diff --git a/Cargo.lock b/Cargo.lock index a886fbb3363..33091deb266 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4794,6 +4794,7 @@ dependencies = [ "kio-macros", "smallvec", "tokio", + "workspace-hack", ] [[package]] @@ -5378,6 +5379,7 @@ dependencies = [ "tokio", "tracing", "unsafe-libopus", + "workspace-hack", ] [[package]] @@ -5587,6 +5589,7 @@ dependencies = [ "serde_json", "serde_with", "tokio", + "workspace-hack", ] [[package]] @@ -5840,6 +5843,7 @@ dependencies = [ "tracing-test", "url", "uuid", + "workspace-hack", ] [[package]] @@ -5924,6 +5928,7 @@ dependencies = [ "tinyvec", "tracing", "tracing-subscriber", + "workspace-hack", ] [[package]] @@ -6139,6 +6144,7 @@ dependencies = [ "tempfile", "thiserror 2.0.21", "tokio", + "workspace-hack", "zeroize", ] @@ -6304,6 +6310,7 @@ dependencies = [ "web-transport-proto", "web-transport-trait", "webpki-roots 1.0.10", + "workspace-hack", "x509-parser", ] @@ -6325,6 +6332,7 @@ dependencies = [ "tracing", "url", "usage-rs", + "workspace-hack", ] [[package]] @@ -6437,6 +6445,7 @@ dependencies = [ "tracing-test", "wgpu", "windows", + "workspace-hack", "x11rb 0.14.0", "yuv", "zune-jpeg", diff --git a/rs/kio/Cargo.toml b/rs/kio/Cargo.toml index 4c98ec5b76d..aacfbbbeefb 100644 --- a/rs/kio/Cargo.toml +++ b/rs/kio/Cargo.toml @@ -29,6 +29,7 @@ smallvec = { version = "1.15", features = ["union"] } criterion = { package = "bench-harness", path = "../bench-harness" } futures = "0.3" tokio = { workspace = true, features = ["macros", "rt", "test-util", "time"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "tasks" diff --git a/rs/moq-audio/Cargo.toml b/rs/moq-audio/Cargo.toml index fa928ba7037..d6b1327c998 100644 --- a/rs/moq-audio/Cargo.toml +++ b/rs/moq-audio/Cargo.toml @@ -141,6 +141,7 @@ criterion = { package = "bench-harness", path = "../bench-harness" } serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true, features = ["macros", "rt", "test-util"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "bus" diff --git a/rs/moq-clock/Cargo.toml b/rs/moq-clock/Cargo.toml index dd63e5a305f..5276af64247 100644 --- a/rs/moq-clock/Cargo.toml +++ b/rs/moq-clock/Cargo.toml @@ -48,6 +48,7 @@ tokio = { workspace = true, features = ["rt", "time"], optional = true } moq-clock = { path = ".", default-features = false, features = ["manual", "sim", "serde"] } serde_json = { workspace = true } tokio = { workspace = true, features = ["rt", "rt-multi-thread", "test-util", "time"] } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-net/Cargo.toml b/rs/moq-net/Cargo.toml index ddaff4c7a5f..054957d89db 100644 --- a/rs/moq-net/Cargo.toml +++ b/rs/moq-net/Cargo.toml @@ -55,6 +55,7 @@ serde_json = { workspace = true } # it must not leak into the normal dependency feature set. tokio = { workspace = true, features = ["rt", "test-util", "time"] } tracing-test = { workspace = true } +workspace-hack = { path = "../workspace-hack" } # Optional per-thread CPU timing in the session benchmark. [target.'cfg(unix)'.dev-dependencies] diff --git a/rs/moq-quic/Cargo.toml b/rs/moq-quic/Cargo.toml index 38f7beb8a2e..ac82e4d59fe 100644 --- a/rs/moq-quic/Cargo.toml +++ b/rs/moq-quic/Cargo.toml @@ -73,6 +73,7 @@ proptest = { workspace = true } rand_pcg = { workspace = true } rcgen = { workspace = true, features = ["pem", "ring"] } tracing-subscriber = { version = "0.3.0", default-features = false, features = ["env-filter", "fmt", "ansi", "time", "local-time"] } +workspace-hack = { path = "../workspace-hack" } # Writes the generated fuzzer corpus to disk. Needs the `fuzz` feature, so a default # `--all-targets` build skips it rather than failing to find the module. diff --git a/rs/moq-sign/Cargo.toml b/rs/moq-sign/Cargo.toml index 8b1bff66dbc..bcad6ad0373 100644 --- a/rs/moq-sign/Cargo.toml +++ b/rs/moq-sign/Cargo.toml @@ -28,6 +28,7 @@ hex = { workspace = true } serde_json = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true, features = ["macros", "rt", "test-util"] } +workspace-hack = { path = "../workspace-hack" } [[bench]] name = "sign" diff --git a/rs/moq-tokio/Cargo.toml b/rs/moq-tokio/Cargo.toml index 56602658250..1664f7fee70 100644 --- a/rs/moq-tokio/Cargo.toml +++ b/rs/moq-tokio/Cargo.toml @@ -153,6 +153,7 @@ tokio = { workspace = true, features = ["test-util"] } tokio-rustls = { workspace = true } toml = "1.1" tracing-test = { workspace = true } +workspace-hack = { path = "../workspace-hack" } # The examples and integration tests run MoQ sessions, which a driver-only build lacks. [[example]] diff --git a/rs/moq-transcode/Cargo.toml b/rs/moq-transcode/Cargo.toml index 093eda73b8e..52089607cbc 100644 --- a/rs/moq-transcode/Cargo.toml +++ b/rs/moq-transcode/Cargo.toml @@ -54,6 +54,7 @@ moq-video = { path = "../moq-video", features = ["openh264"] } tokio = { workspace = true, features = ["full", "test-util"] } url = { workspace = true } usage-rs = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true diff --git a/rs/moq-video/Cargo.toml b/rs/moq-video/Cargo.toml index e86356cdb0a..b3b2c7ed351 100644 --- a/rs/moq-video/Cargo.toml +++ b/rs/moq-video/Cargo.toml @@ -288,6 +288,7 @@ pollster = { workspace = true } # `start_paused`, so the capture driver tests run on mocked time. tokio = { workspace = true, features = ["test-util"] } tracing-test = { workspace = true } +workspace-hack = { path = "../workspace-hack" } [lints] workspace = true From 7b45a5502131136da2e025b023d920efffa5fa8a Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 31 Oct 2026 22:29:09 -0700 Subject: [PATCH 09/11] ci: run the feature matrix with the workspace-hack disabled The hack supplies the union of third-party features, which would let a crate use one it never declares. features.yml disables it and re-resolves the lockfile before `just rs features`. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/features.yml | 5 +++++ rs/justfile | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/features.yml b/.github/workflows/features.yml index e99bf3a918b..b444e901f20 100644 --- a/.github/workflows/features.yml +++ b/.github/workflows/features.yml @@ -32,6 +32,11 @@ jobs: with: access-key-id: ${{ secrets.MBX_R2_ACCESS_KEY_ID }} secret-access-key: ${{ secrets.MBX_R2_SECRET_ACCESS_KEY }} + # The workspace-hack unifies third-party features so the gate's builds + # share a cache, which would hide a crate using a feature it does not + # declare. Every build here checks declarations, so it runs without it. + - name: Disable the workspace-hack + run: nix develop --command bash -c 'cargo hakari disable && cargo update --workspace' - name: Check feature and profile variants run: nix develop --command just ${{ matrix.recipe }} env: diff --git a/rs/justfile b/rs/justfile index 2415a73c745..94e3f59fdea 100644 --- a/rs/justfile +++ b/rs/justfile @@ -216,6 +216,10 @@ relay-minimal: c-tests: sh/rs/c-tests.sh +# The workspace-hack would supply third-party features a crate forgets to +# declare, so CI runs this after `cargo hakari disable && cargo update +# --workspace`; do the same locally, then `git checkout Cargo.lock rs/workspace-hack`. + # Compile the full feature matrix, including isolated combinations and their tests. features: just rs net-features --all From d351803650114eb2267ab8a6a01c9a036f15bc48 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Mon, 2 Nov 2026 06:57:50 -0800 Subject: [PATCH 10/11] ci: disable the workspace-hack for Android cross-builds Co-Authored-By: GPT-6.1 Sol --- .github/workflows/android.yml | 9 +++++++++ rs/justfile | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0851b000bfc..79877d84eaa 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -31,6 +31,7 @@ concurrency: env: CARGO_NDK_VERSION: 4.1.2 + CARGO_HAKARI_VERSION: 0.9.39 jobs: android: @@ -58,5 +59,13 @@ jobs: - name: Install cargo-ndk run: cargo install --locked "cargo-ndk@$CARGO_NDK_VERSION" + # The host dev-dependencies in the workspace-hack need the Nix shell's + # native libraries, which this cross-build deliberately runs without. + - name: Disable the workspace-hack + run: | + cargo install --locked "cargo-hakari@$CARGO_HAKARI_VERSION" + cargo hakari disable + cargo update --workspace + - name: Check run: just rs android diff --git a/rs/justfile b/rs/justfile index 00120372de8..0c77bde020a 100644 --- a/rs/justfile +++ b/rs/justfile @@ -190,7 +190,9 @@ x11-bench-ci: } 2>&1 | tee "$log" # moq-video's MediaCodec code is `#[cfg(target_os = "android")]`. Needs an NDK, -# which the dev shell lacks, so android.yml runs it outside Nix. `check` rather +# which the dev shell lacks, so android.yml runs it outside Nix with the +# workspace-hack disabled (`cargo hakari disable && cargo update --workspace`). +# Do the same locally, then restore Cargo.lock and rs/workspace-hack. `check` rather # than a denying clippy: the capture plumbing is dead on a target without a # capture backend. From fb988e87c7b111f2a432e05d750b415f2cf29fcc Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Mon, 2 Nov 2026 07:01:14 -0800 Subject: [PATCH 11/11] style: format the hakari dependency checker Co-Authored-By: GPT-6.1 Sol --- sh/rs/hakari.py | 55 +++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/sh/rs/hakari.py b/sh/rs/hakari.py index de33f75b734..4fb46d84822 100755 --- a/sh/rs/hakari.py +++ b/sh/rs/hakari.py @@ -11,46 +11,47 @@ import json import subprocess import sys -import tomllib from pathlib import Path +import tomllib + ROOT = Path(__file__).resolve().parents[2] config = tomllib.loads((ROOT / ".config/hakari.toml").read_text()) hack = config["hakari-package"] excluded = {hack} for section in ("final-excludes", "traversal-excludes"): - excluded |= set(config.get(section, {}).get("workspace-members", [])) + excluded |= set(config.get(section, {}).get("workspace-members", [])) metadata = json.loads( - subprocess.run( - ["cargo", "metadata", "--locked", "--no-deps", "--format-version", "1"], - cwd=ROOT, - check=True, - capture_output=True, - text=True, - ).stdout + subprocess.run( + ["cargo", "metadata", "--locked", "--no-deps", "--format-version", "1"], + cwd=ROOT, + check=True, + capture_output=True, + text=True, + ).stdout ) errors = [] for package in metadata["packages"]: - name = package["name"] - edges = [dep for dep in package["dependencies"] if dep["name"] == hack] - manifest = Path(package["manifest_path"]).relative_to(ROOT) - if name in excluded: - if edges: - errors.append(f"{manifest}: {name} is excluded in .config/hakari.toml but depends on {hack}") - continue - # A version requirement would survive `cargo publish` and point at a crate - # that was never published. - if not any(dep["kind"] == "dev" and dep.get("path") and dep["req"] == "*" for dep in edges): - hack_dir = Path(next(p["manifest_path"] for p in metadata["packages"] if p["name"] == hack)).parent - rel = Path(*[".."] * len(manifest.parent.parts)) / hack_dir.relative_to(ROOT) - errors.append(f'{manifest}: add `{hack} = {{ path = "{rel}" }}` under [dev-dependencies]') - for dep in edges: - if dep["kind"] != "dev": - errors.append(f"{manifest}: {hack} must be a dev-dependency only, or publishing {name} fails") + name = package["name"] + edges = [dep for dep in package["dependencies"] if dep["name"] == hack] + manifest = Path(package["manifest_path"]).relative_to(ROOT) + if name in excluded: + if edges: + errors.append(f"{manifest}: {name} is excluded in .config/hakari.toml but depends on {hack}") + continue + # A version requirement would survive `cargo publish` and point at a crate + # that was never published. + if not any(dep["kind"] == "dev" and dep.get("path") and dep["req"] == "*" for dep in edges): + hack_dir = Path(next(p["manifest_path"] for p in metadata["packages"] if p["name"] == hack)).parent + rel = Path(*[".."] * len(manifest.parent.parts)) / hack_dir.relative_to(ROOT) + errors.append(f'{manifest}: add `{hack} = {{ path = "{rel}" }}` under [dev-dependencies]') + for dep in edges: + if dep["kind"] != "dev": + errors.append(f"{manifest}: {hack} must be a dev-dependency only, or publishing {name} fails") if errors: - print("\n".join(errors), file=sys.stderr) - sys.exit(1) + print("\n".join(errors), file=sys.stderr) + sys.exit(1)