Skip to content

rustdoc: Replace pair of Options with an enum #83356

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
Merged
merged 1 commit into from
Mar 23, 2021
Merged

rustdoc: Replace pair of Options with an enum #83356

merged 1 commit into from
Mar 23, 2021

Conversation

@camelid
Copy link
Member

@camelid camelid commented Mar 21, 2021

They are never both None or both Some, so it makes more sense to use
an enum so that we "make impossible states impossible".

@camelid
rustdoc: Replace pair of Options with an enum
f820fd2 
They are never both `None` or both `Some`, so it makes more sense to use
an enum so that we "make impossible states impossible".
@camelid camelid 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 Mar 21, 2021
@rust-highfive
Copy link
Contributor

r? @GuillaumeGomez

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 21, 2021
@GuillaumeGomez
Copy link
Member

Nice! r=me once CI pass.

@camelid
Copy link
Member Author

camelid commented Mar 21, 2021

@bors r=GuillaumeGomez

@bors
Copy link
Collaborator

bors commented Mar 21, 2021

📌 Commit f820fd2 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 Mar 21, 2021
@bors
Copy link
Collaborator

bors commented Mar 22, 2021

⌛ Testing commit f820fd2 with merge 9536dc55e11e463601961d032eb11ea243b8af40...

@bors
Copy link
Collaborator

bors commented Mar 22, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2021
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
 56  516M   56  293M    0     0  25.6M      0  0:00:20  0:00:11  0:00:09 25.9M
 60  516M   60  313M    0     0  25.7M      0  0:00:20  0:00:12  0:00:08 25.5M
curl: (56) OpenSSL SSL_read: Connection was reset, errno 10054

gzip: stdin: unexpected end of file
tar: Unexpected EOF in archive
tar: Unexpected EOF in archive
tar: Error is not recoverable: exiting now
##[error]Process completed with exit code 2.
[command]"C:\Program Files\Git\bin\git.exe" version
git version 2.30.2.windows.1
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp core\.sshCommand
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"

@jyn514
Copy link
Member

jyn514 commented Mar 22, 2021 

curl: (56) OpenSSL SSL_read: Connection was reset, errno 10054

gzip: stdin: unexpected end of file

@bors retry

@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 Mar 22, 2021
@JohnTitor JohnTitor mentioned this pull request Mar 23, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2021
@bors
Auto merge of rust-lang#83398 - JohnTitor:rollup-om80krv, r=JohnTitor
2bd94f4 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#80705 (Update Source Code Pro and include italics)
 - rust-lang#81917 (Update RELEASES.md for 1.51.0)
 - rust-lang#82732 (Remove theme.js file)
 - rust-lang#83356 (rustdoc: Replace pair of `Option`s with an enum)
 - rust-lang#83384 (rename :pat2018 -> :pat2015)
 - rust-lang#83385 (:arrow_up: rust-analyzer)
 - rust-lang#83389 (add rust-analyzer rustc_private option in librustdoc Cargo.toml)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 20006b1 into rust-lang:master Mar 23, 2021
@rustbot rustbot added this to the 1.53.0 milestone Mar 23, 2021
@camelid camelid deleted the rustdoc-option-to-enum branch March 23, 2021 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

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

Development

Successfully merging this pull request may close these issues.

7 participants

@camelid @rust-highfive @GuillaumeGomez @bors @rust-log-analyzer @jyn514 @rustbot