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

Get rid of doctree::{ExternalCrate, ForeignItem, Trait, Function} #79335

Merged
merged 4 commits into from
Nov 24, 2020

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Nov 23, 2020

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

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 23, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 23, 2020
@GuillaumeGomez
Copy link
Member

The changes are great. We're finally getting rid of an intermediate step and I'm really glad you took time to do it. So whenever it's possible, r=me.

@jyn514
Copy link
Member Author

jyn514 commented Nov 24, 2020

@bors r=GuillaumeGomez rollup=never

I want to be able to bisect.

@bors
Copy link
Collaborator

bors commented Nov 24, 2020

📌 Commit 3eac84a3914b6b60eac4d7b8ee1fabe9c4940762 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 24, 2020
@bors

This comment has been minimized.

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

jyn514 commented Nov 24, 2020

Apparently github and bors aren't smart enough to deal with commits that are in two different PRs?

@bors r=GuillaumeGomez rollup=never

@bors
Copy link
Collaborator

bors commented Nov 24, 2020

📌 Commit 66e30ec 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 24, 2020
@jyn514 jyn514 changed the title Get rid of doctree::ExternalCrate Get rid of doctree::{ExternalCrate, ForeignItem, Trait, Function} Nov 24, 2020
@bors
Copy link
Collaborator

bors commented Nov 24, 2020

⌛ Testing commit 66e30ec with merge 25a6910...

@bors
Copy link
Collaborator

bors commented Nov 24, 2020

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 25a6910 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 24, 2020
@bors bors merged commit 25a6910 into rust-lang:master Nov 24, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 24, 2020
@jyn514 jyn514 deleted the doctree-crate branch November 24, 2020 18:43
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 27, 2020
Cleanup more of rustdoc

-  Use `Item::from_def_id` for StructField
- Use `from_def_id_and_parts` for primitives and keywords
- Take `String` instead of `Symbol` in `from_def_id` - this avoids having to intern then immediately stringify the existing string.
- Remove unused `get_stability` and `get_deprecation`
- Remove unused `attrs` field from `primitives`
- Remove unused `attrs` field from `keywords`

This will probably conflict with rust-lang#79335 and I would prefer for that PR to land first - I'm anxious for rust-lang#77467 to land :)

Makes rust-lang#76998 easier to add.

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

5 participants