Skip to content

Merge train: #9736 + three commits missed by stale-head picks - #9737

Merged
proggeramlug merged 5 commits into
mainfrom
train121
Sep 4, 2026
Merged

Merge train: #9736 + three commits missed by stale-head picks#9737
proggeramlug merged 5 commits into
mainfrom
train121

Conversation

@proggeramlug

Copy link
Copy Markdown
Contributor

Merge train: #9736, plus three commits recovered from PRs I landed with a stale head.

The mistake this corrects

Merge trains cherry-pick from refs/pull/<n>/head fetched at assembly time. If an author pushes reviewed follow-ups between the fetch and the train, the train lands the pre-review version. I caught that on #9697 (re-fetched, took the author's better across_mut form) and then failed to re-check before assembling trains 119 and 120.

An audit of every PR landed today, by patch-id (git cherry, which survives the SHA rewrite that rebase-merge performs — a SHA comparison reports every rebase-merged PR as unlanded and is useless here), found four gaps. Three are recovered below; the fourth was already fixed by #9736.

#9732 was checked and is fine: git cherry flagged both its commits, but git diff origin/main <head> -- gc/trace.rs is empty, so the landed content matches the PR head. Patch-id noise from differing commit boundaries, not missing content.

Validation

64/64 lint gates (re-run after the three recovered commits, not just before); cargo test -p perry-runtime gc:: green; check_thread_locals back to the five pre-existing files.

Ralph Küpper added 5 commits September 4, 2026 17:03
The reordered initializer scan is a superset, not a replacement: a
self-recursive arrow, a named function expression, and a binding whose
initializer both creates a closure over it and is called immediately all
passed before this change and must keep passing. Verified identical on
both arms of the same-commit A/B.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant