Skip to content

rustdoc: avoid inlining modules with duplicate names - #99738

Merged
bors merged 2 commits into
rust-lang:masterfrom
notriddle:notriddle/multiple-modules-w-same-name
Aug 3, 2022
Merged

rustdoc: avoid inlining modules with duplicate names#99738
bors merged 2 commits into
rust-lang:masterfrom
notriddle:notriddle/multiple-modules-w-same-name

Conversation

@notriddle

Copy link
Copy Markdown
Contributor

Fixes#99734

@rustbotrustbot 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
Copy Markdown
Contributor

r? @jsha

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 25, 2022
Comment threadsrc/librustdoc/clean/mod.rs Outdated
@camelid

Copy link
Copy Markdown
Member

r? @camelid

@rust-highfiverust-highfive assigned camelid and unassigned jshaAug 2, 2022
@camelidcamelid 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
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 2, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 8724ca3 has been approved by camelid

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 Aug 2, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Aug 3, 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:masterAug 3, 2022
@rustbotrustbot 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
Copy Markdown
Member

Does it make sense to beta-backport this PR?

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

Copy link
Copy Markdown
ContributorAuthor

Yeah, it makes sense to back port it.

@Mark-SimulacrumMark-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-SimulacrumMark-Simulacrum modified the milestones: 1.64.0, 1.63.0Aug 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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.

ICE when attempting to document crates re-exporting std

7 participants

@notriddle@rust-highfive@camelid@bors@jsha@Mark-Simulacrum@rustbot