Skip to content
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.

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

[rustdoc] Add explanations for auto-disambiguation when an intra doc link is resolved to a proc-macro and a trait at the same time #110328

Merged

Conversation

GuillaumeGomez
Copy link
Member

Part of #110111.

r? @notriddle

…solved to a proc-macro and a trait at the same time
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2023
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 14, 2023

📌 Commit d38fd29 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 Apr 14, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 14, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#108687 (Reformulate `point_at_expr_source_of_inferred_type` to be more accurate)
 - rust-lang#109272 (Add Command environment variable inheritance docs)
 - rust-lang#109947 (Add links from `core::cmp` derives to their traits)
 - rust-lang#110110 (Use `Display` in top-level example for `PanicInfo`)
 - rust-lang#110154 (Fix typos in library)
 - rust-lang#110244 (Remove some unneeded imports / qualified paths)
 - rust-lang#110328 ([rustdoc] Add explanations for auto-disambiguation when an intra doc link is resolved to a proc-macro and a trait at the same time)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0d97522 into rust-lang:master Apr 14, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 14, 2023
@GuillaumeGomez GuillaumeGomez deleted the auto-disambiguation-proc-trait branch April 14, 2023 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants