Fix reexport of doc(hidden) item
#106741
Merged
Fix reexport of doc(hidden) item
#106741
Conversation
This file contains 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
|
Some changes occurred in src/librustdoc/clean/types.rs cc @camelid |
GuillaumeGomez
force-pushed
the
reexport-doc-hidden
branch
4 times, most recently
from
231d4f1
to
5b3a261
Compare
GuillaumeGomez
commented
Jan 11, 2023
| fn import_should_be_hidden(&self, i: &Item, imp: &clean::Import) -> bool { | ||
| if self.is_json_output { | ||
| // FIXME: This should be handled the same way as for HTML output. | ||
| imp.imported_item_is_doc_hidden(self.tcx) |
There was a problem hiding this comment.
I'm really unhappy about this. How the JSON output is handling the reexports is becoming problematic if we have to special case more things.
There was a problem hiding this comment.
I suppose the correct way to handle this is similar to how stripped modules work — the pointee is kept around because of the import item referencing it, but is marked as hidden.
|
@bors r+ rollup |
|
📌 Commit 5b3a261900a3fe71e95b1a0610f46fafebc03720 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
bors
added
S-waiting-on-author
|
@notriddle yes, this should be cleaner than adding 3rd commit ). |
GuillaumeGomez
force-pushed
the
reexport-doc-hidden
branch
from
5b3a261
to
675640c
Compare
|
Rebased. |
|
@bors r=notriddle rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 12, 2023
Rollup of 8 pull requests Successful merges: - rust-lang#105795 (Stabilize `abi_efiapi` feature) - rust-lang#106446 ([LSDA] Take ttype_index into account when taking unwind action) - rust-lang#106675 (Mark ZST as FFI-safe if all its fields are PhantomData) - rust-lang#106740 (Adding a hint on iterator type errors) - rust-lang#106741 (Fix reexport of `doc(hidden)` item) - rust-lang#106759 (Revert "Make nested RPITIT inherit the parent opaque's generics.") - rust-lang#106772 (Re-add mw to review rotation) - rust-lang#106778 (Exclude formatting commit from blame) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This was referenced Jan 14, 2023
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.
Part of #59368.
It doesn't fix the
doc(inline)nor thedoc(hidden)on macro. I'll do it in a follow-up PR.r? @notriddle