Fix cache replay including extra newlines.#7819
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 22, 2020
Merged
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Member
|
@bors: r+ |
Contributor
|
📌 Commit 34ab15be23b16c4fc790c7eb0eb39762cdec7bd8 has been approved by |
Contributor
|
⌛ Testing commit 34ab15be23b16c4fc790c7eb0eb39762cdec7bd8 with merge 8e75893dc66a46b9087666a780d3957e99404d7c... |
Contributor
|
💔 Test failed - checks-azure |
Member
|
@bors: retry hoping spurious timeout |
Contributor
|
⌛ Testing commit 34ab15be23b16c4fc790c7eb0eb39762cdec7bd8 with merge befc8adcd1028154358446c3e3ff425dcbcadd32... |
Contributor
|
💔 Test failed - checks-azure |
34ab15b to
7be3c2f
Compare
Contributor
Author
|
I pushed a fix that should fix the Windows error. I forgot that Windows treats PATH a little differently, and there was an infinite loop where the |
Member
|
@bors: r+ |
Contributor
|
📌 Commit 7be3c2f has been approved by |
Contributor
bors
added a commit
that referenced
this pull request
Jan 22, 2020
Fix cache replay including extra newlines. The compiler output cache replay was changed in #7737 to use `BufReader::read_line` instead of `str::lines`. `read_line`, unlike `lines`, includes the trailing line ending. The code is written assuming that the line endings are stripped, so make sure they are stripped here, too. This only happens for non-JSON messages, like `RUSTC_LOG`.
Contributor
|
☀️ Test successful - checks-azure |
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 compiler output cache replay was changed in #7737 to use
BufReader::read_lineinstead ofstr::lines.read_line, unlikelines, includes the trailing line ending. The code is written assuming that the line endings are stripped, so make sure they are stripped here, too.This only happens for non-JSON messages, like
RUSTC_LOG.