Skip to content

Commit ccb1415

Browse files
committedFeb 19, 2024
Auto merge of #121177 - joboet:move_pal_locks, r=ChrisDenton
Move locks to `sys` Part of #117276. r? `@ChrisDenton`
2 parents 0243834 + 1b1b6dd commit ccb1415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+144
-167
lines changed
 

‎.reuse/dep5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Copyright: 2019 The Crossbeam Project Developers
5252
The Rust Project Developers (see https://thanks.rust-lang.org)
5353
License: MIT OR Apache-2.0
5454

55-
Files: library/std/src/sys/pal/unix/locks/fuchsia_mutex.rs
55+
Files: library/std/src/sys/locks/mutex/fuchsia.rs
5656
Copyright: 2016 The Fuchsia Authors
5757
The Rust Project Developers (see https://thanks.rust-lang.org)
5858
License: BSD-2-Clause AND (MIT OR Apache-2.0)

‎library/std/src/sys/pal/unix/locks/futex_condvar.rs renamed to ‎library/std/src/sys/locks/condvar/futex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use super::Mutex;
21
use crate::sync::atomic::{AtomicU32, Ordering::Relaxed};
32
use crate::sys::futex::{futex_wait, futex_wake, futex_wake_all};
3+
use crate::sys::locks::Mutex;
44
use crate::time::Duration;
55

66
pub struct Condvar {

0 commit comments

Comments
 (0)
Please sign in to comment.