pprust: adjust mixed comment printing and add regression test for #74745 #74980
Conversation
This file contains 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
petrochenkov
reviewed
Aug 2, 2020
This commit adjusts the pretty printing of mixed comments so that the initial zero-break isn't emitted at the beginning of the line. Through this, the `block-comment-wchar` test can have the `pp-exact` file removed, as it no longer converges from pretty printing of the source. Signed-off-by: David Wood <david@davidtw.co>
This commit adds a regression test for rust-lang#74745. While a `ignore-tidy-trailing-lines` header is required, this doesn't stop the test from reproducing, so long as there is no newline at the end of the file. However, adding the header comments made the test fail due to a bug in pprust, fixed in the previous commit. Signed-off-by: David Wood <david@davidtw.co>
This commit modifies compiletest so that a diff of actual and expected output is shown for pretty tests. This makes it far easier to work out what has changed. Signed-off-by: David Wood <david@davidtw.co>
b38ec02 to
1530563
Compare
|
@bors r+ |
|
📌 Commit 1530563 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 2, 2020
…arth Rollup of 5 pull requests Successful merges: - rust-lang#74980 (pprust: adjust mixed comment printing and add regression test for rust-lang#74745) - rust-lang#75009 (Document the discrepancy in the mask type for _mm_shuffle_ps) - rust-lang#75031 (Do not trigger `unused_{braces,parens}` lints with `yield`) - rust-lang#75059 (fix typos) - rust-lang#75064 (compiletest: Support ignoring tests requiring missing LLVM components) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #74745.
This PR adds a regression test for #74745. While a
ignore-tidy-trailing-linesheader is required, this doesn't stop the test from reproducing, so long as there is no newline at the end of the file.However, adding the header comments made the test fail due to a bug in pprust - so this PR also adjusts the pretty printing of mixed comments so that the initial zero-break isn't emitted at the beginning of the line. Through this, the
block-comment-wchartest can have thepp-exactfile removed, as it no longer converges from pretty printing of the source.