Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ffi/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ set shell := ["bash", "-euo", "pipefail", "-c"]
cargo_shim := if env("RUST2_CARGO_SHIM", "") == "" { "" } else { env("RUST2_CARGO_SHIM") + ":" }
export PATH := if env("RUST2_TS_TOOLCHAIN", "") == "" { env("PATH") } else { cargo_shim + env("RUST2_TS_TOOLCHAIN") / "bin:" + env("PATH") }

# The moq revision these recipes export by default: `just ts`'s, so both follow one moq.
# just's own path is quoted wherever bash runs it: on Windows, its backslashes are escapes.
moq_rev := shell(quote(just_executable()) + " --justfile ../ts/justfile --evaluate moq_rev")
# The moq revision these recipes export by default. It is the exporter's own pin, apart from
# the model fixture's in ts/fixtures/model/Cargo.toml, so bumping one does not wait on the other.
moq_rev := "ffcb7cd9748422daa30e935ec464108b5a8ebb71"

# swift-collections 1.7.5, whose `UniqueArray` the generated Swift imports.
swift_collections_rev := "f96b909e1a9e469620bc5037c1e24e00153f376f"
Expand Down
4 changes: 2 additions & 2 deletions quest/m1/ffi-export/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ Decided with the maintainer on 2026-11-12, in the quest audit:
- ✅ The epic's closing work is a child, [ship](/quest/m1/ffi-export/ship.md), which alone
requires [the refusals epic](/quest/m1/ffi-refusals/README.md). Rejected: the epic
requiring it, as [#701](https://github.com/kixel-ai/rust2/pull/701) left it, since an
epic's `Required` holds back every child, so none could start until moq's pin bump,
which waits on a rind release the maintainer holds.
epic's `Required` holds back every child, so none could start until moq's pin bump, which
then waited on a rind release the maintainer held.
- ✅ Every change that breaks the C ABI or a generated API is a child here, so it lands
before moq pins: the fused async start,
[owned buffers](/quest/m1/ffi-export/owned-bufs.md), and
Expand Down
7 changes: 3 additions & 4 deletions quest/m1/ffi-refusals/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ items, 41 of them in moq-tokio, and 6 types.

Decided with the maintainer on 2026-11-12, in the quest audit:

- ✅ The exporter pins moq on its own, apart from rust2-ts's pin
([own pin](/quest/m1/ffi-refusals/own-pin.md)), so its bump no longer waits on rind
building for wasm32, which only the translator needs. Rejected: one pin for both, at the
cost of two revisions to bump.
- ✅ The exporter pins moq on its own, apart from rust2-ts's pin, so its bump no longer
waits on rind building for wasm32, which only the translator needs. Rejected: one pin for
both, at the cost of two revisions to bump.
- The last per-construct child landed in
[#710](https://github.com/kixel-ai/rust2/pull/710), yet the Goal is not reached: the
2026-11-11 nightly census
Expand Down
38 changes: 17 additions & 21 deletions quest/m1/ffi-refusals/moq-pin.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# [S] Bump the moq pin past its re-export and reachability fixes
# [S] Bump the exporter's moq pin past its re-export and reachability fixes

## Goal

The moq pin moves to moq's current `main`, whose crates re-export no whole crate, moq's own
The exporter's moq pin moves to moq's current `main`, whose crates re-export no whole crate, moq's own
included. `just ffi census` there lists no whole-crate re-export refusal. Its "type not
reachable from the crate root" refusals are `kio::Pending` and `lite::version::Version`,
which the exporter change below exports, and moq-quic's stats and varint types under moq-tokio's `quic::driver`,
Expand Down Expand Up @@ -33,7 +33,8 @@ At `ffcb7cd9`, `container::Producer::modify` returns moq-mux's
session side also drops `quic::driver`.

Decided with the maintainer on 2026-11-07, in the quest audit: one pin bump for both, since
each is an XS bump of the same pin line. Rejected: one bump per moq quest.
each is an XS bump of the same pin line. Rejected: one bump per moq quest. Superseded on
2026-11-12 by the split below.

Both of moq's fixes merged on 2026-11-09:
[moq-dev/moq#8247](https://github.com/moq-dev/moq/pull/8247) dropped every whole-crate
Expand All @@ -44,22 +45,28 @@ re-export and re-exports `Guard`, and
`pub use kio;`), `lite::version::Version`, which was already unreachable at the pin, and
moq-tokio's `quic::driver` items, which the narrowed stand-in drops.

Then bump the pin in `ts/fixtures/model/Cargo.toml`, which `ts/justfile`'s `moq_rev` reads,
and report the census before and after. The last bump
([#390](https://github.com/kixel-ai/rust2/pull/390)) also changed `ffi/moq/ffi.toml`, every
`ffi/moq/moq.*`, and rust2-ts's model fixture, bench, and expected output, which share the
pin: run `just ts census` too, and update the count in the
[model epic](/quest/m2/ts-model/README.md).
Then bump the exporter's `moq_rev` in `ffi/justfile`, and report the census before and
after. The last bump ([#390](https://github.com/kixel-ai/rust2/pull/390)) also changed
`ffi/moq/ffi.toml`, every `ffi/moq/moq.*`, and rust2-ts's model fixture, bench, and expected
output, which then shared one pin. rust2-ts's pin moves in
[its own quest](/quest/m2/ts-model/moq-pin.md), so its census count is updated there.

Decided with the maintainer on 2026-11-09: bump to moq's current main now, and narrow the
Goal to the two moq-owned types. Rejected: wait for moq to fix the rest first. Not landed:
moq's `main` fails `just ts moq` and `just ffi moq-cpp`, so the bump waits on Waiting.
moq's `main` fails `just ts moq` and `just ffi moq-cpp`, so the bump waits on Waiting. The
split on 2026-11-12 moved the `just ts moq` failure to
[its own quest](/quest/m2/ts-model/moq-pin.md), so this bump waits on `just ffi moq-cpp` alone.

Decided 2026-11-11 (maintainer, /quest-unblock): ✅ (a) rust2 exports a type the crate root does
not reach by its defining path, such as `kio::Pending` and `lite::version::Version`; a type
whose defining path is itself private stays refused (rejected: (b) moq makes both reachable).
This quest makes the exporter change, in `ffi/src/collect.rs`, before the bump.

Decided with the maintainer on 2026-11-12, when the exporter's pin was split off: ✅ split the
bump, the exporter's pin here and rust2-ts's in [its own quest](/quest/m2/ts-model/moq-pin.md),
so this bump no longer waits on rind building for wasm32. Rejected: keep one bump for both
pins, which holds the exporter behind rind.

Measured on 2026-11-12 at moq's `main` `6936f0a`: `just ffi moq-cpp` fails the export with
36 errors, which the bump fixes in `ffi/moq/ffi.toml` or the exporter: 15 on the foreign
type `std::num::NonZero` (such as `Client::with_peer_hop`), 11 stale excludes naming nothing
Expand All @@ -69,16 +76,6 @@ returns that are not `Clone`.

## Waiting

- moq-dev/moq: `rind` builds for wasm32. moq-net depends on `rind`, whose md5 inline asm has
no wasm32 arm, so `just ts moq <checkout>` fails at moq's `main`. Done when it passes there.
The fix merged in rind's `main` ([kixel-ai/rind#543](https://github.com/kixel-ai/rind/pull/543))
and ships in rind 0.4.0. Its release PR
([kixel-ai/rind#511](https://github.com/kixel-ai/rind/pull/511)) stays unmerged on purpose,
as rind's `quest/m2/api/release-0.4.md` decides, until the CPU-check removal, the benchmark
refresh, and moq's move are ready (reconfirmed by the maintainer on 2026-11-12); then
[moq-dev/moq#8432](https://github.com/moq-dev/moq/pull/8432) moves moq to rind 0.4. Check:
`cargo search rind` shows 0.4.0. On 2026-11-12 moq `c681b7a` still locks rind 0.3.1, and
rind 0.3.2, tagged 2026-11-08, predates the fix.
- moq-dev/moq: moq-tokio builds without tripping `recursion_depth_exceeding_limit` (an
overflow proving `Send` on `Instrumented<...>`), which `just ffi moq-cpp <checkout>` denies.
Done when it passes at moq's `main`. Still failing on 2026-11-12 at moq `c681b7a`, at
Expand All @@ -88,5 +85,4 @@ returns that are not `Clone`.

## Required

- [Own pin](/quest/m1/ffi-refusals/own-pin.md) - the exporter's pin moves without rust2-ts's, which ends the wait on `rind` for wasm32
- [Every refusal at moq's main](/quest/m1/ffi-refusals/moq-main.md) - the rest of them, so the bump adds no exclude
22 changes: 0 additions & 22 deletions quest/m1/ffi-refusals/own-pin.md

This file was deleted.

5 changes: 5 additions & 0 deletions quest/m2/ts-model/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ calls (kio, with its clock, and moq-pattern), as it translates the codec today,

## Plan

Decided with the maintainer on 2026-11-12, when the exporter's pin was split off: ✅ the model
fixture's moq pin bumps in its own quest, [moq-pin](/quest/m2/ts-model/moq-pin.md), apart from
the exporter's, and that quest updates this epic's census count. Rejected: one bump for both
pins, which holds the exporter behind rind.

Decided with the maintainer on 2026-11-09, in the quest audit: ✅ WASM ships, and the
translation must beat it. [rust2-wasm](/quest/m2/wasm/README.md) is moq's browser route,
and its gate compares this translation against it; moq adopts the translation only where
Expand Down
42 changes: 42 additions & 0 deletions quest/m2/ts-model/moq-pin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# [XS] Bump rust2-ts's moq pin

## Goal

The model fixture's moq pin, the revision `ts/justfile`'s `moq_rev` reads, moves to moq's
current `main`, so `just ts moq` and `just ts census` measure the model there and the model
epic's census count is current. The exporter's pin moves on its own, in
[its bump](/quest/m1/ffi-refusals/moq-pin.md).

## Plan

Decided with the maintainer on 2026-11-12, when the exporter's pin was split off: ✅ rust2-ts's
pin bumps here, apart from the exporter's, so the exporter's bump no longer waits on rind
building for wasm32. Rejected: one bump for both pins, which holds the exporter behind rind.

- Set `rev` in `ts/fixtures/model/Cargo.toml` to moq's `main`, then run `cargo update -p moq-net`
there, as its comment says.
- Run `just ts moq <checkout>` and `just ts census`. Regenerate `expected/`, and any `ts/bench`
file the new moq API changes, as the last bump ([#390](https://github.com/kixel-ai/rust2/pull/390))
did for this pin.
- Update the census count in the [model epic](/quest/m2/ts-model/README.md) from the census at
the new pin.
- Touches no `ffi/` file: the exporter's bump owns those.

Public API: none. The translator's output changes only where moq's API does.

## Waiting

- moq-dev/moq: `rind` builds for wasm32. moq-net depends on `rind`, whose md5 inline asm has
no wasm32 arm, so `just ts moq <checkout>` fails at moq's `main`. Done when it passes there.
The fix merged in rind's `main` ([kixel-ai/rind#543](https://github.com/kixel-ai/rind/pull/543))
and ships in rind 0.4.0. Its release PR
([kixel-ai/rind#511](https://github.com/kixel-ai/rind/pull/511)) stays unmerged on purpose,
as rind's `quest/m2/api/release-0.4.md` decides, until the CPU-check removal, the benchmark
refresh, and moq's move are ready (reconfirmed by the maintainer on 2026-11-12); then
[moq-dev/moq#8432](https://github.com/moq-dev/moq/pull/8432) moves moq to rind 0.4. Check:
`cargo search rind` shows 0.4.0. On 2026-11-12 moq `c681b7a` still locks rind 0.3.1, and
rind 0.3.2, tagged 2026-11-08, predates the fix.

## Related

- [The exporter's moq pin](/quest/m1/ffi-refusals/moq-pin.md) - the same moq `main`, bumped on its own pin
2 changes: 1 addition & 1 deletion ts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1294,7 +1294,7 @@ so adding, removing, or reordering a case changes no other case's inputs.
Bun bundles a caller of `Decoder.u8` and `Decoder.new` through `import * as Decoder`,
which must keep only those and what they call.
- `model` depends on moq-net at the moq pin, its `rev`, which `just ts moq` and
`just ts census` check out too, and translates with it as one program. It is a
`just ts census` check out, and translates with it as one program. It is a
workspace of its own, so its lockfile keeps moq's checkout out of the package's inputs. Its harness
runs what of the model translates with nothing refused or bound, `Timestamp` and
`Timescale`: their constructors, conversions, `u128` reads, sums, differences,
Expand Down
2 changes: 1 addition & 1 deletion ts/fixtures/model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish = false
crate-type = ["lib", "cdylib"]

[dependencies]
# The moq pin, which `just ts moq`, `just ts census`, and `just ffi` check out too; bumping it is
# The moq pin, which `just ts moq` and `just ts census` check out; bumping it is
# `cargo update -p moq-net` after this rev. Without `async`, the model builds without a runtime.
moq-net = { git = "https://github.com/moq-dev/moq", rev = "ffcb7cd9748422daa30e935ec464108b5a8ebb71", default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions ts/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ bindgen := "fixtures/bindgen/Cargo.toml"
# The WebCodecs fixture, its own workspace like the wasm-bindgen fixture, behind web-sys's unstable APIs.
encoder := "fixtures/encoder/Cargo.toml"

# The moq revision `moq` and `census` translate and `just ffi` exports by default: the one
# the model fixture builds. Read without taplo, which the nightly's runners outside Nix lack.
# The moq revision `moq` and `census` translate by default: the one the model fixture builds.
# The exporter has its own pin in ffi/justfile. Read without taplo, which the nightly's runners outside Nix lack.
moq_rev_match := replace_regex(read(model), '(?s).*\nmoq-net = \{[^\n]*\brev = "([0-9a-f]{40})".*', '$1')
moq_rev := if moq_rev_match =~ '^[0-9a-f]{40}$' { moq_rev_match } else { error("no moq-net rev in " + model) }

Expand Down