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

avoid type-check body of DefId #60073

Merged
merged 1 commit into from
Apr 19, 2019
Merged

avoid type-check body of DefId #60073

merged 1 commit into from
Apr 19, 2019

Conversation

rchaser53
Copy link
Contributor

@rchaser53 rchaser53 commented Apr 18, 2019 •
edited by pnkfelix
Loading

fix: #60049
related: PR #59798

@rust-highfive
Copy link
Collaborator

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
@rchaser53 rchaser53 mentioned this pull request Apr 18, 2019
Closed
@estebank
Copy link
Contributor

Please remove the merge commit and rebase on top of master

estebank
estebank approved these changes Apr 18, 2019
View reviewed changes
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
Contributor

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
Contributor

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
Contributor

bors commented Apr 19, 2019

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

bors added a commit that referenced this pull request Apr 19, 2019
@bors
Auto merge of #60073 - rchaser53:issue-60049, r=estebank
6c22051 
avoid type-check body of DefId

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

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
@hellow554 hellow554 mentioned this pull request Jul 5, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hellow554 hellow554 hellow554 left review comments

@estebank estebank estebank approved these changes

Assignees

@estebank estebank

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ICE: can't type-check body of DefId
5 participants
@rchaser53 @rust-highfive @estebank @bors @hellow554