Lengthen the span label to include match and expr for E0004

[KiChjang]

Part of #35233.
Extension of #35191.

r? @GuillaumeGomez

[GuillaumeGomez]

Thanks!

@bors: r+ rollup

[bors]

📌 Commit 06133c5 has been approved by GuillaumeGomez

[bors]

⌛ Testing commit 06133c5 with merge 8a4641b...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-no-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: GuillaumeGomez
Pushing 8a4641b to master...

[nrc]

@GuillaumeGomez, @KiChjang Manually altering spans like this is not usually a good idea - you have no guarantee that the new lo point will be before the new hi point in the source text due to macro expansion. In general, I would say just never do this - you have to put up with the spans you have. in the future, we should have more spans plus we'll provide infrastructure to concat them. In the meantime, if you must do this then you need to check that the span you create is valid.

I'm also not sure about re-using the expansion id, given that the rest of the expression might have a different expansion history, it doesn't make a lot of sense. Seeing as this span should just be used for error messages, you can probably just use the 'no expansion' id.

[sophiajt]

@nrc - filed #35529