Skip to content

Commit e816708

Browse files
committed
auto merge of #18723 : mprobinson/rust/fence-typos, r=thestinger
2 parents 6ee56c9 + cd59582 commit e816708

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libcore/atomic.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,15 +717,15 @@ unsafe fn atomic_xor<T>(dst: *mut T, val: T, order: Ordering) -> T {
717717
/// A fence 'A' which has `Release` ordering semantics, synchronizes with a
718718
/// fence 'B' with (at least) `Acquire` semantics, if and only if there exists
719719
/// atomic operations X and Y, both operating on some atomic object 'M' such
720-
/// that A is sequenced before X, Y is synchronized before B and Y observers
720+
/// that A is sequenced before X, Y is synchronized before B and Y observes
721721
/// the change to M. This provides a happens-before dependence between A and B.
722722
///
723723
/// Atomic operations with `Release` or `Acquire` semantics can also synchronize
724724
/// with a fence.
725725
///
726-
/// A fence with has `SeqCst` ordering, in addition to having both `Acquire` and
727-
/// `Release` semantics, participates in the global program order of the other
728-
/// `SeqCst` operations and/or fences.
726+
/// A fence which has `SeqCst` ordering, in addition to having both `Acquire`
727+
/// and `Release` semantics, participates in the global program order of the
728+
/// other `SeqCst` operations and/or fences.
729729
///
730730
/// Accepts `Acquire`, `Release`, `AcqRel` and `SeqCst` orderings.
731731
///

0 commit comments

Comments
 (0)