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

[estebank]

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`

[rustbot]

r? @oli-obk

rustbot has assigned @oli-obk.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[rustbot]

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

[oli-obk]

r=me after merging the fixup commits into their corresponding main commits

[bors]

☔ The latest upstream changes (presumably #121500) made this pull request unmergeable. Please resolve the merge conflicts.

[estebank]

@bors r=oli-obk

[bors]

📌 Commit e119b32 has been approved by oli-obk

It is now in the queue for this repository.

[Nadrieril]

@bors rollup

[workingjubilee]

@bors r-

Seems to have busted rollup in #122260 (comment)

[workingjubilee]

@bors rollup=iffy

[estebank]

Oooff... Seeing what the diff was concerns me about relying on the svg output going forward :-/

[estebank]

@epage could you bring some insight on what the reason might be for this divergence in the output?

---- [ui] tests/ui/codemap_tests/huge_multispan_highlight.rs stdout ----
diff of svg:

- <svg width="743px" height="848px" xmlns="http://www.w3.org/2000/svg">
+ <svg width="740px" height="848px" xmlns="http://www.w3.org/2000/svg">
2   <style>
3     .fg { fill: #AAAAAA }
4     .bg { background: #000000 }

I suspected maybe font size differences causing some calculation to diverge?

[rustbot]

Some changes occurred in src/tools/compiletest

cc @jieyouxu

[estebank]

@epage that's a shame. For now I think that setting a min-width unblocks us, but we should be aware of that issue. For humans it doesn't matter, but it will get in the way of tooling doing diffs (like the cargo test suite, also surprised it didn't happen there either).

[epage]

Cargo is getting this functionality through snapbox which has a (hacky) solution to only pay attention to the <text> and not to the stuff at the top so it gives a more focused diff to the user.

[estebank]

@epage ah! I see. That makes sense, to make the differ smarter and ignore what humans would ignore. For now I'll go with the min-width approach to see if that's enough, so that we can still detect changes in the output that would cause our bounding box to change, but if it continues to give us trouble I'll modify the diff checker to ignore the sizing info (shouldn't be too hard to do, it can even be "ignore first line").

[estebank]

@bors r=oli-obk

[bors]

📌 Commit 957c0d3 has been approved by oli-obk

It is now in the queue for this repository.

[bors]

⌛ Testing commit 957c0d3 with merge f601f46...

[bors]

💔 Test failed - checks-actions

[rust-log-analyzer]

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] rustc_infer test:false 92.205
   Compiling rustc_passes v0.0.0 (/checkout/compiler/rustc_passes)
[RUSTC-TIMING] rustc_traits test:false 20.811
   Compiling rustc_mir_transform v0.0.0 (/checkout/compiler/rustc_mir_transform)
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Tue Mar 19 00:02:06 UTC 2024
  network time: Tue, 19 Mar 2024 00:02:06 GMT
##[endgroup]
##[endgroup]
Session terminated, killing shell...[RUSTC-TIMING] rustc_middle test:false 130.289
 ...killed.
##[error]The operation was canceled.

[estebank]

@bors retry

[bors]

⌛ Testing commit 957c0d3 with merge bd459c2...

[bors]

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing bd459c2 to master...

[rust-timer]

Finished benchmarking commit (bd459c2): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.3%	[-5.1%, -1.9%]	38
All ❌✅ (primary)	-	-	0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-2.7%, -2.7%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 668.419s -> 668.413s (-0.00%)
Artifact size: 312.82 MiB -> 312.83 MiB (0.00%)

[nikic]

The test still fails for me locally:

---- [ui] tests/ui/codemap_tests/huge_multispan_highlight.rs stdout ----
diff of svg:

-	<svg width="750px" height="848px" xmlns="http://www.w3.org/2000/svg">
+	<svg width="751px" height="848px" xmlns="http://www.w3.org/2000/svg">
2	  <style>
3	    .fg { fill: #AAAAAA }
4	    .bg { background: #000000 }

[estebank]

@nikic I'll make an emergency PR to completely ignore the width then :-/

Edit: fix #122779