rustdoc: Fix ICE when deprecated note is not resolved on the correct DefId
#151255
+62
−7
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
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
fix-rustdoc-ice-reexported-deprecated-note
branch
from
1fcf0c7 to
1faaa76
Compare
Member
Author
|
And fixed |
Contributor
|
@bors r+ I don't see what would've caused an ICE in the last one except maybe the |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Member
Author
The span of the item doesn't always contain the attribute (guess how I found out =D). So we tried to resolve the intra-doc link in the wrong scope, which ended very badly. |
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Jan 20, 2026
…ted-note, r=lolbinarycat rustdoc: Fix ICE when deprecated note is not resolved on the correct `DefId` Supersedes rust-lang#151237. Follow-up of rust-lang#151120. The `span` overlapping approach wasn't good enough so instead we now check if the reexport itself has the `deprecated` attribute, and if so, we resolve the path to the reexport `DefId`, otherwise we resolve it on the reexported item's `DefId`. cc @Zalathar r? @lolbinarycat
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Jan 20, 2026
…ted-note, r=lolbinarycat rustdoc: Fix ICE when deprecated note is not resolved on the correct `DefId` Supersedes rust-lang#151237. Follow-up of rust-lang#151120. The `span` overlapping approach wasn't good enough so instead we now check if the reexport itself has the `deprecated` attribute, and if so, we resolve the path to the reexport `DefId`, otherwise we resolve it on the reexported item's `DefId`. cc @Zalathar r? @lolbinarycat
rust-bors bot
pushed a commit
that referenced
this pull request
Jan 20, 2026
Rollup of 8 pull requests Successful merges: - #149587 (coverage: Sort the expansion tree to help choose a single BCB for child expansions) - #150071 (Add dist step for Enzyme) - #150288 (Add scalar support for offload) - #151091 (Add new "hide deprecated items" setting in rustdoc) - #151255 (rustdoc: Fix ICE when deprecated note is not resolved on the correct `DefId`) - #151375 (Fix terminal width dependent tests) - #151384 (add basic `TokenStream` api tests) - #151391 (rustc-dev-guide subtree update) r? @ghost
Member
|
@bors p=10 Just in case the rollup currently being tested fails, as this causes errors in rustc-perf and blocks is CI. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Supersedes #151237.
Follow-up of #151120.
The
spanoverlapping approach wasn't good enough so instead we now check if the reexport itself has thedeprecatedattribute, and if so, we resolve the path to the reexportDefId, otherwise we resolve it on the reexported item'sDefId.cc @Zalathar
r? @lolbinarycat