rustdoc: add support for incoherent impls on structs and traits#103746
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 31, 2022
Merged
rustdoc: add support for incoherent impls on structs and traits#103746bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
r? @jsha (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Mark-Simulacrum
added
the
beta-nominated
| // * https://github.com/rust-lang/rust/issues/103170 — where it didn't used to get documented | ||
| // * https://github.com/rust-lang/rust/pull/99917 — where the feature got used | ||
| // * https://github.com/rust-lang/rust/issues/53487 — overall tracking issue for Error | ||
| if tcx.has_attr(did, sym::rustc_has_incoherent_inherent_impls) { |
Member
There was a problem hiding this comment.
Then the issue will remain for the JSON output if we fix it in inline, no?
Contributor
Author
There was a problem hiding this comment.
This is only a problem in the HTML output because, if inlining isn’t performed, there’s nowhere to actually show it. JSON directly represents impl blocks as their own item, rather than attaching them to their types, so all it needs to do is not strip them out.
If there’s a problem in JSON output, the solution is going to be totally different and should probably be a separate PR.
Member
There was a problem hiding this comment.
Makes sense! So no need for it.
Contributor
Author
There was a problem hiding this comment.
Probably still want to add a test case for JSON output on incoherent impl, but, again, separate PR.
GuillaumeGomez
approved these changes
Oct 30, 2022
Member
|
Thanks! @bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
notriddle
added a commit
to notriddle/rust
that referenced
this pull request
Oct 30, 2022
…-trait, r=GuillaumeGomez rustdoc: add support for incoherent impls on structs and traits Fixes rust-lang#103170
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 31, 2022
Rollup of 8 pull requests Successful merges: - rust-lang#97971 (Enable varargs support for calling conventions other than C or cdecl ) - rust-lang#101428 (Add mir building test directory) - rust-lang#101944 (rustdoc: clean up `#toggle-all-docs`) - rust-lang#102101 (check lld version to choose correct option to disable multi-threading in tests) - rust-lang#102689 (Add a tier 3 target for the Sony PlayStation 1) - rust-lang#103746 (rustdoc: add support for incoherent impls on structs and traits) - rust-lang#103758 (Add regression test for reexports in search results) - rust-lang#103764 (All verbosity checks in `PrettyPrinter` now go through `PrettyPrinter::should_print_verbose`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Mark-Simulacrum
added
beta-accepted
This was referenced Oct 31, 2022
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 31, 2022
…Simulacrum [stable] 1.67.0 release Last minute backports: * rustdoc: add support for incoherent impls on structs and traits rust-lang#103746 r? `@ghost`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 1, 2022
…mulacrum [beta] branch 1.66 This PR: * Bumps version placeholders * Bumps CI channel to beta * Backports "rustdoc: add support for incoherent impls on structs and traits rust-lang#103746"
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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 #103170