fix: repair dev, which the last main merge left uncompilable

[kixelated]

Summary

dev does not pass just check, so every branch based on it fails CI (including #3396). Three independent pieces of fallout from Merge main into dev (6947217), where a conflict-free textual merge was not a semantic one.

1. rs/moq-tokio/tests/broadcast.rs does not compile

The merge brought main's new broadcast_moq_transport_20_current_group_join test in verbatim. On main that test lives in rs/moq-native/tests/broadcast.rs and predates both #3225 (announcements are prefix routes) and the moq-native to moq-tokio split, so it references four things that no longer exist on dev:

• Origin::random().produce() → moq_tokio::origin::spawn(Hop::random())
• create_broadcast(path, broadcast::Route::new().with_announce(true)) → create_broadcast(path) plus a separate announce(path, ..)
• moq_native::{ServerConfig,ClientConfig} → moq_tokio::{listen,connect}::Config (with tls.disable_verify → tls.insecure, and init() → init(..) + listen())
• announce::Update::broadcast → Update { prefix, route, active }, resolved through request_broadcast

The merge also glued next_announce's doc comment onto the new test's, leaving next_announce undocumented and the test's own doc opening on an unrelated sentence.

Ported onto dev's API, matching the neighbouring tests. The assertions the test exists for (group 0 stitched from the fill fetch stream plus the subgroup stream, in order, ending exactly once) are unchanged.

2. cargo shear: an unused humantime

rs/moq-cli declares humantime and no source file uses it. The usage-rs migration (#3030) replaced clap's value_parser = humantime::parse_duration with usage-rs' own duration parsing and dropped the dependency in the same commit; main still had the clap spelling, so the merge took main's side of the manifest and put the dependency back without any of the uses.

3. cargo sort: moq-sock out of order

moq-sock sits above moq-rtc and moq-rtmp in the root [workspace.dependencies]. cargo sort --workspace --check --no-format fails on it.

Each of the three is independently fatal, and the second and third only surface once the first stops failing the build, which is why they came out one CI round at a time.

Test plan

• cargo check -p moq-tokio --tests clean.
• cargo test -p moq-tokio --test broadcast broadcast_moq_transport_20_current_group_join passes.
• cargo check -p moq-cli clean without the dependency.
• cargo shear reports no issues; cargo sort --workspace --check --no-format clean.
• cargo fmt -p moq-tokio clean.

Test, WASM, Swift, and OBS already pass on this branch; Check is what these three fix.

Note

#3396 carries its own copy of fix 1 (38be5113b), so whichever lands first, the other needs a rebase. Fixes 2 and 3 are only here, and #3396 cannot go green without them.

🤖 Generated with Claude Code

[chatgpt-codex-connector]

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-09-04T21:42:31.542923Z	1488960	New commits

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.