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

Delay panic from incoherent drop implementation #47104

Merged
merged 1 commit into from
Jan 3, 2018
Merged

Delay panic from incoherent drop implementation #47104

merged 1 commit into from
Jan 3, 2018

Conversation

matthewjasper
Copy link
Contributor

Closes #41974

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@estebank
Copy link
Contributor

estebank commented Jan 2, 2018

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 2, 2018

📌 Commit 31a4cba has been approved by estebank

@bors
Copy link
Contributor

bors commented Jan 2, 2018

⌛ Testing commit 31a4cba with merge 73b70d11830e0138e9382d64fb3595ae8033b568...

@bors
Copy link
Contributor

bors commented Jan 2, 2018

💔 Test failed - status-travis

@estebank
Copy link
Contributor

estebank commented Jan 2, 2018

@bors retry

kennytm added a commit to kennytm/rust that referenced this pull request Jan 3, 2018
@kennytm
Rollup merge of rust-lang#47104 - matthewjasper:dont-panic-on-generic…
f7932ef 
…-drop, r=estebank

Delay panic from incoherent drop implementation

Closes rust-lang#41974
@kennytm kennytm mentioned this pull request Jan 3, 2018
Merged
bors added a commit that referenced this pull request Jan 3, 2018
@bors
Auto merge of #47151 - kennytm:rollup, r=kennytm
b107f72 
Rollup of 9 pull requests

- Successful merges: #47104, #47107, #47113, #47117, #47118, #47121, #47125, #47134, #47145
- Failed merges:
@bors
Copy link
Contributor

bors commented Jan 3, 2018

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

@bors bors merged commit 31a4cba into rust-lang:master Jan 3, 2018
@matthewjasper matthewjasper deleted the dont-panic-on-generic-drop branch January 3, 2018 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@matthewjasper @rust-highfive @estebank @bors @nikomatsakis