Skip to content

Conversation

rchaser53
Copy link
Contributor

@rchaser53 rchaser53 commented Apr 18, 2019

fix: #60049
related: PR #59798

@rust-highfive
Copy link
Contributor

r? @estebank

(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 Apr 18, 2019
@estebank
Copy link
Contributor

Please remove the merge commit and rebase on top of master

Copy link
Contributor

@estebank estebank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After rebasing r=me

@rchaser53
Copy link
Contributor Author

Sorry. I removed the merge commit and rebased on top of master.

@bors
Copy link
Collaborator

bors commented Apr 19, 2019

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

@estebank
Copy link
Contributor

@rchaser53 you'll have to rebase again :(

@rchaser53
Copy link
Contributor Author

Oh! I rebased again.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 19, 2019

📌 Commit 0ce131b has been approved by estebank

@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 Apr 19, 2019
@bors
Copy link
Collaborator

bors commented Apr 19, 2019

⌛ Testing commit 0ce131b with merge 6c22051...

bors added a commit that referenced this pull request Apr 19, 2019
avoid type-check body of DefId

fix: #60049
related: PR #59798
@bors
Copy link
Collaborator

bors commented Apr 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: estebank
Pushing 6c22051 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2019
@bors bors merged commit 0ce131b into rust-lang:master Apr 19, 2019
@rchaser53 rchaser53 deleted the issue-60049 branch April 19, 2019 10:13
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.

ICE: can't type-check body of DefId
5 participants