diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-01-11 03:02:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-11 03:02:44 +0100 |
| commit | f92cde4f9aa63a6d3d8b3d6a6304dfb9c0214547 (patch) | |
| tree | c845e78ea82f668444666b0d096d61e0a001055e | |
| parent | d37de53425536b7432bbc555b220d95474e3a8d5 (diff) | |
| parent | 1ed855dedfb89a9e3f8b7f0bc3a57958069759bf (diff) | |
| download | rust-f92cde4f9aa63a6d3d8b3d6a6304dfb9c0214547.tar.gz rust-f92cde4f9aa63a6d3d8b3d6a6304dfb9c0214547.zip | |
Rollup merge of #119804 - tmccombs:stabilize-unpoison, r=cuviper
Stabilize mutex_unpoison feature Closes #96469 `@rustbot` +T-libs-api
| -rw-r--r-- | library/std/src/sync/mutex.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sync/rwlock.rs | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/library/std/src/sync/mutex.rs b/library/std/src/sync/mutex.rs index 0c001d7c258..184c406e326 100644 --- a/library/std/src/sync/mutex.rs +++ b/library/std/src/sync/mutex.rs @@ -383,8 +383,6 @@ impl<T: ?Sized> Mutex<T> { /// # Examples /// /// ``` - /// #![feature(mutex_unpoison)] - /// /// use std::sync::{Arc, Mutex}; /// use std::thread; /// @@ -406,7 +404,7 @@ impl<T: ?Sized> Mutex<T> { /// assert_eq!(*x, 1); /// ``` #[inline] - #[unstable(feature = "mutex_unpoison", issue = "96469")] + #[stable(feature = "mutex_unpoison", since = "CURRENT_RUSTC_VERSION")] pub fn clear_poison(&self) { self.poison.clear(); } diff --git a/library/std/src/sync/rwlock.rs b/library/std/src/sync/rwlock.rs index 5d8967bfbe6..23d3dd0707a 100644 --- a/library/std/src/sync/rwlock.rs +++ b/library/std/src/sync/rwlock.rs @@ -387,8 +387,6 @@ impl<T: ?Sized> RwLock<T> { /// # Examples /// /// ``` - /// #![feature(mutex_unpoison)] - /// /// use std::sync::{Arc, RwLock}; /// use std::thread; /// @@ -410,7 +408,7 @@ impl<T: ?Sized> RwLock<T> { /// assert_eq!(*guard, 1); /// ``` #[inline] - #[unstable(feature = "mutex_unpoison", issue = "96469")] + #[stable(feature = "mutex_unpoison", since = "CURRENT_RUSTC_VERSION")] pub fn clear_poison(&self) { self.poison.clear(); } |