Uh oh!
There was an error while loading. Please reload this page.
[beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… - #65273
Closed
matklad wants to merge 1 commit into
Closed
[beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro…#65273matklad wants to merge 1 commit into
matklad wants to merge 1 commit into
Conversation
rust-highfive
commented
Oct 10, 2019
Contributor
|
…, r=petrochenkov" This reverts commit ef1ecbe, reversing changes made to fc8765d. That changed unfortunately broke rustfix on windows: rust-lang/rustfix#176 Specifically, what ef1ecbe did was to enforce normalization of \r\n to \n at file loading time, similarly to how we deal with Byte Order Mark. Normalization changes raw offsets in files, which are exposed via `--error-format=json`, and used by rusfix. The proper solution here (which also handles the latent case with BOM) is rust-lang#65074 However, since it's somewhat involved, and we are time sensitive, we prefer to revert the original change on beta.
matkladforce-pushed
the
revert-crnl-normalization
branch
from
October 10, 2019 15:22
6390ab7 to
5a21f76CompareMark-Simulacrum
commented
Oct 17, 2019
Member
Was going to mark this as beta accepted but compiler team should actually approve the revert here, though I expect that to be mostly non-controversial. |
pnkfelix
commented
Oct 21, 2019
Contributor
@bors r+ |
bors
commented
Oct 21, 2019
Collaborator
📌 Commit 5a21f76 has been approved by |
pnkfelix
commented
Oct 21, 2019
Contributor
I'm going to go ahead and beta-accept this. The compiler team discussed this matter two weeks ago and collectively agreed that a revert of PR #62948 was the appropriate fix. Since this PR literally is just that revert, with no other changes coupled to it, I think we can treat the previous T-compiler discussion as an approval for landing this on the beta-branch. |
pnkfelix
commented
Oct 21, 2019
Contributor
(but thank to you @Mark-Simulacrum for exercising caution here!) |
Centril
commented
Oct 25, 2019
Contributor
@bors p=-1 (so that it gets rolled up) |
Mark-Simulacrum
commented
Oct 25, 2019
Member
Including this in #65708 so closing. |
bors added a commit
that referenced
this pull request
Oct 26, 2019
[beta] backport rollup This includes a bunch of PRs: * Fix redundant semicolon lint interaction with proc macro attributes #64387 * Upgrade async/await to "used" keywords. #64875 * syntax: fix dropping of attribute on first param of non-method assocated fn #64894 * async/await: improve not-send errors #64895 * Silence unreachable code lint from await desugaring #64930 * Always mark rust and rust-call abi's as unwind #65020 * Account for macro invocation in `let mut $pat` diagnostic. #65123 * Ensure that associated `async fn`s have unique fresh param names #65142 * Add troubleshooting section to PGO chapter in rustc book. #65402 * Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302 * Optimize `try_expand_impl_trait_type` #65293 * use precalculated dominators in explain_borrow #65172 * Fix ICE #64964#64989 * [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273 * save-analysis: Don't ICE when resolving qualified type paths in struct members #65353 * save-analysis: Nest tables when processing impl block definitions #65511 * Avoid ICE when checking `Destination` of `break` inside a closure #65518 * Avoid ICE when adjusting bad self ty #65755 * workaround msys2 bug #65762
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
This reverts commit ef1ecbe, reversing
changes made to fc8765d.
That changed unfortunately broke rustfix on windows (rust-lang/rustfix#176).
The proper fix for this is is
#65029, but, as this is
currently in beta, we prefer to backport a reversal commit
r? @pnkfelix