Make Option::as_mut const

diff --git a/library/core/src/option.rs b/library/core/src/option.rs
index 401267f5613ee0c478ec470f4fa7496527004478..885058321589ccb6953146c252701a405a487986 100644 (file)
--- a/library/core/src/option.rs
+++ b/library/core/src/option.rs
@@ -646,7 +646,8 @@ pub const fn as_ref(&self) -> 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,

diff --git a/library/core/tests/option.rs b/library/core/tests/option.rs
index 8995f96b1238a654badb66cece7ed962f109dd3c..c9508c145258c9e6340758579431e499b96210e8 100644 (file)
--- a/library/core/tests/option.rs
+++ b/library/core/tests/option.rs
@@ -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]