diff --git a/ffi/justfile b/ffi/justfile index be40a0ad0..4d6cd90bc 100644 --- a/ffi/justfile +++ b/ffi/justfile @@ -68,7 +68,9 @@ moq checkout="": (standin checkout) cargo run --locked --quiet -- --config moq/ffi.toml --manifest-path target/moq-ffi/Cargo.toml --out "$out" # The lockfile the check resolved with pins what the export depends on. cp target/moq-ffi/Cargo.lock "$out/Cargo.lock" - cargo build --quiet --release --manifest-path "$out/Cargo.toml" --features kotlin + # A later nightly makes this future-compat lint a hard error; fail on it in moq's crates + # and the glue now, while the pin can still move. + RUSTFLAGS="-D recursion_depth_exceeding_limit" cargo build --quiet --release --manifest-path "$out/Cargo.toml" --features kotlin cc -std=c11 -pedantic -Wall -Wextra -Werror -I "$out/include" moq/moq.c "$out/target/release/libmoq.a" -lpthread -ldl -lm -o target/moq-test target/moq-test # The C++ header at OBS's standard, without exceptions or RTTI. diff --git a/quest/m1/ffi-export/README.md b/quest/m1/ffi-export/README.md index fd4492405..f3b968ae5 100644 --- a/quest/m1/ffi-export/README.md +++ b/quest/m1/ffi-export/README.md @@ -52,7 +52,6 @@ Every generator on the C ABI: - [moq-clock's C names once it moves into kio](/quest/m1/ffi-export/crates.md) - `moq_now` and `moq_origin` become the clock's, after moq moves it into `kio::clock` - [Sessions on moq-tokio](/quest/m1/ffi-export/session-tokio.md) - bindings connect and accept with one call, the library running moq-tokio inside - [Sessions on sans-IO QUIC](/quest/m1/ffi-export/session-quic.md) - bindings move UDP datagrams and drive the session's poll themselves -- [The recursion depth lint on moq's export](/quest/m1/ffi-export/recursion-lint.md) - `just ffi moq` builds clean before the lint becomes an error - [C++ bindings on MSVC and Clang](/quest/m1/ffi-export/cpp.md) - the C++ header built and tested beyond GCC on Linux - [Kotlin bindings: zero-copy payloads and the read path](/quest/m1/ffi-export/kotlin.md) - the Kotlin lends bytes without a copy, and reads at JNI's cost - [Kotlin bindings on Android](/quest/m1/ffi-export/kotlin-android.md) - an R8 keep rule for JNI's lookups, and an emulator run in CI diff --git a/quest/m1/ffi-export/recursion-lint.md b/quest/m1/ffi-export/recursion-lint.md deleted file mode 100644 index c0d40731e..000000000 --- a/quest/m1/ffi-export/recursion-lint.md +++ /dev/null @@ -1,19 +0,0 @@ -# [S] The recursion depth lint on moq's export - -## Goal - -`just ffi moq` builds with no `recursion_depth_exceeding_limit` warning, before the pinned -nightly turns that future-compat lint into a hard error and the export stops building. - -## Plan - -Found by [#144](https://github.com/kixelated/rust2/pull/144) on 2026-10-27: the lint fires on -`Send` checks in moq-net, moq-tokio, and the generated `moq_ffi`. - -- Find which types' `Send` checks recurse that deep, and whether the generated glue makes - them deeper than moq's own code does. -- Fix the generated part here. A part in moq's own crates is moq's change, recorded in - moq's tree; a `recursion_limit` raise is a stopgap only if neither can avoid the depth. -- Fail the build on the lint once it is gone, so it does not come back. - -Public API: none.