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 inlining modules with duplicate names #99738

Merged

Conversation

notriddle
Copy link
Contributor

Fixes #99734

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

r? @jsha

(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 Jul 25, 2022
src/librustdoc/clean/mod.rs Outdated Show resolved Hide resolved
@camelid
Copy link
Member

camelid commented Aug 2, 2022

r? @camelid

@rust-highfive rust-highfive assigned camelid and unassigned jsha Aug 2, 2022
@camelid camelid 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 2, 2022
@camelid
Copy link
Member

camelid commented Aug 2, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Aug 2, 2022

📌 Commit 8724ca3 has been approved by camelid

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 2, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#99371 (Remove synchronization from Windows `hashmap_random_keys`)
 - rust-lang#99614 (do not claim that transmute is like memcpy)
 - rust-lang#99738 (rustdoc: avoid inlining modules with duplicate names)
 - rust-lang#99800 (Fix futex module imports on wasm+atomics)
 - rust-lang#100079 (Replace `* -> vec` with `-> vec` in docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit acf6912 into rust-lang:master Aug 3, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 3, 2022
@notriddle notriddle deleted the notriddle/multiple-modules-w-same-name branch August 3, 2022 14:02
@camelid
Copy link
Member

camelid commented Aug 5, 2022

Does it make sense to beta-backport this PR?

@notriddle notriddle added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 5, 2022
@notriddle
Copy link
Contributor Author

Yeah, it makes sense to back port it.

@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Aug 5, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.64.0, 1.63.0 Aug 5, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2022
…mulacrum

[beta] Rollup of beta backports

Includes the following PRs:

*  rustc-docs: Be less specific about the representation of +bundle rust-lang#100074
*  Fix backwards-compatibility check for tests with +whole-archive rust-lang#100068
*  Revert write! and writeln! to late drop temporaries rust-lang#99689
*  Upgrade indexmap and thorin-dwp to use hashbrown 0.12 rust-lang#99251
*  rustdoc: avoid inlining modules with duplicate names rust-lang#99738

r? `@ghost`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

ICE when attempting to document crates re-exporting std
7 participants