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

Don't double panic in futures-test::test::panic_waker::wake_panic #2236

Merged
merged 1 commit into from Oct 17, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion futures-test/src/task/panic_waker.rs
Expand Up @@ -9,7 +9,9 @@ unsafe fn clone_panic_waker(_data: *const ()) -> RawWaker {
unsafe fn noop(_data: *const ()) {}

unsafe fn wake_panic(_data: *const ()) {
panic!("should not be woken");
if ! std::thread::panicking() {
panic!("should not be woken");
}
}

const PANIC_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(
Expand Down