diff options
| -rw-r--r-- | library/core/src/option.rs | 11 | ||||
| -rw-r--r-- | library/core/tests/lib.rs | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/library/core/src/option.rs b/library/core/src/option.rs index 4b57371096e..a81dbc6924f 100644 --- a/library/core/src/option.rs +++ b/library/core/src/option.rs @@ -1713,8 +1713,6 @@ impl<T, U> Option<(T, U)> { /// # Examples /// /// ``` - /// #![feature(unzip_option)] - /// /// let x = Some((1, "hi")); /// let y = None::<(u8, u32)>; /// @@ -1722,8 +1720,13 @@ impl<T, U> Option<(T, U)> { /// assert_eq!(y.unzip(), (None, None)); /// ``` #[inline] - #[unstable(feature = "unzip_option", issue = "87800", reason = "recently added")] - pub const fn unzip(self) -> (Option<T>, Option<U>) { + #[stable(feature = "unzip_option", since = "CURRENT_RUSTC_VERSION")] + #[rustc_const_unstable(feature = "const_option", issue = "67441")] + pub const fn unzip(self) -> (Option<T>, Option<U>) + where + T: ~const Destruct, + U: ~const Destruct, + { match self { Some((a, b)) => (Some(a), Some(b)), None => (None, None), diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index 3012a78b9c9..51f858adee1 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -95,7 +95,6 @@ #![feature(strict_provenance_atomic_ptr)] #![feature(trusted_random_access)] #![feature(unsize)] -#![feature(unzip_option)] #![feature(const_array_from_ref)] #![feature(const_slice_from_ref)] #![feature(waker_getters)] |