bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add a custom panic message for resuming gen blocks after they panicked

Browse source
This commit is contained in:
Oli Scherer 2023-10-30 10:23:57 +00:00
parent 745c600617
commit bc926f7c33
4 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/messages.ftl
View file

@ -12,6 +12,8 @@ middle_assert_coroutine_resume_after_return = coroutine resumed after completion
middle_assert_divide_by_zero =
attempt to divide `{$val}` by zero
middle_assert_gen_resume_after_panic = `gen` fn or block cannot be further iterated on after it panicked
middle_assert_misaligned_ptr_deref =
misaligned pointer dereference: address must be a multiple of {$required} but is {$found}

3
compiler/rustc_middle/src/mir/terminator.rs
View file

@ -250,8 +250,7 @@ impl<O> AssertKind<O> {
middle_assert_coroutine_resume_after_return
}
ResumedAfterPanic(CoroutineKind::Async(_)) => middle_assert_async_resume_after_panic,
// FIXME(gen_blocks): custom error message for `gen` blocks
ResumedAfterPanic(CoroutineKind::Gen(_)) => middle_assert_async_resume_after_panic,
ResumedAfterPanic(CoroutineKind::Gen(_)) => middle_assert_gen_resume_after_panic,
ResumedAfterPanic(CoroutineKind::Coroutine) => {
middle_assert_coroutine_resume_after_panic
}