mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tidy errors

Browse Source
This commit is contained in:
David Haig 2019-11-26 00:45:09 +00:00
parent 6ef625fb41
commit 4b85ee2c05
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_mir/interpret/terminator.rs
View File

@ -142,8 +142,10 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
OverflowNeg => err_panic!(OverflowNeg),
DivisionByZero => err_panic!(DivisionByZero),
RemainderByZero => err_panic!(RemainderByZero),
ResumedAfterReturn(generator_kind) => err_panic!(ResumedAfterReturn(*generator_kind)),
ResumedAfterPanic(generator_kind) => err_panic!(ResumedAfterPanic(*generator_kind)),
ResumedAfterReturn(generator_kind)
=> err_panic!(ResumedAfterReturn(*generator_kind)),
ResumedAfterPanic(generator_kind)
=> err_panic!(ResumedAfterPanic(*generator_kind)),
Panic { .. } => bug!("`Panic` variant cannot occur in MIR"),
}
.into());

8
src/librustc_mir/transform/generator.rs
View File

@ -1065,8 +1065,12 @@ fn create_generator_resume_function<'tcx>(
// Panic when resumed on the returned or poisoned state
if let Some(generator_kind) = body.generator_kind {
cases.insert(1, (RETURNED, insert_panic_block(tcx, body, ResumedAfterReturn(generator_kind))));
cases.insert(2, (POISONED, insert_panic_block(tcx, body, ResumedAfterPanic(generator_kind))));
cases.insert(1, (RETURNED, insert_panic_block(tcx,
body,
ResumedAfterReturn(generator_kind))));
cases.insert(2, (POISONED, insert_panic_block(tcx,
body,
ResumedAfterPanic(generator_kind))));
};
insert_switch(body, cases, &transform, TerminatorKind::Unreachable);