Skip to content

Fix reexport of doc(hidden) item - #106741

Merged
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:reexport-doc-hidden
Jan 13, 2023
Merged

Fix reexport of doc(hidden) item#106741
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:reexport-doc-hidden

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Part of #59368.

It doesn't fix the doc(inline) nor the doc(hidden) on macro. I'll do it in a follow-up PR.

r? @notriddle

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 11, 2023
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

@GuillaumeGomez
GuillaumeGomezforce-pushed the reexport-doc-hidden branch 4 times, most recently from 231d4f1 to 5b3a261CompareJanuary 11, 2023 22:18
Comment threadsrc/librustdoc/passes/stripper.rs Outdated

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@notriddle

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 12, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 5b3a261900a3fe71e95b1a0610f46fafebc03720 has been approved by notriddle

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2023
@klensy

Copy link
Copy Markdown
Contributor

tests location moved #106458.

cc #106734, tidy silent?

@notriddle

Copy link
Copy Markdown
Contributor

@klensy Does that mean this PR needs rebased?

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 12, 2023
@klensy

Copy link
Copy Markdown
Contributor

@notriddle yes, this should be cleaner than adding 3rd commit ).

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Rebased.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=notriddle rollup

@bors

bors commented Jan 12, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 675640c has been approved by notriddle

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 12, 2023
@JohnTitorJohnTitor mentioned this pull request Jan 12, 2023
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
@bors
bors merged commit ea45b3e into rust-lang:masterJan 13, 2023
@rustbotrustbot added this to the 1.68.0 milestone Jan 13, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez@rustbot@notriddle@bors@klensy