Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When displaying multispans, ignore empty lines adjacent to ... #122029

Merged
merged 4 commits into from
Mar 20, 2024
Merged

When displaying multispans, ignore empty lines adjacent to ... #122029

merged 4 commits into from
Mar 20, 2024

Commits on Mar 18, 2024

  1. Fix test for multiline span ui display 

    The compiler output changed in such a way that this test was no longer testing what it was meant to.
    @estebank
    estebank committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    3e0bf94 View commit details
    Browse the repository at this point in the history

  2. Move multispan test to svg output

    @estebank
    estebank committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    8ea7177 View commit details
    Browse the repository at this point in the history

  3. 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`
```
    @estebank
    estebank committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    cc9631a View commit details
    Browse the repository at this point in the history

  4. Side-step small SVG width divergence by setting min-width

    @estebank
    estebank committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    957c0d3 View commit details
    Browse the repository at this point in the history