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] Process backports #50741

Merged
merged 6 commits into from
May 15, 2018
Merged

[beta] Process backports #50741

merged 6 commits into from
May 15, 2018

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented May 14, 2018

Merged on master:

r? @alexcrichton

nox and others added 3 commits May 14, 2018 15:01
We use a new MemFlags bitflags type to merge some store code paths.
Save the index of all fields regardless of their visibility. Problems
could occur later when attempting to index fields in error recovery if
they are not inserted.
@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 14, 2018
@alexcrichton
Copy link
Member

r=me once the latter lands, thanks so much again @pietroalbini!

@pietroalbini
Copy link
Member Author

Also added #50735, which was approved for backport and is waiting to be merged.

@pietroalbini pietroalbini added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 14, 2018
@pietroalbini
Copy link
Member Author

Added #50749 (needs to be merged on master).

A high impact bug because a lot of common traits use a `Self`
substitution by default. Should be backported to beta.

There was a check for this which wasn't catching all cases, it was made
more robust.

Fixes rust-lang#49376
Fixes rust-lang#50626

r? @petrochenkov
@pietroalbini
Copy link
Member Author

Also added #50694. It's already merged on master, and it needs to be accepted (it's a small fix to a bad enough bug, so why not include it into the beta release).

@pietroalbini
Copy link
Member Author

Ok @alexcrichton, everything was merged. #50694 is not accepted yet, so if you want to accept it you can just merge the PR, otherwise I'll remove the commit.

@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented May 15, 2018

📌 Commit eee8802 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 15, 2018
@bors
Copy link
Contributor

bors commented May 15, 2018

⌛ Testing commit eee8802 with merge 84b5a46...

bors added a commit that referenced this pull request May 15, 2018
[beta] Process backports

Merged on master:

* #50648: Fix volatile_store and nontemporal_store
* #50735: rustc: don't trip an assertion for enums with present but uninhabited variants.
* #50693: typeck: Save the index of private fields
* #50748: Update stdsimd module
* #50694: Fix self referential impl Trait substitutions

r? @alexcrichton
@bors
Copy link
Contributor

bors commented May 15, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 84b5a46 to beta...

@bors bors merged commit eee8802 into rust-lang:beta May 15, 2018
@pietroalbini pietroalbini deleted the beta-backports branch May 15, 2018 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

9 participants