Rollup of 5 pull requests #151234
Open
Rollup of 5 pull requests #151234
+325
−140
Conversation
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
…ocation on reexported item
While these test cases were inspired by issue 137467, they aren't directly related, and better fit into match-edge-cases_2.rs
…lds higher than 1
…crates-docs, r=jieyouxu Generate macro expansion for rust compiler crates docs Re-enable rust-lang#150022, which was disabled in rust-lang#149831 because some fixes hadn't been merged then. r? @jieyouxu
…=lolbinarycat Fix deprecated attribute intra-doc link not resolved in the right location on reexported item Fixes rust-lang#151028. Follow-up of rust-lang#150721. So when we resolve an intra-doc link, its current context (the module from which we resolve in short) is very important. However, when we use an intra-doc link in a `#[deprecated]` attribute on a reexported item, we were using the context of the reexported item and not of the `use` itself. Meaning that if you have an intra-doc link `std::mem::drop` on an item from another crate (let's say `core`), then the import will simply fail since there is no `std` dependency. Now comes the not so funny fix: at this point, we don't know anymore where the attribute came from (ie, from the reexport or from the reexported item) since we already merged the attribute at this point. The solution I found to go around this problem is to check if the item span contains the attribute, and if not, then we use the `inline_stmt_id` as context instead of the item's ID. I'm not super happy and I'm sure we'll find corner cases in the future (like with macros), however there are a few things that mitigate this fix: 1. The only way to generate an attribute with a macro with its item while having different spans is by using proc-macros. In that case, we can always default to the `inline_stmt_id` as context and be fine, but I guess we'll see when get there. 2. It only concerns reexports, so the area of the problem is quite restricted. Hopefully this explanation made sense. :) cc @folkertdev r? @lolbinarycat
…thar Preliminary match/capture test cleanup for PR 150681 Review for rust-lang#150681 requested that this cleanup gets extracted to a separate PR. r? @Zalathar
Reorganizing `tests/ui/issues` 5 tests [1/N] part of rust-lang#133895 r? Kivooeo
feat: Support references in reflection type info Tracking issue: rust-lang#146922 `#![feature(type_info)]` Based on rust-lang#151119 implementation for pointers for consistency r? oli-obk
rustbot
added
S-waiting-on-review
Member
Author
|
Rollup of everything. @bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
|
⌛ Testing commit 2956932 with merge defdb83... Workflow: https://github.com/rust-lang/rust/actions/runs/21087477333 |
rust-bors bot
pushed a commit
that referenced
this pull request
Jan 17, 2026
Rollup of 5 pull requests Successful merges: - #151092 (Generate macro expansion for rust compiler crates docs) - #151120 (Fix deprecated attribute intra-doc link not resolved in the right location on reexported item) - #151207 (Preliminary match/capture test cleanup for PR 150681) - #151221 (Reorganizing `tests/ui/issues` 5 tests [1/N]) - #151222 (feat: Support references in reflection type info) r? @ghost
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:
tests/ui/issues5 tests [1/N] #151221 (Reorganizingtests/ui/issues5 tests [1/N])r? @ghost
Create a similar rollup