Skip to content

Commit 2992a50

Browse files
authored
Unrolled build for rust-lang#119804
Rollup merge of rust-lang#119804 - tmccombs:stabilize-unpoison, r=cuviper Stabilize mutex_unpoison feature Closes rust-lang#96469 `@rustbot` +T-libs-api
2 parents 0a89233 + 1ed855d commit 2992a50

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

library/std/src/sync/mutex.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,6 @@ impl<T: ?Sized> Mutex<T> {
383383
/// # Examples
384384
///
385385
/// ```
386-
/// #![feature(mutex_unpoison)]
387-
///
388386
/// use std::sync::{Arc, Mutex};
389387
/// use std::thread;
390388
///
@@ -406,7 +404,7 @@ impl<T: ?Sized> Mutex<T> {
406404
/// assert_eq!(*x, 1);
407405
/// ```
408406
#[inline]
409-
#[unstable(feature = "mutex_unpoison", issue = "96469")]
407+
#[stable(feature = "mutex_unpoison", since = "CURRENT_RUSTC_VERSION")]
410408
pub fn clear_poison(&self) {
411409
self.poison.clear();
412410
}

library/std/src/sync/rwlock.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,6 @@ impl<T: ?Sized> RwLock<T> {
387387
/// # Examples
388388
///
389389
/// ```
390-
/// #![feature(mutex_unpoison)]
391-
///
392390
/// use std::sync::{Arc, RwLock};
393391
/// use std::thread;
394392
///
@@ -410,7 +408,7 @@ impl<T: ?Sized> RwLock<T> {
410408
/// assert_eq!(*guard, 1);
411409
/// ```
412410
#[inline]
413-
#[unstable(feature = "mutex_unpoison", issue = "96469")]
411+
#[stable(feature = "mutex_unpoison", since = "CURRENT_RUSTC_VERSION")]
414412
pub fn clear_poison(&self) {
415413
self.poison.clear();
416414
}

0 commit comments

Comments
 (0)