Revert #71372 ("Fix #! (shebang) stripping account space issue").#71634
Merged
bors merged 1 commit intorust-lang:masterfrom Apr 28, 2020
Merged
Revert #71372 ("Fix #! (shebang) stripping account space issue").#71634bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
rust-highfive
added
the
S-waiting-on-review
Contributor
|
@bors r+ rollup |
Collaborator
|
📌 Commit 4d67c8d has been approved by |
bors
added
S-waiting-on-bors
Contributor
|
Did #71372 go into beta, btw? |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2020
Rollup of 5 pull requests Successful merges: - rust-lang#71311 (On `FnDef` type annotation suggestion, use fn-pointer output) - rust-lang#71488 (normalize field projection ty to fix broken MIR issue) - rust-lang#71489 (Fix off by one in treat err as bug) - rust-lang#71585 (remove obsolete comment) - rust-lang#71634 (Revert rust-lang#71372 ("Fix #! (shebang) stripping account space issue").) Failed merges: r? @ghost
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.
While #71372 fixed some of the problems
#!-stripping had, it introduced others:.chars().filter(...).collect()on the entire input file)# ! ...which isn't a valid shebang\n#\n!\n...is stripped as a shebang (and anything matching the regex\s*#\s*!\s*, and not followed by[, really)Now, #71487 is already open and will solve all of these issues. But for running Crater, and just in case #71487 takes a bit longer, I decided it's safer to just revert #71372.
This will also make #71372's diff clearer, as it will start again from the original whitespace-unaware version.
r? @petrochenkov