Rollup of 8 pull requests#157161
Open
JonathanBrouwer wants to merge 23 commits into
Open
Conversation
- the test was ported from this commit: llvm/llvm-project@3009211
* rustdoc: correctly propagate cfgs for glob reexports * address review feedback, add a comment explaining the test * empty commit to trigger CI * empty commit to trigger CI * fix sorting of features in tests * assert contents of index.html
This reverts commit 29e9273
…degen Dockerfile for the core tests" This reverts commit fd0c5f3. The correct fix was made in PR 157007.
Make hint::cold_path #[cold] so that it works even if the MIR inliner can't inline it This fixes rust-lang#156859 because the branch weight metadata is actually keyed off seeing a `#[cold]` function call in an arm. We don't need the intrinsic, any `#[cold]` function will do. So if the hint wrapper itself is made `#[cold]`, we will still get the desired effect, and LLVM will clean up the call to an empty function when optimizations are enabled.
Correct and document semantics of `yield` terminator The current implementation of dataflow for the yield terminator confuses the `drop` target with unwinding. Which is wrong, in particular when implementing async drops. r? @RalfJung
…acro-expansion, r=Urgau [rustdoc] Fix foreign items macro expansion Fixes rust-lang#156486. The ICE was coming from ast pretty printing not handling `...` (C var args). To handle that, I added a `CVarArgs` variants for all `PatKind` enums. Second part (and second commits) was to correctly handle foreign items in rustdoc. r? @Urgau
…zelmann Revert "drop derive helpers during ast lowering" Fixes rust-lang#157107 By undoing commit rust-lang@29e9273 from rust-lang#153540 cc @scrabsha @jdonszelmann
…ofiling-switch, r=folkertdev Rename `-Zdebuginfo-for-profiling` switch The PR was raised from this [comment](rust-lang#155942 (comment)) from another stabilization PR: rust-lang#155942 I renamed `-Zdebug-info-for-profiling` into `-Zdebuginfo-for-profiling` before stabilization to be consistent with other `debuginfo`-related Rustc flags like `-C split-debuginfo` and `-C debuginfo`. One important note is that Clang has the [flag](https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fdebug-info-for-profiling) under `-fdebug-info-for-profiling`. I decided that consistency with other Rustc flags is more important here than to be consistent with Clang. r? folkertdev (as was proposed [here](rust-lang#155942 (comment)))
…mbination, r=GuillaumeGomez rustdoc: correctly propagate cfgs for glob reexports This fixes some cases of rustdoc not surfacing the correct required feature combination when using `#[cfg(feature = ...)]` in combination with glob reexports. See the example cases included as tests. Here's the generated HTML for those test cases before this change: <img width="150" height="115" alt="Screenshot_20260528_201140" src="https://github.com/user-attachments/assets/8d611f88-7149-49f6-8ee0-530c049ea858" /> and after: <img width="225" height="125" alt="Screenshot_20260528_201236" src="https://github.com/user-attachments/assets/85cc07c0-9a9a-455f-8ada-69d44d645516" /> My understanding is that this was basically an off-by-one type of oversight. We need to update `is_inline` before calling `get_all_import_attributes` to immediately reflect that the outermost import we're processing shall indeed be considered as inline, as it's a glob. Otherwise, we will end up calling `add_without_unwanted_attributes` with `is_inline == false` on the "intermediate" re-export, which will skip propagating its `cfg`s. I believe this fixes rust-lang#96166, even though the description there is not super clear on the exact test case they used (there's a snippet but the author says their code is actually different). Refs rust-lang#43781 @rustbot label +F-doc_cfg @rustbot r? @GuillaumeGomez
…ng2, r=mejrs Rewrite the `#[repr]` attribute parser The `#[repr]` attribute parser was one of the first attribute parsers we made, and didn't use a lot of the awesome infra we have nowadays yet, so in preparation for a new approach I'm trying for rust-lang#156569 I decided to clean it up. This PR should have no observable effect other than improved diagnostic messages. r? @mejrs
…llaumeGomez Revert workaround used to select the gcc codegen in the coretests CI Now that rust-lang#157007 is merged, this is not needed anymore. I made a test (see [here](rust-lang#157154 (comment))) to make sure this still uses the GCC codegen. r? @Kobzol
rustbot
added
A-attributes
rustbot
added
T-infra
Contributor
Author
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
|
⌛ Trying commit 62cc806 with merge af992e2… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/26688406923 |
rust-bors Bot
pushed a commit
that referenced
this pull request
May 30, 2026
Rollup of 8 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
Contributor
|
⌛ Testing commit 62cc806 with merge f8a08b6... Workflow: https://github.com/rust-lang/rust/actions/runs/26689886134 |
rust-bors Bot
pushed a commit
that referenced
this pull request
May 30, 2026
…uwer Rollup of 8 pull requests Successful merges: - #156863 (Make hint::cold_path #[cold] so that it works even if the MIR inliner can't inline it) - #156875 (Correct and document semantics of `yield` terminator) - #157115 ([rustdoc] Fix foreign items macro expansion) - #157150 (Revert "drop derive helpers during ast lowering" ) - #156887 (Rename `-Zdebuginfo-for-profiling` switch) - #157039 (rustdoc: correctly propagate cfgs for glob reexports) - #157125 (Rewrite the `#[repr]` attribute parser) - #157154 (Revert workaround used to select the gcc codegen in the coretests CI)
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
7 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:
yieldterminator #156875 (Correct and document semantics ofyieldterminator)-Zdebuginfo-for-profilingswitch #156887 (Rename-Zdebuginfo-for-profilingswitch)#[repr]attribute parser #157125 (Rewrite the#[repr]attribute parser)r? @ghost
Create a similar rollup