Skip to content

Commit b48b30a

Browse files
authored
Unrolled build for #144648
Rollup merge of #144648 - connortsui20:nonpoison_rwlock, r=Mark-Simulacrum Implementation: `#[feature(nonpoison_rwlock)]` Tracking Issue: #134645 This PR continues the effort made in #144022 by adding the implementation of `nonpoison::rwlock`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. The only real difference is that this PR includes a reorganizing of the existing `poison::rwlock` file that hopefully makes both variants more readable. ### Related PRs - `nonpoison_condvar` implementation: #144651 - `nonpoison_once` implementation: #144653
2 parents 78b89eb + ad499d0 commit b48b30a

File tree

8 files changed

+1996
-752
lines changed

8 files changed

+1996
-752
lines changed

library/std/src/sync/nonpoison.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,10 @@ impl fmt::Display for WouldBlock {
3333
pub use self::mutex::MappedMutexGuard;
3434
#[unstable(feature = "nonpoison_mutex", issue = "134645")]
3535
pub use self::mutex::{Mutex, MutexGuard};
36+
#[unstable(feature = "mapped_lock_guards", issue = "117108")]
37+
pub use self::rwlock::{MappedRwLockReadGuard, MappedRwLockWriteGuard};
38+
#[unstable(feature = "nonpoison_rwlock", issue = "134645")]
39+
pub use self::rwlock::{RwLock, RwLockReadGuard, RwLockWriteGuard};
3640

3741
mod mutex;
42+
mod rwlock;

0 commit comments

Comments
 (0)