fix(repo): unbreak main — five red gates, and the deadlock between their fixes - #2015
Conversation
…eir fixes `main` at 6c34553 fails five independent gates. Three PRs already carry four of the fixes (#2000, #2003, #2005), but two of them cannot go green on their own, so none of them can land: * #2003 regenerates the file-size baseline and nothing else, so it fails `wire-schema` — main's `docs/wire/` is stale against its own types. * #2005 regenerates `docs/wire/` and the park consumers, so it fails `file-size` — the baseline skew is #2003's fix. Each is red on precisely the gate the other repairs. This branch carries both, plus #2000's clippy and rustdoc repairs, so the set can land at once. Authorship: the substantive hunks are from those three PRs, collected here rather than re-derived. Close them as superseded, or close this one if they can be sequenced another way. The five gates, each verified against origin/main before and after: * lint — a dead `spend` local (#2000) * doc-warnings — `[`CompactionRewrite`]` resolves only through the crate-level re-export, so the bare name links to nothing. Layered masking hid it: rustdoc stops at the first crate that fails, and #1970 had to fix stella-cli before stella-protocol became visible. * format-check — a missing trailing newline in `event/tests.rs` (#2005) * file-size — baseline skew from parallel merges, regenerated with `make file-size-update`, never hand-edited (#2003) * wire-schema — `docs/wire/` regenerated against the TurnParked/TurnWoken types #1994 added (#2005)
There was a problem hiding this comment.
Sorry @macanderson, you have reached your weekly rate limit of 500000 diff characters.
Please try again later or upgrade to continue using Sourcery
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
Reviewer's GuideConsolidates fixes from multiple PRs to restore all CI gates (lint, doc warnings, format, file-size, wire-schema) by wiring new park/wake events through protocol, TUI, and observatory, cleaning up test and pipeline code, and regenerating wire/docs and file-size baselines. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
✅ Independently verified green. Checked out this head ( This is the PR that clears
Two notes for whoever merges:
The fmt break was mine, from #1994. Thanks for picking it up here. |
The problem
mainat 6c34553 fails five independent gates. Four fixes already exist across #2000, #2003 and #2005 — but two of those PRs are red on exactly the gate the other one repairs, so none of them can merge:scripts/file-size-baseline.txtand touches nothing else → failswire-schema, because main'sdocs/wire/is stale against its own types.docs/wire/and the park consumers → failsfile-size, because the baseline skew is fix(repo,stella-pipeline,stella-protocol): unbreak main — file-size skew, a dead binding, and a broken doc link #2003's fix.That is a deadlock, and it is why main has stayed red while three unbreak PRs sat open. This branch carries both halves plus #2000's repairs so the set can land in one merge.
The five gates
lintspendlocaldoc-warnings[CompactionRewrite]resolves only via the crate-level re-exportformat-checkevent/tests.rsfile-sizedriver.rs+1,pipeline/tests.rs+1)wire-schemadocs/wire/stale against #1994'sTurnParked/TurnWokenThe rustdoc one is worth a note: layered masking, the shape #1965 records. Rustdoc stops at the first crate that fails to document, so #1970 had to repair
stella-clibeforestella-protocolunderneath it became visible at all. Anyone fixing one layer and re-running would reasonably have believed they were done.Authorship
The substantive hunks are from #2000, #2003 and #2005 — collected here, not re-derived, so their authors keep the credit. Close those three as superseded if this lands, or close this one if they can be sequenced another way; the point is that they cannot each be green independently. I also opened #2010 for the rustdoc break before finding #2000 already covered it, and closed it as a duplicate.
Verification
Run against this exact tree, each gate with the command the Makefile uses:
cargo clippy --workspace --all-targets -- -D warningsRUSTDOCFLAGS="-D warnings" cargo doc --workspace --no-depscargo fmt --all -- --checkscripts/check-file-size.shmake wire-schemadocs/wire/matches the typescargo test -p stella-protocol -p stella-pipeline -p stella-tui -p stella-coreEach was also confirmed failing on
origin/mainbeforehand, so this is a demonstrated repair rather than an assumed one.One caveat, stated rather than buried:
stella-tui'srun_deck_paints_folds_resizes_and_restores_under_a_real_ptyfailed once in the batch run and passed in isolation (20s, against an 81s timeout) — a real-PTY timing flake under concurrent build load, not a regression.The baseline was regenerated with
make file-size-update, never hand-edited — a hand-merged baseline is what produced the current skew.Note for reviewers
No witness test: every hunk restores an existing gate to green rather than changing behavior. The reproduction table above is the evidence, and each gate flips from fail to pass across this diff.
Summary by Sourcery
Unstick main by combining previously separate fixes so all gates pass together, including lint, doc warnings, formatting, file-size checks, and wire-schema consistency.
Bug Fixes:
Spendlocal from the pipeline scope stage.CompactionRewriteintra-crate link to the crate-level re-export and mirroring it in generated wire docs.event/tests.rs.scripts/file-size-baseline.txtto reflect current binary sizes so file-size checks match the regenerated code and tests.docs/wireschemas back in sync with protocol types and serveframe definitions, including theCompactionRewritedocumentation changes.turn_parkedandturn_wokenevents so journal gaps and wake reasons are visible.Enhancements:
Tests:
Chores: