about summary refs log tree commit diff
path: root/library/std/src/sync/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-02-29 00:53:39 +0000
committerbors <bors@rust-lang.org>2024-02-29 00:53:39 +0000
commitd3d145ea1cae47ad392173f890577788117da3d9 (patch)
tree5e57dc9f22594182dc617cb12e80515903ee8519 /library/std/src/sync/mod.rs
parentc475e2303b551d726307c646181e0677af1e0069 (diff)
parent9f9daed889fec22f3e681b297f9eb50c488fdbcd (diff)
downloadrust-d3d145ea1cae47ad392173f890577788117da3d9.tar.gz
rust-d3d145ea1cae47ad392173f890577788117da3d9.zip
Auto merge of #121770 - matthiaskrgr:rollup-wdher8r, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #110543 (Make `ReentrantLock` public)
 - #121689 ([rustdoc] Prevent inclusion of whitespace character after macro_rules ident)
 - #121724 (Use `LitKind::Err` for malformed floats)
 - #121735 (pattern analysis: Don't panic when encountering unexpected constructor)
 - #121743 (Opportunistically resolve regions when processing region outlives obligations)

Failed merges:

 - #121326 (Detect empty leading where clauses on type aliases)
 - #121416 (Improve error messages for generics with default parameters)
 - #121669 (Count stashed errors again)
 - #121723 (Two diagnostic things)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sync/mod.rs')
-rw-r--r--library/std/src/sync/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/library/std/src/sync/mod.rs b/library/std/src/sync/mod.rs
index ca62179e95b..e8c35bd48a7 100644
--- a/library/std/src/sync/mod.rs
+++ b/library/std/src/sync/mod.rs
@@ -184,7 +184,8 @@ pub use self::lazy_lock::LazyLock;
 #[stable(feature = "once_cell", since = "1.70.0")]
 pub use self::once_lock::OnceLock;
 
-pub(crate) use self::remutex::{ReentrantMutex, ReentrantMutexGuard};
+#[unstable(feature = "reentrant_lock", issue = "121440")]
+pub use self::reentrant_lock::{ReentrantLock, ReentrantLockGuard};
 
 pub mod mpsc;
 
@@ -196,5 +197,5 @@ mod mutex;
 pub(crate) mod once;
 mod once_lock;
 mod poison;
-mod remutex;
+mod reentrant_lock;
 mod rwlock;