Skip to content

Conversation

JohnTitor
Copy link
Member

Fixes #63226

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 15, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Aug 15, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 15, 2019

📌 Commit 7adb20e has been approved by oli-obk

@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 Aug 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
bors added a commit that referenced this pull request Aug 15, 2019
Rollup of 9 pull requests Successful merges: - #63155 (Add UWP MSVC targets) - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64) - #63306 (Adapt AddRetag for shallow retagging) - #63467 (Add Catalyst (iOS apps running on macOS) target) - #63546 (Remove uses of `mem::uninitialized()` from cloudabi) - #63572 (remove unused Level::PhaseFatal) - #63577 (Test HRTB issue accepted by compiler) - #63582 (Fix ICE #63226) - #63586 (cleanup: Remove `Spanned` where possible) Failed merges: r? @ghost
@bors bors merged commit 7adb20e into rust-lang:master Aug 15, 2019
@bors
Copy link
Collaborator

bors commented Aug 15, 2019

☔ The latest upstream changes (presumably #63592) 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 Aug 15, 2019
@JohnTitor JohnTitor deleted the fix-ice-63226 branch August 15, 2019 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

5 participants