You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This is an automated PR to update the subtree/library branch to the changes from 2025-11-25 (rust-lang/rust@c871d09) to 2026-04-01 (rust-lang/rust@48cc71e), inclusive. Review this PR as usual, but do not merge this PR using the GitHub web interface. Instead, once it is approved, use git push to literally push the changes to subtree/library without any rebase or merge.
Closing — subtree/library was corrupted by web-UI merges, now repaired
Root cause (my fault): starting with #615, several "Update subtree/library" PRs (#615, #633, #634, #636, #650, #652, #654) were merged with GitHub's "Squash and merge" button. Each of those produces a synthetic single-parent commit (Update subtree/library to … (#NNN)) that does not exist in the deterministic splitsh-lite extraction of upstream's library/.
The automated PR body asks for exactly the opposite:
Review this PR as usual, but do not merge this PR using the GitHub web interface. Instead, once it is approved, use git push to literally push the changes to subtree/library without any rebase or merge.
Those 7 squash commits diverged subtree/library from the real extraction, so every subsequent auto-generated PR became a non-fast-forward and showed conflicts. It also explains the duplicate "2026-03-02" PRs (#633/#634/#636/#650/#652/#654): the job's "nothing-to-do" check greps the extraction for the branch-HEAD message, and a squash message like Update subtree/library to 2026-03-02 (#654) never matches a real upstream commit — so it kept opening a fresh PR every day.
Repair: I restored subtree/library to the clean extraction by directly pushing this branch's commits (the procedure the PR asks for). Verified the previous subtree/library HEAD tree is byte-identical to extraction commit f890ece ("Rollup merge of rust-lang#153255"), so no content was lost — the 7 squash commits were just repackaged upstream changes that the extraction already contains.
Closing this PR since its commits are now in subtree/library. I've also updated the workflow to make the "do not merge via the UI" instruction far more prominent so this can't recur.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MaintenanceMaintenance related issues for the challange
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated PR to update the subtree/library branch to the changes from 2025-11-25 (rust-lang/rust@c871d09) to 2026-04-01 (rust-lang/rust@48cc71e), inclusive.
Review this PR as usual, but do not merge this PR using the GitHub web interface. Instead, once it is approved, use
git pushto literally push the changes tosubtree/librarywithout any rebase or merge.