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.

Sign up for GitHub

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

Jump to bottom

[beta] save-analysis: Fix ICE when processing associated constant #60806

Merged
merged 3 commits into from
May 15, 2019
Merged

[beta] save-analysis: Fix ICE when processing associated constant #60806

merged 3 commits into from
May 15, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented May 13, 2019

Beta backport of #60649.

I simply cherry-picked the 3 commits from that PR on top of the most recent beta, should I do anything else?

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ 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 13, 2019
@Centril
Copy link
Contributor

Centril commented May 13, 2019

r? @pietroalbini

@pietroalbini
Copy link
Member

@bors r+ p=-1

@bors
Copy link
Contributor

bors commented May 14, 2019

📌 Commit ae22067 has been approved by pietroalbini

@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-review Status: Awaiting review from the assignee but also interested parties. labels May 14, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request May 14, 2019
@pietroalbini
Rollup merge of rust-lang#60806 - Xanewok:beta-save-analysis-assoc-co…
c503285 
…nst-ice, r=pietroalbini
@pietroalbini pietroalbini mentioned this pull request May 14, 2019
Merged
@pietroalbini
Copy link
Member

Rolled this up in #60838.

bors added a commit that referenced this pull request May 14, 2019
@bors
Auto merge of #60838 - pietroalbini:beta-rollup, r=pietroalbini
2bafaaf 
[beta] Rollup backports

Rolled up:

* #60806: [beta] save-analysis: Fix ICE when processing associated constant

Cherry-picked:

* #60837: Update release notes for 1.35.0
* #60657: Stabilize and re-export core::array in std

r? @ghost
@Centril
Copy link
Contributor

Centril commented May 15, 2019

@bors rollup=never

@bors bors merged commit ae22067 into rust-lang:beta May 15, 2019
@bors
Copy link
Contributor

bors commented May 15, 2019

☔ The latest upstream changes (presumably #60838) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Xanewok @rust-highfive @Centril @pietroalbini @bors @zackmdavis