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.

Sign up for GitHub

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

Jump to bottom

Remove Never variant from clean::Type enum #89297

Merged
merged 1 commit into from Sep 30, 2021
Merged

Remove Never variant from clean::Type enum #89297

merged 1 commit into from Sep 30, 2021

Conversation

GuillaumeGomez
Copy link
Member

Fixes #89287.

r? @camelid

@GuillaumeGomez GuillaumeGomez 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 Sep 27, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2021
camelid
camelid requested changes Sep 28, 2021
View reviewed changes
src/librustdoc/clean/types.rs Outdated Show resolved Hide resolved
src/librustdoc/html/format.rs Show resolved Hide resolved
src/librustdoc/json/conversions.rs Show resolved Hide resolved
src/librustdoc/html/render/cache.rs Outdated Show resolved Hide resolved
@camelid camelid 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-review Status: Awaiting review from the assignee but also interested parties. A-rustdoc-json Area: Rustdoc JSON backend labels Sep 28, 2021
@camelid
Copy link
Member

camelid commented Sep 28, 2021

(Why did you label this PR A-rustdoc-json? I removed it because this PR doesn't currently affect the JSON output.)

@GuillaumeGomez
Copy link
Member Author

(Why did you label this PR A-rustdoc-json? I removed it because this PR doesn't currently affect the JSON output.)

I don't remember doing it, weird...

@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 29, 2021
Closed
@GuillaumeGomez GuillaumeGomez added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 29, 2021
@camelid camelid 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 29, 2021
@GuillaumeGomez GuillaumeGomez added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 29, 2021
@GuillaumeGomez
Copy link
Member Author

Updated!

@camelid
Copy link
Member

camelid commented Sep 29, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 29, 2021

📌 Commit bdd3471 has been approved by camelid

@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 Sep 29, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 29, 2021
@GuillaumeGomez
Rollup merge of rust-lang#89297 - GuillaumeGomez:remove-never-from-ty…
18fd2db 
…pe-enum, r=camelid

Remove Never variant from clean::Type enum

Fixes rust-lang#89287.

r? `@camelid`
@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 29, 2021
Closed
@ehuss ehuss mentioned this pull request Sep 30, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 30, 2021
@bors
Auto merge of rust-lang#89386 - ehuss:rollup-idf4dmj, r=ehuss
30acf6d 
Rollup of 13 pull requests

Successful merges:

 - rust-lang#87428 (Fix union keyword highlighting in rustdoc HTML sources)
 - rust-lang#88412 (Remove ignore-tidy-undocumented-unsafe from core::slice::sort)
 - rust-lang#89098 (Fix generics where bounds order)
 - rust-lang#89232 (Improve help for recursion limit errors)
 - rust-lang#89294 (:arrow_up: rust-analyzer)
 - rust-lang#89297 (Remove Never variant from clean::Type enum)
 - rust-lang#89311 (Add unit assignment to MIR for `asm!()`)
 - rust-lang#89313 (PassWrapper: handle function rename from upstream D36850)
 - rust-lang#89315 (Clarify that `CString::from_vec_unchecked` appends 0 byte.)
 - rust-lang#89335 (Optimize is_sorted for Range and RangeInclusive)
 - rust-lang#89366 (rustdoc: Remove lazy_static dependency)
 - rust-lang#89377 (Update cargo)
 - rust-lang#89378 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8dfe522 into rust-lang:master Sep 30, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 30, 2021
@GuillaumeGomez GuillaumeGomez deleted the remove-never-from-type-enum branch September 30, 2021 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camelid camelid camelid requested changes

Assignees

@camelid camelid

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
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.

rustdoc: Remove clean::Type::Never in favor of always using clean::PrimitiveType::Never
5 participants
@GuillaumeGomez @camelid @bors @rust-highfive @rustbot