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

[beta] Rollup backports #53694

Merged
merged 9 commits into from
Aug 25, 2018
Merged

[beta] Rollup backports #53694

merged 9 commits into from
Aug 25, 2018

Conversation

pietroalbini
Copy link
Member

Merged and approved:

r? @ghost

Aaron Power and others added 9 commits August 25, 2018 11:07
…en necessary.

Namely, the code here was trying to be clever, and say "lets not
report diagnostics when we 'know' NLL will report an error about them
in the future."

The problem is that in migration mode, when no error was reported here,
the NLL error that we "knew" was coming was downgraded to a warning (!).

This fixes that by only doing the "clever" skipping of region error reporting
when we are not in migration mode.

Rather than make a separate test for issue 53026, I just took the test
that uncovered this in a first place, and extended it (via our
revisions system) to explicitly show all three modes in action:
ACT-borrowck, NLL, and NLL migration mode.

(Tto be honest I hope not to have to add such revisions to many tests.
Instead I hope to adopt some sort of new `compare-mode` for either
borrowck=migrate or for the 2018 edition as a whole.)
@pietroalbini
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Aug 25, 2018

📌 Commit d1006d8 has been approved by pietroalbini

@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 Aug 25, 2018
@bors
Copy link
Contributor

bors commented Aug 25, 2018

⌛ Testing commit d1006d8 with merge 0baa114...

bors added a commit that referenced this pull request Aug 25, 2018
[beta] Rollup backports

Merged and approved:

* #53030: Updated RELEASES.md for 1.29.0
* #53594: Update RELEASES.md to include clippy-preview
* #53045: Fix NLL migration mode so that reports region errors when necessary.
* #53163: Remove an overly pedantic and wrong assertion

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing 0baa114 to beta...

@bors bors merged commit d1006d8 into rust-lang:beta Aug 25, 2018
@pietroalbini pietroalbini deleted the beta-backports branch August 25, 2018 13:00
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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.

6 participants