Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #71636

Merged
merged 12 commits into from
Apr 28, 2020
Merged

Rollup of 5 pull requests #71636

merged 12 commits into from
Apr 28, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

estebank and others added 12 commits April 18, 2020 20:51
delay_span_bug bumps error_count after checking treat_err_as_bug
Co-Authored-By: varkor <github@varkor.com>
…ipping, r=estebank"

This reverts commit 46a8dce, reversing
changes made to f28e387.
On `FnDef` type annotation suggestion, use fn-pointer output

Address the last point in rust-lang#71209.
…en-mir, r=eddyb

normalize field projection ty to fix broken MIR issue

Fixes rust-lang#71344

r? @eddyb
…dling, r=eddyb

Fix off by one in treat err as bug

`-Ztreat-err-as-bug` doesn't work properly with delay_span_bug.

r? @eddyb
remove obsolete comment

Not sure if it's better to have an outdated comment or no comment at all (made obsolete by 2b9fea1).
Revert rust-lang#71372 ("Fix #! (shebang) stripping account space issue").

While rust-lang#71372 fixed some of the problems `#!`-stripping had, it introduced others:
* inefficient implementation (`.chars().filter(...).collect()` on the entire input file)
  * this also means the length returned isn't always correct, leading to e.g. rust-lang#71471
* it ignores whitespace anywhere, stripping ` # ! ...` which isn't a valid shebang
  * the definition of "whitespace" it uses includes newlines, which means even `\n#\n!\n...` is stripped as a shebang (and anything matching the regex `\s*#\s*!\s*`, and not followed by `[`, really)
* it's backward-incompatible but didn't go through Crater

Now, rust-lang#71487 is already open and will solve all of these issues. But for running Crater, and just in case rust-lang#71487 takes a bit longer, I decided it's safer to just revert rust-lang#71372.

This will also make rust-lang#71372's diff clearer, as it will start again from the original whitespace-unaware version.

r? @petrochenkov
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 28, 2020

📌 Commit 6cad1e3 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 28, 2020
@bors
Copy link
Contributor

bors commented Apr 28, 2020

⌛ Testing commit 6cad1e3 with merge b7bd7c1...

@bors
Copy link
Contributor

bors commented Apr 28, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing b7bd7c1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 28, 2020
@bors bors merged commit b7bd7c1 into rust-lang:master Apr 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants