Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)#150972
Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom Jan 12, 2026
Merged
Conversation
Collaborator
|
Some changes occurred in compiler/rustc_attr_parsing cc @jdonszelmann, @JonathanBrouwer Some changes occurred in compiler/rustc_hir/src/attrs cc @jdonszelmann, @JonathanBrouwer Some changes occurred in compiler/rustc_passes/src/check_attr.rs |
Contributor
Author
|
@bors r=kivooeo |
Contributor
Contributor
Author
|
@bors rollup |
rust-bors bot
added a commit
that referenced
this pull request
Jan 11, 2026
Rollup of 7 pull requests Successful merges: - #147938 (Add const cloning of slices and tests) - #150438 (Remove mentions of debootstrap and chroots from the m68k-unknown-none-elf platform support doc) - #150723 (std: move `errno` and related functions into `sys::io`) - #150906 (Simplify `#[eii]` macro using methods on ecx) - #150938 (Port `#[collapse_debuginfo]` to the new attribute parsing system) - #150953 (std: sys: fs: uefi: Implement copy) - #150964 (Completely list all unparsed attributes) Failed merges: - #150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) r? @ghost
rust-bors bot
added a commit
that referenced
this pull request
Jan 11, 2026
Rollup of 7 pull requests Successful merges: - #147938 (Add const cloning of slices and tests) - #149718 (Add freeze file times on Windows) - #150438 (Remove mentions of debootstrap and chroots from the m68k-unknown-none-elf platform support doc) - #150906 (Simplify `#[eii]` macro using methods on ecx) - #150938 (Port `#[collapse_debuginfo]` to the new attribute parsing system) - #150953 (std: sys: fs: uefi: Implement copy) - #150964 (Completely list all unparsed attributes) Failed merges: - #150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) r? @ghost
rust-bors bot
added a commit
that referenced
this pull request
Jan 12, 2026
Rollup of 9 pull requests Successful merges: - #147938 (Add const cloning of slices and tests) - #149718 (Add freeze file times on Windows) - #150438 (Remove mentions of debootstrap and chroots from the m68k-unknown-none-elf platform support doc) - #150790 (feat: invisible character help string) - #150906 (Simplify `#[eii]` macro using methods on ecx) - #150938 (Port `#[collapse_debuginfo]` to the new attribute parsing system) - #150953 (std: sys: fs: uefi: Implement copy) - #150964 (Completely list all unparsed attributes) - #150975 (ui: add test for normalizing const projections with assoc const equality) Failed merges: - #150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) r? @ghost
Contributor
|
☔ The latest upstream changes (presumably #150981) made this pull request unmergeable. Please resolve the merge conflicts. This pull request was unapproved. |
fdd5e04 to
6d0f23a
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Contributor
Author
|
@bors r+ |
Contributor
Contributor
Author
|
@bors r- |
Contributor
|
Commit 6d0f23a has been unapproved. |
Contributor
Author
|
@bors r=kivooeo |
Contributor
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 12, 2026
Rename EII attributes slightly (being consistent in naming things foreign items, not extern items) r? @Kivooeo
rust-bors bot
added a commit
that referenced
this pull request
Jan 12, 2026
Rollup of 5 pull requests Successful merges: - #150861 (Folding/`ReErased` cleanups) - #150941 (rustc_parse_format: improve diagnostics for unsupported python numeric grouping) - #150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) - #150980 (Use updated indexes to build reverse map for delegation generics) - #150986 (std: Fix size returned by UEFI tcp4 read operations) r? @ghost
rust-bors bot
pushed a commit
that referenced
this pull request
Jan 12, 2026
Rollup of 8 pull requests Successful merges: - #150861 (Folding/`ReErased` cleanups) - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple) - #150920 (Use a hook to decouple `rustc_mir_transform` from `rustc_mir_build`) - #150941 (rustc_parse_format: improve diagnostics for unsupported python numeric grouping) - #150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) - #150980 (Use updated indexes to build reverse map for delegation generics) - #150986 (std: Fix size returned by UEFI tcp4 read operations) - #150996 (Remove `S-waiting-on-bors` after a PR is merged) r? @ghost
rust-bors bot
pushed a commit
that referenced
this pull request
Jan 12, 2026
Rollup of 8 pull requests Successful merges: - #150861 (Folding/`ReErased` cleanups) - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple) - #150920 (Use a hook to decouple `rustc_mir_transform` from `rustc_mir_build`) - #150941 (rustc_parse_format: improve diagnostics for unsupported python numeric grouping) - #150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) - #150980 (Use updated indexes to build reverse map for delegation generics) - #150986 (std: Fix size returned by UEFI tcp4 read operations) - #150996 (Remove `S-waiting-on-bors` after a PR is merged) r? @ghost
48 tasks
github-actions bot
pushed a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Jan 15, 2026
Rollup of 8 pull requests Successful merges: - rust-lang/rust#150861 (Folding/`ReErased` cleanups) - rust-lang/rust#150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple) - rust-lang/rust#150920 (Use a hook to decouple `rustc_mir_transform` from `rustc_mir_build`) - rust-lang/rust#150941 (rustc_parse_format: improve diagnostics for unsupported python numeric grouping) - rust-lang/rust#150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) - rust-lang/rust#150980 (Use updated indexes to build reverse map for delegation generics) - rust-lang/rust#150986 (std: Fix size returned by UEFI tcp4 read operations) - rust-lang/rust#150996 (Remove `S-waiting-on-bors` after a PR is merged) r? @ghost
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Jan 22, 2026
Rollup of 8 pull requests Successful merges: - rust-lang/rust#150861 (Folding/`ReErased` cleanups) - rust-lang/rust#150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple) - rust-lang/rust#150920 (Use a hook to decouple `rustc_mir_transform` from `rustc_mir_build`) - rust-lang/rust#150941 (rustc_parse_format: improve diagnostics for unsupported python numeric grouping) - rust-lang/rust#150972 (Rename EII attributes slightly (being consistent in naming things foreign items, not extern items)) - rust-lang/rust#150980 (Use updated indexes to build reverse map for delegation generics) - rust-lang/rust#150986 (std: Fix size returned by UEFI tcp4 read operations) - rust-lang/rust#150996 (Remove `S-waiting-on-bors` after a PR is merged) r? @ghost
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
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.
r? @Kivooeo