Skip to content

Get rid of some doctree items #79264

New issue

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

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

Already on GitHub? # to your account

Merged
merged 4 commits into from
Nov 21, 2020
Merged

Get rid of some doctree items #79264

merged 4 commits into from
Nov 21, 2020

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented 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

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

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

jyn514 commented Nov 21, 2020

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
Copy link
Collaborator

bors commented Nov 21, 2020

📌 Commit 5f602cda5120cd02126a252fc1775f5bb5a4c56c has been approved by guillaumegomez

@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 Nov 21, 2020
@jyn514
Copy link
Member Author

jyn514 commented Nov 21, 2020

@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.

@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 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
Member Author

jyn514 commented Nov 21, 2020

@bors r=guillaumegomez

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

@bors
Copy link
Collaborator

bors commented Nov 21, 2020

📌 Commit 7888406 has been approved by guillaumegomez

@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 Nov 21, 2020
@jyn514
Copy link
Member Author

jyn514 commented Nov 21, 2020

@bors r-

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

@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 Nov 21, 2020
@jyn514
Copy link
Member Author

jyn514 commented Nov 21, 2020

@bors r=GuillaumeGomez

@bors
Copy link
Collaborator

bors commented Nov 21, 2020

📌 Commit e280ae8 has been approved by GuillaumeGomez

@bors bors 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
@bors bors 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 (fixes rust-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:master Nov 21, 2020
@rustbot rustbot 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}

Closes rust-lang#79314, closes rust-lang#79331, closes rust-lang#79332. Follow-up to rust-lang#79264 and rust-lang#79312, continues breaking up rust-lang#78082.

r? `@GuillaumeGomez`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

5 participants