Skip to content

Remove Option::{unwrap_none, expect_none}.#83349

Merged
bors merged 1 commit intorust-lang:masterfrom
m-ou-se:unwrap-none
Mar 25, 2021
Merged

Remove Option::{unwrap_none, expect_none}.#83349
bors merged 1 commit intorust-lang:masterfrom
m-ou-se:unwrap-none

Conversation

@m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Mar 21, 2021 •
edited
Loading

This removes Option::unwrap_none and Option::expect_none since we're not going to stabilize them, see #62633.

Closes #62633

@m-ou-se m-ou-se added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Mar 21, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 21, 2021

r? @dtolnay

(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
dtolnay
dtolnay approved these changes Mar 21, 2021
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

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

Thanks!

@dtolnay
Copy link
Member

dtolnay commented Mar 21, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 21, 2021

📌 Commit 8dc0ae2 has been approved by dtolnay

@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
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 21, 2021
@Dylan-DPC
Rollup merge of rust-lang#83349 - m-ou-se:unwrap-none, r=dtolnay
4e456fc 
Remove Option::{unwrap_none, expect_none}.

This removes `Option::unwrap_none` and `Option::expect_none` since we're not going to stabilize them, see rust-lang#62633.

Closes rust-lang#62633
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 21, 2021
Closed
@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented Mar 22, 2021

failed in rollup

@bors r-

@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 Mar 22, 2021
@m-ou-se
Copy link
Member Author

m-ou-se commented Mar 22, 2021

error: Tool rls has regressed from test-pass to build-fail during beta week.
error: Tool rustfmt has regressed from test-pass to build-fail during beta week.

Looks like we'll have to wait utill Wednesday.

@m-ou-se
Copy link
Member Author

m-ou-se commented Mar 24, 2021

@bors r=dtolnay

@bors
Copy link
Collaborator

bors commented Mar 24, 2021

📌 Commit 8dc0ae2 has been approved by dtolnay

@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 Mar 24, 2021
@JohnTitor JohnTitor mentioned this pull request Mar 25, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2021
@bors
Auto merge of rust-lang#83454 - JohnTitor:rollup-9ae0565, r=JohnTitor
26c7e55 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#83041 (stabilize debug_non_exhaustive)
 - rust-lang#83349 (Remove Option::{unwrap_none, expect_none}.)
 - rust-lang#83420 (Add documentation for rustdoc-gui tests)
 - rust-lang#83421 (Add Result::into_err where the Ok variant is the never type)
 - rust-lang#83427 (small cleanups in rustc_errors / emitter)
 - rust-lang#83434 (Update RELEASES.md)
 - rust-lang#83440 (Use intra-doc link in core::cell)
 - rust-lang#83442 (LLVMWrapper: attractive nuisance macros)

Failed merges:

 - rust-lang#83438 (Update RELEASES.md)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 29e64e9 into rust-lang:master Mar 25, 2021
@rustbot rustbot added this to the 1.53.0 milestone Mar 25, 2021
@lukaslueg lukaslueg mentioned this pull request Mar 26, 2021
Merged
@RalfJung RalfJung mentioned this pull request Apr 3, 2021
Closed
3 tasks
@m-ou-se m-ou-se deleted the unwrap-none branch April 9, 2021 21:09
Demindiro added a commit to Demindiro/ballscript that referenced this pull request Apr 16, 2021
@Demindiro
Add Variant, add unwrap_none dependency
4d1392a 
Variant is ~2x faster for numeric types than doing everything through
`Rc<dyn ScripType>`.

`unwrap_none` got removed in
rust-lang/rust#83349, so a tiny, tiny dependency
has been added to provide the functionality.
@teor2345 teor2345 mentioned this pull request Aug 30, 2021
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API 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.

Tracking issue for Option::expect_none(msg) and unwrap_none()

6 participants

@m-ou-se @rust-highfive @dtolnay @bors @Dylan-DPC-zz @rustbot