Skip to content

Commit ad82d9f

Browse files
committed
Fix miri tests
1 parent 49a22a4 commit ad82d9f

11 files changed

+1
-12
lines changed

src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ note: inside `main`
2424
LL | / thread::spawn(|| {
2525
LL | | unsafe {
2626
LL | | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJECT_0);
27-
LL | | }
28-
LL | | })
27+
... |
2928
LL | | .join()
3029
| |___________^
3130

src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | let _unit: ();
1414
LL | | {
1515
LL | | let non_copy = S(42);
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

src/tools/miri/tests/fail/function_calls/arg_inplace_mutate.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | let _unit: ();
1616
LL | | {
1717
LL | | let non_copy = S(42);
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | let _unit: ();
1414
LL | | {
1515
LL | | let non_copy = S(42);
1616
... |
17-
LL | |
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

src/tools/miri/tests/fail/function_calls/arg_inplace_observe_during.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | let _unit: ();
1616
LL | | {
1717
LL | | let non_copy = S(42);
1818
... |
19-
LL | |
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | {
1414
LL | | let x = 0;
1515
LL | | let ptr = &raw mut x;
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | {
1616
LL | | let x = 0;
1717
LL | | let ptr = &raw mut x;
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | {
1414
LL | | let _x = 0;
1515
LL | | let ptr = &raw mut _x;
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | {
1616
LL | | let _x = 0;
1717
LL | | let ptr = &raw mut _x;
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | {
1414
LL | | let _x = 0;
1515
LL | | let ptr = &raw mut _x;
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

src/tools/miri/tests/fail/function_calls/return_pointer_aliasing_write_tail_call.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | {
1616
LL | | let _x = 0;
1717
LL | | let ptr = &raw mut _x;
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

0 commit comments

Comments
 (0)