Fix unstable diagnostics in tests#157299
Open
zetanumbers wants to merge 3 commits into
Open
Conversation
Inconsistency happens when subdiagnostic pads the main diagnostic with an empty source line (aka "|"). Meanwhile the parallel frontend might bunch subdiagnostics on a single primary diagnostic, removing padding from some other one.
…nabled" This reverts commit f582193.
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
A-testsuite
Collaborator
|
r? @nnethercote rustbot has assigned @nnethercote. Use Why was this reviewer chosen?The reviewer was selected based on:
|
petrochenkov
reviewed
Jun 3, 2026
| //@ edition:2021 | ||
|
|
||
| //@ check-pass | ||
| //@ ignore-parallel-frontend unstable liveness diagnostics |
Contributor
There was a problem hiding this comment.
Nit: could you keep nicer formatting while doing these changes, like
//@ directives (without empty lines)
#![attributes] (after an empty line)
other code (after an empty line)(Here and in some other tests.)
| } else if compare_output_by_lines { | ||
| let mut actual_lines: Vec<&str> = actual.lines().collect(); | ||
| let mut expected_lines: Vec<&str> = expected.lines().collect(); | ||
| // Filter out padded empty code lines |
Contributor
There was a problem hiding this comment.
Is the same filtering required for the compare_output_by_lines_subset scenario above?
petrochenkov
added
S-waiting-on-author
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
4 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.
The main inconsistency in changed tests happens when subdiagnostic pads the main diagnostic with an empty source line (aka "|"). Meanwhile the parallel frontend might bunch subdiagnostics on a single primary diagnostic, removing padding from some other one. So we can just ignore "|" lines.
Updates #154314
Reverts #157103