Skip to content

rustdoc: Only special case struct fields for intra-doc links, not enum variants #92075

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Dec 29, 2021
Merged

rustdoc: Only special case struct fields for intra-doc links, not enum variants #92075

merged 2 commits into from
Dec 29, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Dec 18, 2021 •
edited
Loading

Variants are already handled by resolve_str_path_error, rustdoc doesn't need to consider them separately. Thanks @camelid for catching this!

Eventually I'd like to fix the "combine this with variant_field" comment but that needs resolve_field to take a ty_res parameter to avoid it being super hacky (cc #83761 (comment)).

r? @camelid

@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name labels Dec 18, 2021
@rust-highfive
Copy link
Contributor

Some changes occurred in intra-doc-links.

cc @jyn514

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 18, 2021
jyn514 added a commit to jyn514/rust that referenced this pull request Dec 18, 2021
@jyn514
[wip] mentioning rust-lang#92075
f8987b9
@jyn514 jyn514 changed the title Only special case struct fields for intra-doc links, not enum variants rustdoc: Only special case struct fields for intra-doc links, not enum variants Dec 18, 2021
camelid
camelid reviewed Dec 18, 2021
View reviewed changes
camelid
camelid reviewed Dec 18, 2021
View reviewed changes
@camelid
Copy link
Member

camelid commented Dec 18, 2021

r=me with something like #92075 (comment) addressed

@camelid camelid 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 Dec 18, 2021
@camelid camelid mentioned this pull request Dec 19, 2021
Merged
@jyn514 jyn514 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 20, 2021
@camelid camelid 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 Dec 22, 2021
@bors
Copy link
Collaborator

bors commented Dec 28, 2021

☔ The latest upstream changes (presumably #92088) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
jyn514
jyn514 commented Dec 28, 2021
View reviewed changes
@jyn514 @camelid
Only special case struct fields for intra-doc links, not enum variants
636d6a3 
Variants are already handled by `resolve_str_path_error`, rustdoc doesn't need to consider them separately.
@camelid
Copy link
Member

camelid commented Dec 28, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 28, 2021

📌 Commit cdd90f8c17e9cbbf05a2d420b9c9605d55f3a9eb has been approved by camelid

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2021
@camelid
Copy link
Member

camelid commented Dec 28, 2021

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 28, 2021
@camelid
Copy link
Member

camelid commented Dec 28, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 28, 2021

📌 Commit 09104ad has been approved by camelid

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2021
@camelid
Copy link
Member

camelid commented Dec 28, 2021

I updated the comment.

@matthiaskrgr matthiaskrgr mentioned this pull request Dec 29, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2021
@bors
Auto merge of rust-lang#92397 - matthiaskrgr:rollup-xnfou17, r=matthi…
2b67c30 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#92075 (rustdoc: Only special case struct fields for intra-doc links, not enum variants)
 - rust-lang#92118 (Parse and suggest moving where clauses after equals for type aliases)
 - rust-lang#92237 (Visit expressions in-order when resolving pattern bindings)
 - rust-lang#92340 (rustdoc: Start cleaning up search index generation)
 - rust-lang#92351 (Add long error explanation for E0227)
 - rust-lang#92371 (Remove pretty printer space inside block with only outer attrs)
 - rust-lang#92372 (Print space after formal generic params in fn type)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e313143 into rust-lang:master Dec 29, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 29, 2021
@jyn514 jyn514 deleted the resolve-cleanup branch December 29, 2021 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camelid camelid camelid left review comments

Assignees

@camelid camelid

Labels
A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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
Milestone
1.59.0
Development

Successfully merging this pull request may close these issues.
6 participants
@jyn514 @rust-highfive @camelid @bors @rust-log-analyzer @rustbot