Skip to content

Conversation

JohnTitor
Copy link
Member

@JohnTitor JohnTitor commented Jul 30, 2020

This reverts #74557 and introduces an alternative fix while ensuring that #74954 is not broken.
The diagnostics are verbose though, it fixes three related issues.
cc #74954, #74539, and #74702

@rust-highfive
Copy link
Contributor

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2020
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 2, 2020

📌 Commit c2afce4 has been approved by petrochenkov

@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 2, 2020
@bors
Copy link
Collaborator

bors commented Aug 2, 2020

⌛ Testing commit c2afce4 with merge 19cefa6...

@bors
Copy link
Collaborator

bors commented Aug 2, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: petrochenkov
Pushing 19cefa6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 2, 2020
@bors bors merged commit 19cefa6 into rust-lang:master Aug 2, 2020
@JohnTitor JohnTitor deleted the ptn-ice branch August 2, 2020 22:53
@jakubadamw
Copy link
Contributor

@JohnTitor, @petrochenkov, uh, I am really sorry for the breakage. :( My bad!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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