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/sync | |
| 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/sync')
| -rw-r--r-- | library/std/src/sync/mpmc/array.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sync/once.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sync/mpmc/array.rs b/library/std/src/sync/mpmc/array.rs index 34acd9c9a94..2c8ba411f30 100644 --- a/library/std/src/sync/mpmc/array.rs +++ b/library/std/src/sync/mpmc/array.rs @@ -484,7 +484,7 @@ impl<T> Channel<T> { /// /// # Panicking /// If a destructor panics, the remaining messages are leaked, matching the - /// behaviour of the unbounded channel. + /// behavior of the unbounded channel. /// /// # Safety /// This method must only be called when dropping the last receiver. The diff --git a/library/std/src/sync/once.rs b/library/std/src/sync/once.rs index 993df9314fc..27db4b634fb 100644 --- a/library/std/src/sync/once.rs +++ b/library/std/src/sync/once.rs @@ -288,7 +288,7 @@ impl Once { /// /// If this [`Once`] has been poisoned because an initialization closure has /// panicked, this method will also panic. Use [`wait_force`](Self::wait_force) - /// if this behaviour is not desired. + /// if this behavior is not desired. #[unstable(feature = "once_wait", issue = "127527")] pub fn wait(&self) { if !self.inner.is_completed() { |