about summary refs log tree commit diff
path: root/library/core/src/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-01-28 20:15:51 +0000
committerbors <bors@rust-lang.org>2025-01-28 20:15:51 +0000
commitbf1b174e7d0922fc549071b751ab96fc9ee9f6fe (patch)
treee98cf327b1b995ead0c48fdb52669a22a5af86d6 /library/core/src/sync
parent77a455303bf08da8eef6236b2b4422a77cd25c42 (diff)
parent9715fea5d52a521a62c7165fbd85ed6559db2b52 (diff)
Auto merge of #136203 - matthiaskrgr:rollup-1k0f44l, r=matthiaskrgr
Rollup of 9 pull requests

Successful merges:

 - #135869 (Make docs for AtomicUsize::from_mut platform-independent)
 - #135892 (-Znext-solver: "normalize" signature before checking it mentions self in `deduce_closure_signature`)
 - #136055 (Implement MIR const trait stability checks)
 - #136066 (Pass spans to `perform_locally_in_new_solver`)
 - #136071 ([Clippy] Add vec_reserve & vecdeque_reserve diagnostic items)
 - #136124 (Arbitrary self types v2: explain test.)
 - #136149 (Flip the `rustc-rayon`/`indexmap` dependency order)
 - #136173 (Update comments and sort target_arch in c_char_definition)
 - #136178 (Update username in build helper example)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src/sync')
-rw-r--r--library/core/src/sync/atomic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
index 9b56abbd330..0061e33f986 100644
--- a/library/core/src/sync/atomic.rs
+++ b/library/core/src/sync/atomic.rs
@@ -2547,7 +2547,7 @@ macro_rules! atomic_int {
                 $int_type,
                 no = [
                     "**Note:** This function is only available on targets where `",
-                    stringify!($int_type), "` has an alignment of ", $align, " bytes."
+                    stringify!($atomic_type), "` has the same alignment as `", stringify!($int_type), "`."
                 ],
             }]
             ///