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

Rename a few remaining references to abort terminator

Browse Source 
Follow up to e3f2edc75bf2becb57d7d770bba20606da1c4224
This commit is contained in:
Tomasz Miąsko 2023-10-29 00:00:00 +00:00
parent bbcc1691a4
commit 552abdce50
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_borrowck/src/type_check/mod.rs
View File

@ -1640,7 +1640,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
} }
TerminatorKind::UnwindTerminate(_) => { TerminatorKind::UnwindTerminate(_) => {
if !is_cleanup { if !is_cleanup {
span_mirbug!(self, block_data, "abort on non-cleanup block!") span_mirbug!(self, block_data, "terminate on non-cleanup block!")
} }
} }
TerminatorKind::Return => { TerminatorKind::Return => {

2
compiler/rustc_middle/src/mir/pretty.rs
View File

@ -785,7 +785,7 @@ impl<'tcx> TerminatorKind<'tcx> {
CoroutineDrop => write!(fmt, "coroutine_drop"), CoroutineDrop => write!(fmt, "coroutine_drop"),
UnwindResume => write!(fmt, "resume"), UnwindResume => write!(fmt, "resume"),
UnwindTerminate(reason) => { UnwindTerminate(reason) => {
write!(fmt, "abort({})", reason.as_short_str()) write!(fmt, "terminate({})", reason.as_short_str())
} }
Yield { value, resume_arg, .. } => write!(fmt, "{resume_arg:?} = yield({value:?})"), Yield { value, resume_arg, .. } => write!(fmt, "{resume_arg:?} = yield({value:?})"),
Unreachable => write!(fmt, "unreachable"), Unreachable => write!(fmt, "unreachable"),