diff options
| author | bors <bors@rust-lang.org> | 2024-12-04 00:47:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-04 00:47:09 +0000 |
| commit | 3b382642aba7cffbb2f47829b24635fad87bcf5c (patch) | |
| tree | 6e1aae17d5589caf8960e013f835b9ef735f5075 /library/std/src | |
| parent | c44b3d50fea96a3e0417e8264c16ea21a0a3fca2 (diff) | |
| parent | cd56913663fbeb2dbc6a205eed1bb468db90ef30 (diff) | |
| download | rust-3b382642aba7cffbb2f47829b24635fad87bcf5c.tar.gz rust-3b382642aba7cffbb2f47829b24635fad87bcf5c.zip | |
Auto merge of #133818 - matthiaskrgr:rollup-iav1wq7, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #132937 (a release operation synchronizes with an acquire operation) - #133681 (improve TagEncoding::Niche docs, sanity check, and UB checks) - #133726 (Add `core::arch::breakpoint` and test) - #133768 (Remove `generic_associated_types_extended` feature gate) - #133811 ([AIX] change AIX default codemodel=large) - #133812 (Update wasm-component-ld to 0.5.11) - #133813 (compiletest: explain that UI tests are expected not to compile by default) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/thread/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index 2ff44fcd4c6..cfbf6548a38 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -1021,11 +1021,11 @@ impl Drop for PanicGuard { /// /// # Memory Ordering /// -/// Calls to `park` _synchronize-with_ calls to `unpark`, meaning that memory +/// Calls to `unpark` _synchronize-with_ calls to `park`, meaning that memory /// operations performed before a call to `unpark` are made visible to the thread that /// consumes the token and returns from `park`. Note that all `park` and `unpark` -/// operations for a given thread form a total order and `park` synchronizes-with -/// _all_ prior `unpark` operations. +/// operations for a given thread form a total order and _all_ prior `unpark` operations +/// synchronize-with `park`. /// /// In atomic ordering terms, `unpark` performs a `Release` operation and `park` /// performs the corresponding `Acquire` operation. Calls to `unpark` for the same |