From 207e60a364a23e15261f4fdd6471907d4fa906f4 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mattbrubeck@fullstory.com>
Date: Thu, 5 Dec 2019 18:58:56 -0800
Subject: Stabilize Condvar::wait_until and wait_timeout_until

---
 src/libstd/sync/condvar.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs
index 5a4cb14b72d..62bf0125c36 100644
--- a/src/libstd/sync/condvar.rs
+++ b/src/libstd/sync/condvar.rs
@@ -228,8 +228,6 @@ impl Condvar {
     /// # Examples
     ///
     /// ```
-    /// #![feature(wait_until)]
-    ///
     /// use std::sync::{Arc, Mutex, Condvar};
     /// use std::thread;
     ///
@@ -249,7 +247,7 @@ impl Condvar {
     /// // As long as the value inside the `Mutex<bool>` is `false`, we wait.
     /// let _guard = cvar.wait_until(lock.lock().unwrap(), |started| { *started }).unwrap();
     /// ```
-    #[unstable(feature = "wait_until", issue = "47960")]
+    #[stable(feature = "wait_until", since = "1.42.0")]
     pub fn wait_until<'a, T, F>(
         &self,
         mut guard: MutexGuard<'a, T>,
@@ -433,8 +431,6 @@ impl Condvar {
     /// # Examples
     ///
     /// ```
-    /// #![feature(wait_timeout_until)]
-    ///
     /// use std::sync::{Arc, Mutex, Condvar};
     /// use std::thread;
     /// use std::time::Duration;
@@ -462,7 +458,7 @@ impl Condvar {
     /// }
     /// // access the locked mutex via result.0
     /// ```
-    #[unstable(feature = "wait_timeout_until", issue = "47960")]
+    #[stable(feature = "wait_timeout_until", since = "1.42.0")]
     pub fn wait_timeout_until<'a, T, F>(
         &self,
         mut guard: MutexGuard<'a, T>,
@@ -613,7 +609,6 @@ impl Drop for Condvar {
 #[cfg(test)]
 mod tests {
     use crate::sync::atomic::{AtomicBool, Ordering};
-    /// #![feature(wait_until)]
     use crate::sync::mpsc::channel;
     use crate::sync::{Arc, Condvar, Mutex};
     use crate::thread;
-- 
cgit 1.4.1-3-g733a5