Skip to content

Commit 1ccac16

Browse files
committed
Bless after rebase
1 parent f89d623 commit 1ccac16

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/tools/miri/tests/fail/stacked_borrows/box_noalias_violation.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | unsafe fn test(mut x: Box<i32>, y: *const i32) -> i32 {
1818
| ^^^^^
1919
= note: BACKTRACE:
2020
= note: inside `test` at $DIR/box_noalias_violation.rs:LL:CC
21-
note: inside `main` at $DIR/box_noalias_violation.rs:LL:CC
21+
note: inside `main`
2222
--> $DIR/box_noalias_violation.rs:LL:CC
2323
|
2424
LL | test(Box::from_raw(ptr), ptr);

src/tools/miri/tests/fail/stacked_borrows/illegal_dealloc1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | ptr1.write(0);
1818
| ^^^^^^^^^^^^^
1919
= note: BACKTRACE:
2020
= note: inside `std::alloc::dealloc` at RUSTLIB/alloc/src/alloc.rs:LL:CC
21-
note: inside `main` at $DIR/illegal_deALLOC.rs:LL:CC
21+
note: inside `main`
2222
--> $DIR/illegal_deALLOC.rs:LL:CC
2323
|
2424
LL | dealloc(ptr2, Layout::from_size_align_unchecked(1, 1));

src/tools/miri/tests/fail/stacked_borrows/retag_data_race_read.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | *p = 5;
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
1010
= note: inside `thread_2` at $DIR/retag_data_race_read.rs:LL:CC
11-
note: inside closure at $DIR/retag_data_race_read.rs:LL:CC
11+
note: inside closure
1212
--> $DIR/retag_data_race_read.rs:LL:CC
1313
|
1414
LL | let t2 = std::thread::spawn(move || thread_2(p));

src/tools/miri/tests/fail/stacked_borrows/retag_data_race_write.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | *p = 5;
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
1010
= note: inside `thread_2` at $DIR/retag_data_race_write.rs:LL:CC
11-
note: inside closure at $DIR/retag_data_race_write.rs:LL:CC
11+
note: inside closure
1212
--> $DIR/retag_data_race_write.rs:LL:CC
1313
|
1414
LL | let t2 = std::thread::spawn(move || thread_2(p));

0 commit comments

Comments
 (0)