Skip to content

Fix doc_auto_cfg for impl blocks in different modules with different cfg #101279

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Sep 2, 2022

Conversation

GuillaumeGomez
Copy link
Member

Fixes #101129.

Just like reexports, impl blocks don't necessarily share the same "space" as the item they implement so we need to merge attributes from its parents as well.

r? @notriddle

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Sep 1, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 1, 2022
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 1, 2022

📌 Commit 68d0094 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 Sep 1, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 1, 2022
…iaskrgr

Rollup of 14 pull requests

Successful merges:

 - rust-lang#94467 (Add `special_module_name` lint)
 - rust-lang#100852 (Use `getuid` to check instead of `USER` env var in rustbuild)
 - rust-lang#101072 (bootstrap: Add llvm-has-rust-patches target option)
 - rust-lang#101190 (Make docs formulation more consistent for NonZero{int})
 - rust-lang#101245 (Remove unneeded where whitespace)
 - rust-lang#101251 (Fix  bad target name in Walkthrough)
 - rust-lang#101254 (rustdoc: remove unused `.docblock .impl-items` CSS)
 - rust-lang#101256 (Fixes/adjustments to Fuchsia doc walkthrough)
 - rust-lang#101270 (Update outdated comment about output capturing in print_to.)
 - rust-lang#101271 (Fix filename of armv4t-none-eabi.md)
 - rust-lang#101274 (Fix typo in comment)
 - rust-lang#101279 (Fix doc_auto_cfg for impl blocks in different modules with different `cfg`)
 - rust-lang#101285 (Do not suggest adding `move` to closure when `move` is already used)
 - rust-lang#101292 (rustdoc: remove unneeded CSS `.content table td:first-child > a`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8f8a5d2 into rust-lang:master Sep 2, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 2, 2022
@GuillaumeGomez GuillaumeGomez deleted the doc_auto_cfg_nested_impl branch September 2, 2022 08:50
# for free to join this conversation on GitHub. Already have an account? # 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.

doc_auto_cfg doesn't notice when a trait is impl'd in a module gated by a feature
5 participants