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

rustdoc: avoid cleaning modules with duplicate names #101631

Merged
merged 5 commits into from
Sep 10, 2022

Conversation

notriddle
Copy link
Contributor

Fixes #83375

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Sep 9, 2022
@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 9, 2022
@rust-log-analyzer

This comment has been minimized.

@jyn514
Copy link
Member

jyn514 commented Sep 10, 2022

#83872 tried to solve this earlier, and was closed because it regressed some cases that currently work. How does your code handle #83872 (comment) ?

@notriddle
Copy link
Contributor Author

#83872 (comment) isn't affected. If you documented with a current, nightly compiler, it already removes the duplicate and leaves you only with 1.

@notriddle
Copy link
Contributor Author

@jyn514 On the other hand I did manage to find a bug related to glob shadowing. It wasn’t applied to local inlining.

It’s fixed, and a few test cases were imported from #83872.

@GuillaumeGomez
Copy link
Member

Looks great, thanks! Maybe we should add an explanation about this reexporting shadowing behaviour in the rustdoc book too once it's merged?

@bors r6

@GuillaumeGomez
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 10, 2022

📌 Commit d92d642 has been approved by GuillaumeGomez

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 Sep 10, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#101578 (remove bound var hack in `resolve`)
 - rust-lang#101606 (doc: fix minor typo)
 - rust-lang#101614 (Equate fn outputs when inferring RPITIT hidden types)
 - rust-lang#101631 (rustdoc: avoid cleaning modules with duplicate names)
 - rust-lang#101635 (Move `Queries::new` out of the macro)
 - rust-lang#101641 (Update browser-ui-test version to 0.9.8)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6afbe3e into master Sep 10, 2022
@bors bors deleted the notriddle/duplicate-module branch September 10, 2022 17:29
@rustbot rustbot added this to the 1.65.0 milestone Sep 10, 2022
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: glob reexport may duplicate module
7 participants