Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of reexported macro in doc hidden items #108241

Merged
merged 3 commits into from
Feb 21, 2023

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Feb 19, 2023

Fixes #108231.
Fixes #59368.

r? @notriddle

@rustbot rustbot 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 Feb 19, 2023
@GuillaumeGomez GuillaumeGomez force-pushed the fix-reexported-macro-handling branch from 77a180b to e82c75d Compare February 20, 2023 14:57
@GuillaumeGomez
Copy link
Member Author

Updated!

@GuillaumeGomez
Copy link
Member Author

Just realized that this PR was also fixing #59368 so I added it in the first comment.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-reexported-macro-handling branch from ecd5b72 to ffbc554 Compare February 20, 2023 16:28
@GuillaumeGomez GuillaumeGomez force-pushed the fix-reexported-macro-handling branch from ffbc554 to fc6a05c Compare February 20, 2023 19:19
@GuillaumeGomez
Copy link
Member Author

Updated.

@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 20, 2023

📌 Commit fc6a05c has been approved by notriddle

It is now in the queue for this repository.

@bors bors 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 Feb 20, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 20, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#108241 (Fix handling of reexported macro in doc hidden items)
 - rust-lang#108254 (Refine error span for trait error into borrowed expression)
 - rust-lang#108255 (Remove old FIXMEs referring to rust-lang#19596)
 - rust-lang#108257 (Remove old FIXME that no longer applies)
 - rust-lang#108276 (small `opaque_type_origin` cleanup)
 - rust-lang#108279 (Use named arguments for `{,u}int_impls` macro)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 52fa8fe into rust-lang:master Feb 21, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 21, 2023
@GuillaumeGomez GuillaumeGomez deleted the fix-reexported-macro-handling branch February 21, 2023 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant 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.

rustdoc: regression: macro_export in doc(hidden) mod disappears rustdoc: doc(hidden) also hides re-exports
4 participants