Rollup of 7 pull requests#155700
Closed
JonathanBrouwer wants to merge 19 commits intorust-lang:mainfrom
Closed
Conversation
This is a callback used to track otherwise untracked state. It was added in rust-lang#116731 for Clippy. (It was originally named `hash_untracked_state`, and examples in the rustc-dev-guide still use that name.) The `StableHasher` argument is unused, and probably has never been used. There is a FIXME comment pointing this out, which was added more than a year ago. This commit removes the `StableHasher` callback argument. This also removes the need for `Options::untracked_state_hash`.
Commit 623c7d7 accidentally changed the return value from REGULAR_UNION to RegularEnum when converting string literals to enum values. Commit b17670d then renamed RegularUnion to Union, but the buggy return statement remained unchanged. This caused unions to be misclassified as enums, preventing LLDB from displaying union field contents.
… r=chenyukang Document #[diagnostic::on_move] in the unstable book. Also adds the attribute on `std::fs::File` to stay consistent with the prose in the unstable book entry. cc @estebank @rperier Rendered: <img width="791" height="903" alt="image" src="https://github.com/user-attachments/assets/a27a5211-7717-4f7f-a514-8316dccc78d5" /> <img width="779" height="390" alt="image" src="https://github.com/user-attachments/assets/a983108d-575e-4551-ab14-28611344e9b0" />
…state, r=bjorn3 Simplify `Config::track_state`. This is a callback used to track otherwise untracked state. It was added in rust-lang#116731 for Clippy. (It was originally named `hash_untracked_state`, and examples in the rustc-dev-guide still use that name.) The `StableHasher` argument is unused, and probably has never been used. There is a FIXME comment pointing this out, which was added more than a year ago. This commit removes the `StableHasher` callback argument. This also removes the need for `Options::untracked_state_hash`. r? @bjorn3
…cros, r=ehuss tests/ui/macros: add annotations for reference rules
Add docs about SDKs and C compilation on armv7a-vex-v5 This PR expands the documentation for armv7a-vex-v5 to fix broken links, add more information about SDKs, and create a new section about C compilation. I'm not super familiar with how Rust chooses what linker configuration to use / how the `cc` crate chooses what compiler to use - is this configuration to make C compilation work usually something that would be included in the compiler itself? Either way, it requires a lot of extra work which is kind of unfortunate (downloading a separate compiler, adding it to path, setting up a bunch of environment variables, and making a cargo config for linking).
Fix `get_child_at_index` return type hints returning `None` is valid when the index is invalid, so the type hints should reflect that
Fix array template arg lookup behavior Minor logic error. `get_template_args` expects a matching `<`/`>` pair. We were passing in an array type with the beginning `<` removed, so the template arg behavior would fail.
Fix classify_union to return Union for regular unions Commit 623c7d7 accidentally changed the return value from REGULAR_UNION to RegularEnum when converting string literals to enum values. Commit b17670d then renamed RegularUnion to Union, but the buggy return statement remained unchanged. This caused unions to be misclassified as enums, preventing LLDB from displaying union field contents.
Contributor
Author
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 23, 2026
Rollup of 7 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-2
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 23, 2026
…uwer Rollup of 7 pull requests Successful merges: - #155621 (Document #[diagnostic::on_move] in the unstable book.) - #155671 (Simplify `Config::track_state`.) - #153482 (tests/ui/macros: add annotations for reference rules) - #155075 (Add docs about SDKs and C compilation on armv7a-vex-v5) - #155685 (Fix `get_child_at_index` return type hints) - #155686 (Fix array template arg lookup behavior) - #155690 (Fix classify_union to return Union for regular unions)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
💔 Test for eaa4e84 failed: CI. Failed job:
|
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Member
|
Looks like CI failed with a flaky download error in |
Member
|
The failure is in @bors try jobs=aarch64-apple |
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 23, 2026
Rollup of 7 pull requests try-job: aarch64-apple
Contributor
Contributor
|
This pull request was unapproved due to being closed. |
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.
Successful merges:
Config::track_state. #155671 (SimplifyConfig::track_state.)get_child_at_indexreturn type hints #155685 (Fixget_child_at_indexreturn type hints)r? @ghost
Create a similar rollup