Fix doc_auto_cfg for impl blocks in different modules with different cfg
#101279
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-rustdoc
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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