Correctly handle inlining of doc hidden foreign items#123459
Merged
bors merged 3 commits intorust-lang:masterfrom Apr 11, 2024
Merged
Correctly handle inlining of doc hidden foreign items#123459bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
…its attributes with the re-export's, making it being removed once in the `strip_hidden` pass. The solution was to use the same as for local reexported items: merge attributes, but not some of them (like `doc(hidden)`).
Contributor
|
@bors r+ |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 11, 2024
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#123459 (Correctly handle inlining of doc hidden foreign items) - rust-lang#123740 (Reduce Size of `ModifierInfo`) - rust-lang#123770 (Correct broken link in core::pin doc) - rust-lang#123777 (Deduplicate some function implementations between the parser and AST/HIR) - rust-lang#123808 (codegen tests: Tolerate `nuw` `nsw` on `trunc`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 11, 2024
Rollup merge of rust-lang#123459 - GuillaumeGomez:fix-123435, r=notriddle Correctly handle inlining of doc hidden foreign items Fixes rust-lang#123435. In case a foreign item has doc(hidden) attribute, we simply merged its attributes with the re-export's, making it being removed once in the `strip_hidden` pass. The solution was to use the same as for local reexported items: merge attributes, but not some of them (like `doc(hidden)`). I originally checked if we could simply update `Item::is_doc_hidden` method to use `self.inline_stmt_id.is_some_and(|def_id| tcx.is_doc_hidden(def_id))` but unfortunately, it added (local) items that shouldn't be inlined. At least it unifies local and foreign items inlining, which I think is the best course of action here. r? `@notriddle`
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
4 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.
Fixes #123435.
In case a foreign item has doc(hidden) attribute, we simply merged its attributes with the re-export's, making it being removed once in the
strip_hiddenpass.The solution was to use the same as for local reexported items: merge attributes, but not some of them (like
doc(hidden)).I originally checked if we could simply update
Item::is_doc_hiddenmethod to useself.inline_stmt_id.is_some_and(|def_id| tcx.is_doc_hidden(def_id))but unfortunately, it added (local) items that shouldn't be inlined. At least it unifies local and foreign items inlining, which I think is the best course of action here.r? @notriddle