Skip to content

Commit 27c8b97

Browse files
authored
Rollup merge of #134181 - estebank:trim-render, r=oli-obk
Tweak multispan rendering to reduce output length Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in `*.stderr` tests that have "hidden" comments. We do that check not only on the first 4 lines of the multispan, but now also on the previous to last line as well.
2 parents fe11029 + 65201b0 commit 27c8b97

11 files changed

+1
-12
lines changed

tests/fail-dep/concurrency/windows_join_main.stderr

Lines changed: 1 addition & 2 deletions
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

tests/fail/function_calls/arg_inplace_mutate.stack.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/arg_inplace_mutate.tree.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/arg_inplace_observe_during.stack.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/arg_inplace_observe_during.tree.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr

Lines changed: 0 additions & 1 deletion
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

tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr

Lines changed: 0 additions & 1 deletion
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

0 commit comments

Comments
 (0)