Rollup of 4 pull requests#155872
Closed
JonathanBrouwer wants to merge 10 commits intorust-lang:mainfrom
Closed
Conversation
Rust packs rlib metadata into a lib.rmeta archive member encoded as a Mach-O object. For Apple arm64e, extend the existing metadata-object subtype special case from bare CPU_SUBTYPE_ARM64E to CPU_SUBTYPE_ARM64E | CPU_SUBTYPE_PTRAUTH_ABI.
core: drop unmapped ZSTs in array `map` Fixes rust-lang#152211. Alternative to rust-lang#152220 and rust-lang#152248. This makes the `Drain` type use the same ZST-handling strategy as `slice::IterMut`, which stores the remaining length instead of a one-past-the-end pointer when the type is a ZST. I've also removed the const-generic `N` parameter from `Drain` to avoid unnecessary monomorphizations.
…4e-ptrauth-core-diagnostics-2026-04-24-u9836b06, r=madsmtm arm64e: set ptrauth ABI subtype on lib.rmeta Mach-O objects Set `CPU_SUBTYPE_PTRAUTH_ABI` (as well as the existing `CPU_SUBTYPE_ARM64E`) on ARM64e object files that `rustc` creates, to match Clang/LLVM-generated ARM64e objects. This corresponds to `cpusubtype == 0x80000002`. Before this change, rustc emitted the bare `CPU_SUBTYPE_ARM64E` subtype for the metadata wrapper objects / `symbols.o` file, producing `0x00000002`, which can be reported by Apple's linker as `arm64e.old`. Fixes [rust-lang#130085](rust-lang#130085). Fixes [rust-lang#143844](rust-lang#143844). Fixes [rust-lang#150046](rust-lang#150046). Fixes [rust-lang#139218](rust-lang#139218).
…uillaumeGomez Fix panic for doc attributes on where predicates Fixes rust-lang#155804 r? @GuillaumeGomez
add test for accidentally fixed `binius_field` issue cc rust-lang#153614 (comment) r? @lqd
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 27, 2026
…uwer Rollup of 4 pull requests Successful merges: - #152487 (core: drop unmapped ZSTs in array `map`) - #155716 (arm64e: set ptrauth ABI subtype on lib.rmeta Mach-O objects) - #155864 (Fix panic for doc attributes on where predicates) - #155865 (add test for accidentally fixed `binius_field` issue)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
rust-bors
Bot
added
S-waiting-on-review
Contributor
|
💔 Test for f81797f failed: CI. Failed job:
|
rust-bors
Bot
added
the
S-waiting-on-author
rust-bors
Bot
removed
the
S-waiting-on-review
Contributor
|
PR #152487, which is a member of this rollup, was unapproved. |
rustbot
removed
the
S-waiting-on-author
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Successful merges:
map#152487 (core: drop unmapped ZSTs in arraymap)binius_fieldissue #155865 (add test for accidentally fixedbinius_fieldissue)r? @ghost
Create a similar rollup