Skip to content

rustdoc: Turn JsonRenderer::mod_item_in into unreachable!() - #84459

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:json-mod
Apr 24, 2021
Merged

rustdoc: Turn JsonRenderer::mod_item_in into unreachable!()#84459
bors merged 1 commit into
rust-lang:masterfrom
jyn514:json-mod

Conversation

@jyn514

@jyn514jyn514 commented Apr 22, 2021

Copy link
Copy Markdown
Member

The JSON renderer no longer gets called on modules (since #83055).

r? @aDotInTheVoid

@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. A-rustdoc-json Area: Rustdoc JSON backend labels Apr 22, 2021
aDotInTheVoid
aDotInTheVoid reviewed Apr 23, 2021
View reviewed changes
Comment threadsrc/librustdoc/json/mod.rs Outdated
Comment threadsrc/librustdoc/json/mod.rs Outdated

@aDotInTheVoidaDotInTheVoidApr 23, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This can also be make unreachable!

@jyn514jyn514Apr 23, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hmm, I think I was assuming this already had the changes from https://github.com/rust-lang/rust/pull/84458/files#diff-46f011cf734f3de35eddca150990366cc41bd8eaf3945a241b2a2f79c5bb77eaR40. Do you think it's important to add the assert given that this function gets removed altogether there? Or is it fine to have it silently do nothing? If the latter I'd prefer to leave this as-is to avoid merge conflicts.

@aDotInTheVoidaDotInTheVoidApr 23, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its fine to leave then, as it would be very wierd to call mod_item_out without mod_item_in

@aDotInTheVoid

aDotInTheVoid commented Apr 23, 2021

Copy link
Copy Markdown
Member

2 Minor nits, also I cant approve because I don't have r+ rights.

@aDotInTheVoidaDotInTheVoid mentioned this pull request Apr 23, 2021
Open
@jyn514jyn514 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2021
@jyn514

jyn514 commented Apr 23, 2021

Copy link
Copy Markdown
MemberAuthor

@bors delegate=aDotInTheVoid

@bors

bors commented Apr 23, 2021

Copy link
Copy Markdown
Collaborator

✌️ @aDotInTheVoid can now approve this pull request

@aDotInTheVoid

aDotInTheVoid commented Apr 23, 2021

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Apr 23, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 315bfdb84868f2e72f1e13a44ed8f5a9ba367c82 has been approved by aDotInTheVoid

@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 Apr 23, 2021
@jyn514

jyn514 commented Apr 23, 2021

Copy link
Copy Markdown
MemberAuthor

Thanks for the review!

@bors

This comment has been minimized.

Sign in to view
@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 Apr 24, 2021
@jyn514
rustdoc: Turn JsonRenderer::mod_item_in into unreachable!()
03ace76
The JSON renderer no longer gets called on modules.
@jyn514

jyn514 commented Apr 24, 2021

Copy link
Copy Markdown
MemberAuthor

@bors r=aDotInTheVoid

@bors

bors commented Apr 24, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 03ace76 has been approved by aDotInTheVoid

@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 Apr 24, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 24, 2021
@JohnTitor
Rollup merge ofrust-lang#84459- jyn514:json-mod, r=aDotInTheVoid
eb727a1
rustdoc: Turn `JsonRenderer::mod_item_in` into `unreachable!()`
The JSON renderer no longer gets called on modules (since rust-lang#83055).
r? `@aDotInTheVoid`
This was referenced Apr 24, 2021
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2021
@bors
Auto merge ofrust-lang#84525- JohnTitor:rollup-t2qigt3, r=JohnTitor
7e11f3a
Rollup of 8 pull requests
Successful merges:
- rust-lang#83519 (Implement a lint that highlights all moves larger than a configured limit)
- rust-lang#84105 (stabilize `core::array::{from_ref,from_mut}` in `1.53.0`)
- rust-lang#84179 (Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`)
- rust-lang#84427 (Update Clippy)
- rust-lang#84459 (rustdoc: Turn `JsonRenderer::mod_item_in` into `unreachable!()`)
- rust-lang#84460 (rustdoc: Remove unnecessary `is_crate` field from doctree::Module and clean::Module)
- rust-lang#84464 (rustdoc: Get rid of `clean::TypeKind`)
- rust-lang#84518 (Clean up DOM strings)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 46c517b into rust-lang:masterApr 24, 2021
@rustbotrustbot added this to the 1.53.0 milestone Apr 24, 2021
@jyn514
jyn514 deleted the json-mod branch April 24, 2021 23:03
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@aDotInTheVoidaDotInTheVoidaDotInTheVoid left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A-rustdoc-jsonArea: Rustdoc JSON backendC-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

Milestone

1.53.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jyn514@aDotInTheVoid@bors@rustbot