1
Fork 0

Rollup merge of #89953 - woppopo:option_const_as_mut, r=oli-obk

Make Option::as_mut const

Adding `const` for `Option::as_mut`.

Tracking issue: #67441
This commit is contained in:
Yuki Okushi 2021-10-17 07:52:21 +09:00 committed by GitHub
commit 0029af7930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions

View file

@ -646,7 +646,8 @@ impl<T> Option<T> {
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.0.0")]
pub fn as_mut(&mut self) -> Option<&mut T> {
#[rustc_const_unstable(feature = "const_option", issue = "67441")]
pub const fn as_mut(&mut self) -> Option<&mut T> {
match *self {
Some(ref mut x) => Some(x),
None => None,

View file

@ -10,6 +10,7 @@
#![feature(const_assume)]
#![feature(const_cell_into_inner)]
#![feature(const_maybe_uninit_assume_init)]
#![cfg_attr(bootstrap, feature(const_panic))]
#![feature(const_ptr_read)]
#![feature(const_ptr_write)]
#![feature(const_ptr_offset)]

View file

@ -380,6 +380,14 @@ const fn option_const_mut() {
let _take = option.take();
let _replace = option.replace(42);
{
let as_mut = option.as_mut();
match as_mut {
Some(v) => *v = 32,
None => unreachable!(),
}
}
}
#[test]