about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorTim Neumann <mail@timnn.me>2018-03-26 15:14:57 +0200
committerGitHub <noreply@github.com>2018-03-26 15:14:57 +0200
commit9e4d5cf0ce673f1e3d2ca5490e0bff3788ce37c9 (patch)
tree80f66882d72c2ddb3296d864c062db644a4bcc4b /src
parentfc9dfda6adcbbd7f13bba1781ae35371dd48fa81 (diff)
parent23013c791c70a297b430e9d1c0408493705d36e0 (diff)
downloadrust-9e4d5cf0ce673f1e3d2ca5490e0bff3788ce37c9.tar.gz
rust-9e4d5cf0ce673f1e3d2ca5490e0bff3788ce37c9.zip
Rollup merge of #49170 - steveklabnik:gh49127, r=nagisa
Clarify AcqRel's docs

This implied things that are not true.

Fixes #49127
Diffstat (limited to 'src')
-rw-r--r--src/libcore/sync/atomic.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index fe5ed5d4942..d934706be67 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -205,8 +205,11 @@ pub enum Ordering {
     /// [`Release`]: http://llvm.org/docs/Atomics.html#release
     #[stable(feature = "rust1", since = "1.0.0")]
     Acquire,
-    /// When coupled with a load, uses [`Acquire`] ordering, and with a store
-    /// [`Release`] ordering.
+    /// Has the effects of both [`Acquire`] and [`Release`] together.
+    ///
+    /// This ordering is only applicable for operations that combine both loads and stores.
+    ///
+    /// For loads it uses [`Acquire`] ordering. For stores it uses the [`Release`] ordering.
     ///
     /// [`Acquire`]: http://llvm.org/docs/Atomics.html#acquire
     /// [`Release`]: http://llvm.org/docs/Atomics.html#release