Skip to content

Commit a2e09ba

Browse files
committed
Fix phrasing
1 parent c2f459c commit a2e09ba

28 files changed

+28
-28
lines changed

src/tools/miri/src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ pub fn report_error<'tcx, 'mir>(
224224
vec![(None, format!("use Strict Provenance APIs (https://doc.rust-lang.org/nightly/std/ptr/index.html#strict-provenance, https://crates.io/crates/sptr) instead"))],
225225
DataRace { op2, .. } =>
226226
vec![
227-
(Some(op2.span), format!("and {} on {}, which is here", op2.action, op2.thread_info)),
227+
(Some(op2.span), format!("and the {} on {} is here", op2.action, op2.thread_info)),
228228
(None, format!("this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior")),
229229
(None, format!("see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information")),
230230
],

src/tools/miri/tests/fail/data_race/alloc_read_race.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Read on thread `<unnamed>`
44
LL | *pointer.load(Ordering::Relaxed)
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Read on thread `<unnamed>` and Allocate on thread `<unnamed>` at ALLOC. The Read is here
66
|
7-
help: and Allocate on thread `<unnamed>`, which is here
7+
help: and the Allocate on thread `<unnamed>` is here
88
--> $DIR/alloc_read_race.rs:LL:CC
99
|
1010
LL | pointer.store(Box::into_raw(Box::new_uninit()), Ordering::Relaxed);

src/tools/miri/tests/fail/data_race/alloc_write_race.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Write on thread `<unnamed>
44
LL | *pointer.load(Ordering::Relaxed) = 2;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Write on thread `<unnamed>` and Allocate on thread `<unnamed>` at ALLOC. The Write is here
66
|
7-
help: and Allocate on thread `<unnamed>`, which is here
7+
help: and the Allocate on thread `<unnamed>` is here
88
--> $DIR/alloc_write_race.rs:LL:CC
99
|
1010
LL | .store(Box::into_raw(Box::<usize>::new_uninit()) as *mut usize, Ordering::Relaxed);

src/tools/miri/tests/fail/data_race/atomic_read_na_write_race1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Atomic Load on thread `<un
44
LL | (&*c.0).load(Ordering::SeqCst)
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Atomic Load on thread `<unnamed>` and Write on thread `<unnamed>` at ALLOC. The Atomic Load is here
66
|
7-
help: and Write on thread `<unnamed>`, which is here
7+
help: and the Write on thread `<unnamed>` is here
88
--> $DIR/atomic_read_na_write_race1.rs:LL:CC
99
|
1010
LL | *(c.0 as *mut usize) = 32;

src/tools/miri/tests/fail/data_race/atomic_read_na_write_race2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Write on thread `<unnamed>
44
LL | *atomic_ref.get_mut() = 32;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Write on thread `<unnamed>` and Atomic Load on thread `<unnamed>` at ALLOC. The Write is here
66
|
7-
help: and Atomic Load on thread `<unnamed>`, which is here
7+
help: and the Atomic Load on thread `<unnamed>` is here
88
--> $DIR/atomic_read_na_write_race2.rs:LL:CC
99
|
1010
LL | atomic_ref.load(Ordering::SeqCst)

src/tools/miri/tests/fail/data_race/atomic_write_na_read_race1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Read on thread `<unnamed>`
44
LL | *atomic_ref.get_mut()
55
| ^^^^^^^^^^^^^^^^^^^^^ Data race detected between Read on thread `<unnamed>` and Atomic Store on thread `<unnamed>` at ALLOC. The Read is here
66
|
7-
help: and Atomic Store on thread `<unnamed>`, which is here
7+
help: and the Atomic Store on thread `<unnamed>` is here
88
--> $DIR/atomic_write_na_read_race1.rs:LL:CC
99
|
1010
LL | atomic_ref.store(32, Ordering::SeqCst)

src/tools/miri/tests/fail/data_race/atomic_write_na_read_race2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Atomic Store on thread `<u
44
LL | (&*c.0).store(32, Ordering::SeqCst);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Atomic Store on thread `<unnamed>` and Read on thread `<unnamed>` at ALLOC. The Atomic Store is here
66
|
7-
help: and Read on thread `<unnamed>`, which is here
7+
help: and the Read on thread `<unnamed>` is here
88
--> $DIR/atomic_write_na_read_race2.rs:LL:CC
99
|
1010
LL | let _val = *(c.0 as *mut usize);

src/tools/miri/tests/fail/data_race/atomic_write_na_write_race1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Atomic Store on thread `<u
44
LL | (&*c.0).store(64, Ordering::SeqCst);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Atomic Store on thread `<unnamed>` and Write on thread `<unnamed>` at ALLOC. The Atomic Store is here
66
|
7-
help: and Write on thread `<unnamed>`, which is here
7+
help: and the Write on thread `<unnamed>` is here
88
--> $DIR/atomic_write_na_write_race1.rs:LL:CC
99
|
1010
LL | *(c.0 as *mut usize) = 32;

src/tools/miri/tests/fail/data_race/atomic_write_na_write_race2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Write on thread `<unnamed>
44
LL | *atomic_ref.get_mut() = 32;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ Data race detected between Write on thread `<unnamed>` and Atomic Store on thread `<unnamed>` at ALLOC. The Write is here
66
|
7-
help: and Atomic Store on thread `<unnamed>`, which is here
7+
help: and the Atomic Store on thread `<unnamed>` is here
88
--> $DIR/atomic_write_na_write_race2.rs:LL:CC
99
|
1010
LL | atomic_ref.store(64, Ordering::SeqCst);

src/tools/miri/tests/fail/data_race/dangling_thread_async_race.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: Undefined Behavior: Data race detected between Write on thread `<unnamed>
44
LL | *c.0 = 64;
55
| ^^^^^^^^^ Data race detected between Write on thread `<unnamed>` and Write on thread `<unnamed>` at ALLOC. The Write is here
66
|
7-
help: and Write on thread `<unnamed>`, which is here
7+
help: and the Write on thread `<unnamed>` is here
88
--> $DIR/dangling_thread_async_race.rs:LL:CC
99
|
1010
LL | *c.0 = 32;

0 commit comments

Comments
 (0)