mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #119804 - tmccombs:stabilize-unpoison, r=cuviper

Browse Source 
Stabilize mutex_unpoison feature

Closes #96469

`@rustbot` +T-libs-api
This commit is contained in:
Matthias Krüger 2024-01-11 03:02:44 +01:00 committed by GitHub
commit f92cde4f9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/std/src/sync/mutex.rs
View File

@ -383,8 +383,6 @@ pub fn is_poisoned(&self) -> bool {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(mutex_unpoison)]
///
/// use std::sync::{Arc, Mutex}; /// use std::sync::{Arc, Mutex};
/// use std::thread; /// use std::thread;
/// ///
@ -406,7 +404,7 @@ pub fn is_poisoned(&self) -> bool {
/// assert_eq!(*x, 1); /// assert_eq!(*x, 1);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "mutex_unpoison", issue = "96469")] #[stable(feature = "mutex_unpoison", since = "CURRENT_RUSTC_VERSION")]
pub fn clear_poison(&self) { pub fn clear_poison(&self) {
self.poison.clear(); self.poison.clear();
} }

4
library/std/src/sync/rwlock.rs
View File

@ -387,8 +387,6 @@ pub fn is_poisoned(&self) -> bool {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(mutex_unpoison)]
///
/// use std::sync::{Arc, RwLock}; /// use std::sync::{Arc, RwLock};
/// use std::thread; /// use std::thread;
/// ///
@ -410,7 +408,7 @@ pub fn is_poisoned(&self) -> bool {
/// assert_eq!(*guard, 1); /// assert_eq!(*guard, 1);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "mutex_unpoison", issue = "96469")] #[stable(feature = "mutex_unpoison", since = "CURRENT_RUSTC_VERSION")]
pub fn clear_poison(&self) { pub fn clear_poison(&self) {
self.poison.clear(); self.poison.clear();
} }