Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented May 7, 2021

This was reverted in #84950; this re-lands the changes, but without different behavior depending on the channel.

r? @camelid cc @pietroalbini

@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 May 7, 2021
@jyn514
Copy link
Member Author

jyn514 commented May 7, 2021

(I'm hoping to reland the changes in the second commit in #84942.)

@jyn514 jyn514 added A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 7, 2021
@rust-log-analyzer

This comment has been minimized.

@camelid
Copy link
Member

camelid commented May 7, 2021

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 7, 2021

📌 Commit 6f5ace2 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-review Status: Awaiting review from the assignee but also interested parties. labels May 7, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#76808 (Improve diagnostics for functions in `struct` definitions)
 - rust-lang#84887 (Remove SpanInterner::get)
 - rust-lang#85034 (fix null pointer error messages)
 - rust-lang#85038 (Don't stop running rustdoc-gui tests at first failure)
 - rust-lang#85044 (Use `path.exists()` instead of `fs::metadata(path).is_ok()`)
 - rust-lang#85052 (rustdoc: Link to the docs on namespaces when an unknown disambiguator is found)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8852317 into rust-lang:master May 8, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 8, 2021
@jyn514 jyn514 deleted the disambiguator branch May 8, 2021 03:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name 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
Development

Successfully merging this pull request may close these issues.

6 participants