Fix unwanted merge of inline doc comments for impl blocks #103523
Merged
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
|
Some changes occurred in src/librustdoc/clean/types.rs cc @camelid |
rust-highfive
added
the
S-waiting-on-review
GuillaumeGomez
changed the title
GuillaumeGomez
force-pushed
the
inline-doc-comment-impl-block
branch
from
604d8f8
to
83ec1ea
Compare
notriddle
requested changes
Oct 25, 2022
GuillaumeGomez
force-pushed
the
inline-doc-comment-impl-block
branch
from
83ec1ea
to
a4279a1
Compare
|
Removed the forgotten debug code. |
|
@bors r+ |
bors
added
S-waiting-on-bors
notriddle
approved these changes
Oct 28, 2022
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 28, 2022
…impl-block, r=notriddle Fix unwanted merge of inline doc comments for impl blocks Fixes rust-lang#102909. We need this merge mechanism for inlined items but it's completely unwanted for impl blocks (at least the doc comments are, not the other attributes) since we want to keep what `cfg()` is put on the `pub use` or other attributes. r? `@notriddle`
This was referenced Oct 28, 2022
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 28, 2022
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#102642 (Add tests for static async functions in traits) - rust-lang#103283 (Add suggestions for unsafe impl error codes) - rust-lang#103523 (Fix unwanted merge of inline doc comments for impl blocks) - rust-lang#103550 (diagnostics: do not suggest static candidates as traits to import) - rust-lang#103641 (Don't carry MIR location in `ConstraintCategory::CallArgument`) 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 #102909.
We need this merge mechanism for inlined items but it's completely unwanted for impl blocks (at least the doc comments are, not the other attributes) since we want to keep what
cfg()is put on thepub useor other attributes.r? @notriddle