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

Show summary lines on cross-crate re-exports #77790

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Oct 10, 2020

See my write-up in #77783 (comment) for what's going on here.

Fixes #77783

r? @ollie27

@jyn514 jyn514 added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. C-bug Category: This is a bug. A-cross-crate-reexports Area: Documentation that has been re-exported from a different crate labels Oct 10, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 10, 2020
This removes the unnecessary `DocFragmentKind::Divider` in favor of just
using the logic I actually want in `collapse_docs`.
@jyn514
Copy link
Member Author

jyn514 commented Oct 12, 2020

I updated this with the approach you suggested in #77783 (comment) and added some more tests.

This was there for `Divider` and is no longer necessary.
@ollie27
Copy link
Member

ollie27 commented Oct 12, 2020

Looks good.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 12, 2020

📌 Commit 4187828 has been approved by ollie27

@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 Oct 12, 2020
@bors
Copy link
Contributor

bors commented Oct 12, 2020

⌛ Testing commit 4187828 with merge 1fe9b7f...

@bors
Copy link
Contributor

bors commented Oct 12, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: ollie27
Pushing 1fe9b7f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2020
@bors bors merged commit 1fe9b7f into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
@jyn514 jyn514 deleted the undivided branch October 12, 2020 04:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cross-crate-reexports Area: Documentation that has been re-exported from a different crate C-bug Category: This is a bug. merged-by-bors This PR was explicitly merged by bors. 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.

Missing short summaries for reexported items in rustdoc
5 participants