diff --git a/quest/m1/README.md b/quest/m1/README.md index c4d2e4f177e..fd4dc98d05e 100644 --- a/quest/m1/README.md +++ b/quest/m1/README.md @@ -143,7 +143,6 @@ tracks, so per-group stats stop costing cluster announces. - [Unprefixed C++ free functions](/quest/m1/cpp-free-function-prefix.md) - generated free functions drop `moq_`, and `moq.hpp` deletes its five pass-through wrappers before C++ first publishes - [Error cleanups](/quest/m1/error-cleanups.md) - delete the unused `Error::SessionClosed`; raw transport failures already map to `Unroutable` - [FromStr parsers](/quest/m1/from-str-trait.md) - hang, moq-auth, and moq-msf implement `FromStr` instead of inherent `from_str` -- [Drop dead items](/quest/m1/drop-dead-items.md) - the audit's uncalled public items and test helpers are removed - [API-diff check](/quest/m1/api-diff.md) - a recipe diffs every published package's API against its last release, run on PRs into release and against main before the cut - [IETF lazy discovery](/quest/m1/ietf-lazy-discovery.md) - moq-transport sessions ask for announcements only under watched prefixes, starting with UNSUBSCRIBE_NAMESPACE on d14/15 - [Interop coverage](/quest/m1/interop-coverage/README.md) - the riskiest moq-transport features moq-net exposes get cross-implementation tests over the even drafts 14 to 22 diff --git a/quest/m1/drop-dead-items.md b/quest/m1/drop-dead-items.md deleted file mode 100644 index 7d704a0fd7d..00000000000 --- a/quest/m1/drop-dead-items.md +++ /dev/null @@ -1,27 +0,0 @@ -# [S] Remove uncalled public items - -## Goal - -The uncalled items the dead-code audit found are gone: moq-cli's `nvenc` and -`nvdec` Cargo feature aliases, `moq_net::Version::uses_setup_negotiation`, -and moq-net's test helper `track::Subscriber::assert_error`. The -`AnnounceConsumer::assert_next_*` helpers stay: `model/origin.rs` calls them -since [#5678](https://github.com/moq-dev/moq/pull/5678). - -## Plan - -From [moq-dev/moq#6166](https://github.com/moq-dev/moq/pull/6166). Decided -2026-10-21 with the maintainer: m2. -Moved to m1 on 2026-10-22 (maintainer, from an external API audit): the -cut is breaking anyway, so this break ships with it instead of forcing -another breaking release later. Verify each still has no caller across -the repo, bindings included, before removing it; keep any that gained one. -The test helper lives in `model/track.rs`, which many open PRs churn, so -expect merge conflicts there. - -Public API: breaking for moq-cli (features) and moq-net (`Version`), with a -`MIGRATE.md` entry in each. Wire: none. - -## Related - -- [Dead code and API surface audit](/quest/m2/audit-dead-code.md) - the next audit run, whose baselines record these findings diff --git a/quest/m2/audit-dead-code.md b/quest/m2/audit-dead-code.md index ce466744dbb..229b165a74b 100644 --- a/quest/m2/audit-dead-code.md +++ b/quest/m2/audit-dead-code.md @@ -42,11 +42,11 @@ Start by comparing the live tree against these baselines: - Rustc misses unused `pub` items. Tokenizing the tree and keeping `pub` declarations whose name appears exactly once (`.scratch` script, not checked in) found, outside generated bindings: - - cfg(test) helpers `track::Subscriber::assert_error` and - `AnnounceConsumer::assert_next_restarted`/`assert_next_ended` in - moq-net's model, left alone because open PRs churned those files. - - Public items no consumer calls: `moq_net::Version::uses_setup_negotiation`, - `moq_tokio::Server::serve_both`, `quic::web` `ClientBuilder::with_server_certificates` + - cfg(test) helper `track::Subscriber::assert_error` in moq-net's model, + since removed. `AnnounceConsumer::assert_next_restarted`/`assert_next_ended` + also matched, but `model/origin.rs` calls them. + - Public items no consumer calls: `moq_net::Version::uses_setup_negotiation` + (since removed), `moq_tokio::Server::serve_both`, `quic::web` `ClientBuilder::with_server_certificates` and `ServerBuilder::with_certificate`, `hang` `Catalog::to_json_pretty`, `moq_audio::Format::is_planar`/`is_float`, and the vendored forks (`moq-quic`, `moq-sock`, `moq-v4l`) that keep upstream's surface. @@ -62,17 +62,16 @@ Start by comparing the live tree against these baselines: it. - There were 150 Cargo feature declarations across 27 manifests. Only three have no in-tree user: the moq-native tombstone's `android-logcat`, the QUIC - FIPS crypto feature, and moq-cli's `nvenc`/`nvdec` aliases. moq-video and - moq-transcode already dropped their own `nvenc`/`nvdec` aliases, so moq-cli's - are the next public removal to propose. + FIPS crypto feature, and moq-cli's `nvenc`/`nvdec` aliases, since removed + like moq-video's and moq-transcode's. - The settings registries declared 120 distinct long flags, 186 counting every `usage` declaration. Each one reaches a runtime consumer; the `--client-*`/`--server-*` QUIC and TLS spellings and the relay's legacy auth fields are hidden deprecated spellings that fail with migration guidance. Trace a flag through the config merge, not through prose or examples. -No public removal landed in this run. Propose any public removals -separately with their migration and consumer evidence. The public model and +No public removal landed in this run itself; the items marked removed above +went in a follow-up PR. Propose any public removals separately with their migration and consumer evidence. The public model and performance audits own their API and benchmark decisions. ## Required diff --git a/rs/moq-cli/Cargo.toml b/rs/moq-cli/Cargo.toml index ae9ce982ff9..949ffc0ab77 100644 --- a/rs/moq-cli/Cargo.toml +++ b/rs/moq-cli/Cargo.toml @@ -73,11 +73,6 @@ nvidia = ["moq-video?/nvidia", "moq-transcode?/nvidia"] # feature it turns on. Only bites when `capture`, `transcode`, or `play` pulls in # moq-video. openh264 = ["moq-video?/openh264", "moq-transcode?/openh264"] -# Compatibility aliases for the pre-consolidation names, kept so a manifest that -# already asks for the old split still resolves. Undocumented on purpose: the -# feature tables name only `nvidia`. -nvenc = ["nvidia"] -nvdec = ["nvidia"] # Intel/AMD VAAPI hardware encoding (Linux), opt-in like the moq-video feature # it turns on: libva is dlopen'd at runtime, but moq-vaapi's bindgen needs # libclang on the build host. Only bites when `capture`, `transcode`, or `play` diff --git a/rs/moq-cli/MIGRATE.md b/rs/moq-cli/MIGRATE.md index 215b3a099ff..f015f1cb53b 100644 --- a/rs/moq-cli/MIGRATE.md +++ b/rs/moq-cli/MIGRATE.md @@ -4,6 +4,10 @@ How to update your invocation and config for each breaking change, newest first. ## Unreleased +### The `nvenc` and `nvdec` Cargo features are removed ([#6483](https://github.com/moq-dev/moq/pull/6483)) + +Enable `nvidia` instead; the old names were aliases for it. + ### `import fmp4` and `import hls` unwrap to Legacy (#6250) Both now publish one `legacy` frame per sample instead of one `cmaf` frame per fragment. diff --git a/rs/moq-net/MIGRATE.md b/rs/moq-net/MIGRATE.md index 5b362199db7..35010b6c89b 100644 --- a/rs/moq-net/MIGRATE.md +++ b/rs/moq-net/MIGRATE.md @@ -4,6 +4,10 @@ How to update your code for each breaking change, newest first. ## Unreleased +### `Version::uses_setup_negotiation` is removed ([#6483](https://github.com/moq-dev/moq/pull/6483)) + +Match the version yourself: lite-01, lite-02, and moq-transport draft 14 negotiate the version in SETUP; every other version negotiates it through ALPN. + ### Sessions box their transport (#6176) `Driver` and `server::Handshake` lose their transport type parameter: write `moq_net::Driver` and `moq_net::server::Handshake`. diff --git a/rs/moq-net/src/model/track.rs b/rs/moq-net/src/model/track.rs index d45ab47a735..b43305916e1 100644 --- a/rs/moq-net/src/model/track.rs +++ b/rs/moq-net/src/model/track.rs @@ -7596,17 +7596,6 @@ impl Subscriber { ); } - // TODO assert specific errors after implementing PartialEq - pub fn assert_error(&mut self) { - assert!( - kio::wait(|waiter| self.poll_finished(waiter)) - .now_or_never() - .expect("should not block") - .is_err(), - "should be error" - ); - } - pub fn assert_is_clone(&self, other: &Self) { assert!(self.is_clone(other), "should be clone"); } diff --git a/rs/moq-net/src/version.rs b/rs/moq-net/src/version.rs index 4dd475fd29f..6a18116e641 100644 --- a/rs/moq-net/src/version.rs +++ b/rs/moq-net/src/version.rs @@ -211,15 +211,6 @@ impl Version { } } - /// Whether this version uses SETUP version-code negotiation - /// (as opposed to ALPN-only). - pub fn uses_setup_negotiation(&self) -> bool { - matches!( - self, - Self::Lite(lite::Version::Lite01 | lite::Version::Lite02) | Self::Ietf(ietf::Version::Draft14) - ) - } - /// Whether this is a lite protocol version. pub fn is_lite(&self) -> bool { match self {