compiletest: ignore SVG y offset in by-lines comparison#157350
Open
xmakro wants to merge 1 commit into
Open
Conversation
SVG diagnostic snapshots (`--color=always`) render one terminal row per line. Under the parallel front-end, independent diagnostics can be emitted in a different order, which only permutes the rows and re-renders each at a different vertical `y` offset; the content of every row is unchanged. The parallel front-end already compares ui output as a sorted line multiset, but the `y` attribute is part of each line, so a pure reordering was still reported as a difference. Strip the `y` coordinate (and the `<svg>` header line, whose width and height are already ignored by the exact comparison) before the multiset comparison. The normalization is only used for the equality check; the original strings are kept for the diff and for blessing, and single-threaded runs keep the exact comparison including `y`. With this, the multiline-removal-suggestion test passes under the parallel front-end, so drop its ignore directive.
rustbot
added
A-compiletest
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
S-waiting-on-review
Collaborator
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @clubby789 (or someone else) some time within the next two weeks. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
Why was this reviewer chosen?The reviewer was selected based on:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tracked in #154314.
SVG diagnostic snapshots (tests compiled with
--color=always) render one terminal row per line, laid out top to bottom. Under the parallel front-end, independent diagnostics can be emitted in a different order. That permutes the rows and re-renders each one at a different verticalyoffset, even though the content of every row is unchanged.The parallel front-end already compares ui test output as a sorted line multiset, but the
yattribute is part of each line's text, so a pure reordering was still reported as a difference. This is whytests/ui/error-emitter/multiline-removal-suggestion.rswas markedignore-parallel-frontend.This change strips the
ycoordinate (and the<svg>header line, whose width and height are already ignored by the exact comparison) before the multiset comparison, so a reordering of whole rows is no longer treated as a difference.