mirror of
https://github.com/rust-lang/rust
synced 2024-10-01 22:34:35 +00:00
Rollup merge of #104402 - joboet:sync_remutex, r=m-ou-se
Move `ReentrantMutex` to `std::sync` If I understand #84187 correctly, `sys_common` should not contain platform-independent code, even if it is private.
This commit is contained in:
commit
d91432832e
|
@ -10,9 +10,8 @@
|
|||
use crate::fs::File;
|
||||
use crate::io::{self, BufReader, IoSlice, IoSliceMut, LineWriter, Lines};
|
||||
use crate::sync::atomic::{AtomicBool, Ordering};
|
||||
use crate::sync::{Arc, Mutex, MutexGuard, OnceLock};
|
||||
use crate::sync::{Arc, Mutex, MutexGuard, OnceLock, ReentrantMutex, ReentrantMutexGuard};
|
||||
use crate::sys::stdio;
|
||||
use crate::sys_common::remutex::{ReentrantMutex, ReentrantMutexGuard};
|
||||
|
||||
type LocalStream = Arc<Mutex<Vec<u8>>>;
|
||||
|
||||
|
|
|
@ -177,6 +177,8 @@
|
|||
#[unstable(feature = "once_cell", issue = "74465")]
|
||||
pub use self::once_lock::OnceLock;
|
||||
|
||||
pub(crate) use self::remutex::{ReentrantMutex, ReentrantMutexGuard};
|
||||
|
||||
pub mod mpsc;
|
||||
|
||||
mod barrier;
|
||||
|
@ -187,4 +189,5 @@
|
|||
mod once;
|
||||
mod once_lock;
|
||||
mod poison;
|
||||
mod remutex;
|
||||
mod rwlock;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use super::{ReentrantMutex, ReentrantMutexGuard};
|
||||
use crate::cell::RefCell;
|
||||
use crate::sync::Arc;
|
||||
use crate::sys_common::remutex::{ReentrantMutex, ReentrantMutexGuard};
|
||||
use crate::thread;
|
||||
|
||||
#[test]
|
|
@ -27,7 +27,6 @@
|
|||
pub mod memchr;
|
||||
pub mod once;
|
||||
pub mod process;
|
||||
pub mod remutex;
|
||||
pub mod thread;
|
||||
pub mod thread_info;
|
||||
pub mod thread_local_dtor;
|
||||
|
|
Loading…
Reference in a new issue