user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #122029 - estebank:drive-by-ui-test, r=oli-obk

Browse source 
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`
```
This commit is contained in:
bors 2024-03-19 22:11:59 +00:00
commit bd459c2877
15 changed files with 323 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/compiletest/src/runtest.rs
View file

@ -4040,7 +4040,7 @@ impl<'test> TestCx<'test> {
};
let stderr = if force_color_svg {
anstyle_svg::Term::new().render_svg(&proc_res.stderr)
anstyle_svg::Term::new().min_width_px(730).render_svg(&proc_res.stderr)
} else if explicit_format {
proc_res.stderr.clone()
} else {