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.

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

Do not merge zombie and non-zombies #288

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Do not merge zombie and non-zombies #288

merged 1 commit into from
Nov 30, 2020

Conversation

khyperia
Copy link
Contributor

Fixes #274

Tried to do a clever with refactoring the whole zombie system to be much cooler and failed, so, this is just the simple patch onto the current system.

The test case would likely be fine with #287 in, but oh well, #[ignore] it is. Heck, 287 could revert its change to result.1.def(self) if this was in. What a race condition, wau!


... also the changes to import_export_link.rs are completely unrelated, sorry, just got annoyed by poor error messages when debugging my failed refactor.

@khyperia khyperia requested a review from VZout November 30, 2020 15:01
@eddyb eddyb self-requested a review November 30, 2020 15:05
@khyperia khyperia removed the request for review from VZout November 30, 2020 15:07
@khyperia khyperia mentioned this pull request Nov 30, 2020
4 tasks
@mergify mergify bot merged commit 114d029 into main Nov 30, 2020
@mergify mergify bot deleted the zombie-antimerge branch November 30, 2020 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zombie constants/types are merged with normal constants/types
2 participants