Skip to content

Commit 446650c

Browse files
committed
Rename Abort terminator to Terminate
Unify terminology used in unwind action and terminator, and reflect the fact that a nounwind panic is triggered instead of an immediate abort is triggered for this terminator.
1 parent 9da329d commit 446650c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
488488
*destination,
489489
);
490490
}
491-
TerminatorKind::Abort => {
491+
TerminatorKind::Terminate => {
492492
codegen_panic_cannot_unwind(fx, source_info);
493493
}
494494
TerminatorKind::Resume => {

src/constant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
549549
TerminatorKind::Goto { .. }
550550
| TerminatorKind::SwitchInt { .. }
551551
| TerminatorKind::Resume
552-
| TerminatorKind::Abort
552+
| TerminatorKind::Terminate
553553
| TerminatorKind::Return
554554
| TerminatorKind::Unreachable
555555
| TerminatorKind::Drop { .. }

0 commit comments

Comments
 (0)