Fix old lockfile encoding wrt newlines #7262
Merged
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
This commit fixes "old lockfile" encodings back to what they were prior to rust-lang#7070 with respect to newlines. The changes in rust-lang#7070 accidentally introduced a change where old lockfiles might have some extraneous newlines removed unintentionally. In rust-lang#7070 it was attempted to clean up how newlines are emitted to ensure a trailing blank newline never shows up at the end of the file, but this acccidentally regressed cases where today we actually do have blank newlines at the end of lock files. This commit instead restores all the previous newline handling, and then scopes the "remove trailing newlines" fix to specifically just the new encoding. Closes rust-lang#7254
|
r? @Eh2406 (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @ehuss After this lands I'll prep a backport to beta as well |
|
@bors r+ |
|
📌 Commit b850342 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 20, 2019
Fix old lockfile encoding wrt newlines This commit fixes "old lockfile" encodings back to what they were prior to #7070 with respect to newlines. The changes in #7070 accidentally introduced a change where old lockfiles might have some extraneous newlines removed unintentionally. In #7070 it was attempted to clean up how newlines are emitted to ensure a trailing blank newline never shows up at the end of the file, but this acccidentally regressed cases where today we actually do have blank newlines at the end of lock files. This commit instead restores all the previous newline handling, and then scopes the "remove trailing newlines" fix to specifically just the new encoding. Closes #7254
|
☀️ Test successful - checks-azure |
|
Thanks @alexcrichton for the fix! |
|
This is a little confusing, for some reason this wasn't closed when it merged. It seems to have merged, so I'll close it manually. |
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Aug 27, 2019
Update cargo Update cargo 10 commits in 3f700ec43ce72305eb5315cfc710681f3469d4b4..22f7dd0495cd72ce2082d318d5a9b4dccb9c5b8c 2019-08-19 22:43:12 +0000 to 2019-08-27 16:10:51 +0000 - Update and improve zsh completion (rust-lang/cargo#7296) - Document that `package` can be used in `[patch]` (rust-lang/cargo#7263) - Fix `error:`/`warning:` coloring inconsistency with rustc (rust-lang/cargo#7294) - Tests: Import rustc_plugin from its new location (rust-lang/cargo#7287) - Update README azure badge. (rust-lang/cargo#7293) - Update home dependencies to v0.5 (rust-lang/cargo#7277) - Fix typo (rust-lang/cargo#7279) - Update libgit2 dependencies (rust-lang/cargo#7275) - Fix old lockfile encoding wrt newlines (rust-lang/cargo#7262) - Fix dSYM uplifting when symlink is broken (rust-lang/cargo#7268)
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.
This commit fixes "old lockfile" encodings back to what they were prior
to #7070 with respect to newlines. The changes in #7070 accidentally
introduced a change where old lockfiles might have some extraneous
newlines removed unintentionally.
In #7070 it was attempted to clean up how newlines are emitted to ensure
a trailing blank newline never shows up at the end of the file, but this
acccidentally regressed cases where today we actually do have blank
newlines at the end of lock files. This commit instead restores all the
previous newline handling, and then scopes the "remove trailing
newlines" fix to specifically just the new encoding.
Closes #7254