diff options
| author | bors <bors@rust-lang.org> | 2024-10-25 21:01:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-25 21:01:03 +0000 |
| commit | c1db4dc24267a707409c9bf2e67cf3c7323975c8 (patch) | |
| tree | 01af826253af9b474b7af04fc091d11df77915cc /library/std/src/sys/sync/thread_parking/pthread.rs | |
| parent | b188577f14fd238ca8568276baabd461a174038d (diff) | |
| parent | 4f2e9c5284abf541f61ec0399cf20c0d143ae284 (diff) | |
| download | rust-c1db4dc24267a707409c9bf2e67cf3c7323975c8.tar.gz rust-c1db4dc24267a707409c9bf2e67cf3c7323975c8.zip | |
Auto merge of #132148 - matthiaskrgr:rollup-c155tcy, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #132106 (Pass Ident by reference in ast Visitor) - #132130 (remove `change-id` from CI script) - #132137 (library: consistently use American spelling for 'behavior') r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/sync/thread_parking/pthread.rs')
| -rw-r--r-- | library/std/src/sys/sync/thread_parking/pthread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/sync/thread_parking/pthread.rs b/library/std/src/sys/sync/thread_parking/pthread.rs index 5f195d0bb0c..76df73b2a8e 100644 --- a/library/std/src/sys/sync/thread_parking/pthread.rs +++ b/library/std/src/sys/sync/thread_parking/pthread.rs @@ -97,7 +97,7 @@ impl Parker { /// The constructed parker must never be moved. pub unsafe fn new_in_place(parker: *mut Parker) { // Use the default mutex implementation to allow for simpler initialization. - // This could lead to undefined behaviour when deadlocking. This is avoided + // This could lead to undefined behavior when deadlocking. This is avoided // by not deadlocking. Note in particular the unlocking operation before any // panic, as code after the panic could try to park again. (&raw mut (*parker).state).write(AtomicUsize::new(EMPTY)); |