Skip to content

Commit 7ec2bee

Browse files
committed
Auto merge of #1874 - steffahn:a_an, r=RalfJung
Fix typos “a”→“an” See rust-lang/rust#88230
2 parents 19691b2 + c79f6dd commit 7ec2bee

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/data_race.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
//! order exists in which all threads observe all modifications in the same
4343
//! order (see Sequentially-consistent ordering below) "
4444
//! So in the absence of weak memory effects a seq-cst load & a seq-cst store is identical
45-
//! to a acquire load and a release store given the global sequentially consistent order
45+
//! to an acquire load and a release store given the global sequentially consistent order
4646
//! of the schedule.
4747
//!
4848
//! The timestamps used in the data-race detector assign each sequence of non-atomic operations
@@ -142,7 +142,7 @@ impl ThreadClockSet {
142142
self.fence_release.clone_from(&self.clock);
143143
}
144144

145-
/// Apply the effects of a acquire fence to this
145+
/// Apply the effects of an acquire fence to this
146146
/// set of thread vector clocks.
147147
#[inline]
148148
fn apply_acquire_fence(&mut self) {
@@ -503,7 +503,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriEvalContextExt<'mir, 'tcx> {
503503
this.validate_atomic_store(dest, atomic)
504504
}
505505

506-
/// Perform a atomic operation on a memory location.
506+
/// Perform an atomic operation on a memory location.
507507
fn atomic_op_immediate(
508508
&mut self,
509509
place: &MPlaceTy<'tcx, Tag>,
@@ -695,7 +695,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriEvalContextExt<'mir, 'tcx> {
695695
log::trace!("Atomic fence on {:?} with ordering {:?}", index, atomic);
696696

697697
// Apply data-race detection for the current fences
698-
// this treats AcqRel and SeqCst as the same as a acquire
698+
// this treats AcqRel and SeqCst as the same as an acquire
699699
// and release fence applied in the same timestamp.
700700
if atomic != AtomicFenceOp::Release {
701701
// Either Acquire | AcqRel | SeqCst

src/helpers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
7878
self.eval_context_mut().eval_path_scalar(&["std", "sys", "windows", module, name])
7979
}
8080

81-
/// Helper function to get a `windows` constant as an `u64`.
81+
/// Helper function to get a `windows` constant as a `u64`.
8282
fn eval_windows_u64(&mut self, module: &str, name: &str) -> InterpResult<'tcx, u64> {
8383
// TODO: Cache the result.
8484
self.eval_windows(module, name)?.to_u64()

0 commit comments

Comments
 (0)