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

Do not ICE #67123 #67149

Merged
merged 1 commit into from
Dec 10, 2019
Merged

Do not ICE #67123 #67149

merged 1 commit into from
Dec 10, 2019

Conversation

JohnTitor
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 8, 2019
@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 8, 2019

📌 Commit 8e5d4286fc5d88f0088c4f5c8553f4ae42e17df6 has been approved by matthewjasper

@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 Dec 8, 2019
@bors
Copy link
Contributor

bors commented Dec 9, 2019

☔ The latest upstream changes (presumably #67004) 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 Dec 9, 2019
@Dylan-DPC-zz
Copy link

@bors r+

@bors
Copy link
Contributor

bors commented Dec 9, 2019

📌 Commit b879ecc has been approved by Dylan-DPC

@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 Dec 9, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Dec 9, 2019
@tmandry
Rollup merge of rust-lang#67149 - JohnTitor:fix-ice-1, r=Dylan-DPC
c2702e3 
Do not ICE rust-lang#67123

Fixes rust-lang#67123

r? @matthewjasper
@tmandry tmandry mentioned this pull request Dec 9, 2019
Merged
bors added a commit that referenced this pull request Dec 10, 2019
@bors
Auto merge of #67184 - tmandry:rollup-mzqxtck, r=tmandry
975e83a 
Rollup of 11 pull requests

Successful merges:

 - #66892 (Format libcore with rustfmt (including tests and benches))
 - #67106 (resolve: Resolve visibilities on fields with non-builtin attributes)
 - #67113 (Print the visibility in `print_variant`.)
 - #67115 (Simplify `check_decl_no_pat`.)
 - #67119 (libstd miri tests: avoid warnings)
 - #67125 (Added ExactSizeIterator bound to return types)
 - #67138 (Simplify `Layout::extend_packed`)
 - #67145 (fix miri step debug printing)
 - #67149 (Do not ICE #67123)
 - #67155 (Move `Layout`s instead of binding by reference)
 - #67169 (inline some common methods on OsStr)

Failed merges:

r? @ghost
@bors bors merged commit b879ecc into rust-lang:master Dec 10, 2019
@JohnTitor JohnTitor deleted the fix-ice-1 branch December 10, 2019 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@matthewjasper matthewjasper

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ICE on rustc 1.41.0-nightly (ae1b871cc 2019-12-06) running on x86_64-pc-windows-msvc
5 participants
@JohnTitor @matthewjasper @bors @Dylan-DPC-zz @rust-highfive