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/alloc/src/sync.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/alloc/src/sync.rs')
| -rw-r--r-- | library/alloc/src/sync.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index 220b79eaf8a..15a1b0f2834 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -804,7 +804,7 @@ impl<T, A: Allocator> Arc<T, A> { // observe a non-zero strong count. Therefore we need at least "Release" ordering // in order to synchronize with the `compare_exchange_weak` in `Weak::upgrade`. // - // "Acquire" ordering is not required. When considering the possible behaviours + // "Acquire" ordering is not required. When considering the possible behaviors // of `data_fn` we only need to look at what it could do with a reference to a // non-upgradeable `Weak`: // - It can *clone* the `Weak`, increasing the weak reference count. @@ -2788,7 +2788,7 @@ impl<T: ?Sized, A: Allocator> Weak<T, A> { /// /// drop(strong); /// // But not any more. We can do weak.as_ptr(), but accessing the pointer would lead to - /// // undefined behaviour. + /// // undefined behavior. /// // assert_eq!("hello", unsafe { &*weak.as_ptr() }); /// ``` /// |
