Rollup merge of #98204 - Kixiron:stable-unzip, r=thomcc

[rust.git] / library / core / src / option.rs

diff --git a/library/core/src/option.rs b/library/core/src/option.rs
index 4b57371096e9ab670f3c99e35e8220a47600c972..a81dbc6924fb737a3d9891bd7099f6f89ec7a24c 100644 (file)
--- 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),