diff options
| author | bors <bors@rust-lang.org> | 2022-03-23 06:01:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-23 06:01:48 +0000 |
| commit | 36748cf814dcf6bbd6408e925a0b4770b7d47719 (patch) | |
| tree | 77c3dc03911ea12ff43022a5a59316e18436668b /library/std/src/sys/itron | |
| parent | 7b0bf9efc939341b48c6e9a335dee8a280085100 (diff) | |
| parent | 733153f2e550d46fe6f794c969df91368580e0b8 (diff) | |
| download | rust-36748cf814dcf6bbd6408e925a0b4770b7d47719.tar.gz rust-36748cf814dcf6bbd6408e925a0b4770b7d47719.zip | |
Auto merge of #95173 - m-ou-se:sys-locks-module, r=dtolnay
Move std::sys::{mutex, condvar, rwlock} to std::sys::locks.
This cleans up the the std::sys modules a bit by putting the locks in a single module called `locks` rather than spread over the three modules `mutex`, `condvar`, and `rwlock`. This makes it easier to organise lock implementations, which helps with https://github.com/rust-lang/rust/issues/93740.
Diffstat (limited to 'library/std/src/sys/itron')
| -rw-r--r-- | library/std/src/sys/itron/condvar.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/itron/condvar.rs b/library/std/src/sys/itron/condvar.rs index 2992a6a5429..ed26c528027 100644 --- a/library/std/src/sys/itron/condvar.rs +++ b/library/std/src/sys/itron/condvar.rs @@ -1,6 +1,6 @@ //! POSIX conditional variable implementation based on user-space wait queues. use super::{abi, error::expect_success_aborting, spin::SpinMutex, task, time::with_tmos_strong}; -use crate::{mem::replace, ptr::NonNull, sys::mutex::Mutex, time::Duration}; +use crate::{mem::replace, ptr::NonNull, sys::locks::Mutex, time::Duration}; // The implementation is inspired by the queue-based implementation shown in // Andrew D. Birrell's paper "Implementing Condition Variables with Semaphores" |