Skip to content

Get rid of some doctree items - #79264

Merged
bors merged 4 commits into
rust-lang:masterfrom
jyn514:less-doctree
Nov 21, 2020
Merged

Get rid of some doctree items#79264
bors merged 4 commits into
rust-lang:masterfrom
jyn514:less-doctree

Conversation

@jyn514

@jyn514jyn514 commented Nov 21, 2020

Copy link
Copy Markdown
Member

They can be derived directly from the hir::Item, there's no special logic.

  • TypeDef
  • OpaqueTy
  • Constant
  • Static
  • TraitAlias
  • Enum
  • Union
  • Struct

Part of #78082 (the easiest part, I'm still debugging some other changes).
r? @GuillaumeGomez

@jyn514jyn514 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. labels Nov 21, 2020
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 21, 2020
@jyn514
jyn514force-pushed the less-doctree branch 3 times, most recently from 0b8f21a to 5f602cdCompareNovember 21, 2020 14:35
@GuillaumeGomez

Copy link
Copy Markdown
Member

You took my advice! \o/

Code looks good so if you intend to work on it incrementally and intend to merge this PR as is, then r=me. :)

@jyn514

Copy link
Copy Markdown
MemberAuthor

Let's merge as-is, the follow-up cleanups need larger changes. In particular renamed is not actually unused like I thought in #78082.

@bors r=guillaumegomez

@bors

bors commented Nov 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 5f602cda5120cd02126a252fc1775f5bb5a4c56c has been approved by guillaumegomez

@borsbors 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 Nov 21, 2020
@jyn514

Copy link
Copy Markdown
MemberAuthor

@bors r-

In particular renamed is not actually unused like I thought in #78082.

Oops, this affects things besides structs. This will break renamed unions/enums/statics that are inlined I'm pretty sure. Adding some tests.

@borsbors 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 Nov 21, 2020
They can be derived directly from the `hir::Item`, there's no special
logic.
- TypeDef
- OpaqueTy
- Constant
- Static
- TraitAlias
- Enum
- Union
- Struct
@jyn514

Copy link
Copy Markdown
MemberAuthor

@bors r=guillaumegomez

I fixed the names when inlining and also converted Struct while I was at it.

@bors

bors commented Nov 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 7888406 has been approved by guillaumegomez

@borsbors 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 Nov 21, 2020
@jyn514

Copy link
Copy Markdown
MemberAuthor

@bors r-

Ugh, apparently some of the tests depend on the order errors are emitted.

@borsbors 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 Nov 21, 2020
@jyn514

Copy link
Copy Markdown
MemberAuthor

@bors r=GuillaumeGomez

@bors

bors commented Nov 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit e280ae8 has been approved by GuillaumeGomez

@borsbors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 21, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 21, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2020
Rollup of 8 pull requests
Successful merges:
- rust-lang#77844 (clarify rules for ZST Boxes)
- rust-lang#79067 (Refactor the abi handling code a bit)
- rust-lang#79182 (Fix links to extern types in rustdoc (fixesrust-lang#78777))
- rust-lang#79231 (Exhaustively match in variant count instrinsic)
- rust-lang#79238 (Direct RUSTC_LOG (tracing/log) output to stderr instead of stdout.)
- rust-lang#79256 (Fix typos)
- rust-lang#79264 (Get rid of some doctree items)
- rust-lang#79272 (Support building clone shims for arrays with generic size)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit c20657c into rust-lang:masterNov 21, 2020
@rustbotrustbot added this to the 1.50.0 milestone Nov 21, 2020
@jyn514
jyn514 deleted the less-doctree branch November 21, 2020 22:59
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 24, 2020
Get rid of `doctree::Impl`
Follow-up to rust-lang#79264, continues breaking up rust-lang#78082. At some point I want to introduce `MaybeInlined`, but I think I'll wait until I need `MaybeInlined::InlinedWithOriginal` because it's not very useful in other situations.
r? `@GuillaumeGomez`
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 24, 2020
Get rid of doctree::{ExternalCrate, ForeignItem, Trait, Function}
Closesrust-lang#79314, closesrust-lang#79331, closesrust-lang#79332. Follow-up to rust-lang#79264 and rust-lang#79312, continues breaking up rust-lang#78082.
r? `@GuillaumeGomez`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant 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.

5 participants

@jyn514@GuillaumeGomez@bors@rust-highfive@rustbot