Skip to content

Commit 76096ef

Browse files
committed
Auto merge of rust-lang#122029 - estebank:drive-by-ui-test, r=oli-obk
When displaying multispans, ignore empty lines adjacent to `...` ``` error[E0308]: `match` arms have incompatible types --> tests/ui/codemap_tests/huge_multispan_highlight.rs:98:18 | 6 | let _ = match true { | ---------- `match` arms have incompatible types 7 | true => ( | _________________- 8 | | // last line shown in multispan header ... | 96 | | 97 | | ), | |_________- this is found to be of type `()` 98 | false => " | __________________^ ... | 119 | | 120 | | ", | |_________^ expected `()`, found `&str` error[E0308]: `match` arms have incompatible types --> tests/ui/codemap_tests/huge_multispan_highlight.rs:215:18 | 122 | let _ = match true { | ---------- `match` arms have incompatible types 123 | true => ( | _________________- 124 | | 125 | | 1 // last line shown in multispan header ... | 213 | | 214 | | ), | |_________- this is found to be of type `{integer}` 215 | false => " | __________________^ 216 | | 217 | | 218 | | 1 last line shown in multispan ... | 237 | | 238 | | ", | |_________^ expected integer, found `&str` ```
2 parents 56288a7 + 8339474 commit 76096ef

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

tests/ui/async_yields_async.stderr

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ LL | let _m = async || {
8181
| _______________________-
8282
LL | | println!("I'm bored");
8383
LL | | // Some more stuff
84-
LL | |
85-
LL | | // Finally something to await
84+
... |
8685
LL | | CustomFutureType
8786
| | ^^^^^^^^^^^^^^^^
8887
| | |

tests/ui/empty_line_after_outer_attribute.stderr

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ error: found an empty line after an outer attribute. Perhaps you forgot to add a
2222
--> tests/ui/empty_line_after_outer_attribute.rs:28:1
2323
|
2424
LL | / #[crate_type = "lib"]
25-
LL | |
26-
LL | |
25+
... |
2726
LL | | fn with_two_newlines() { assert!(true) }
2827
| |_
2928

0 commit comments

Comments
 (0)