Skip to content

Commit 59f9c95

Browse files
committed
give some unwind-related terminators a more clear name
1 parent 4ddc6a7 commit 59f9c95

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

crates/hir-ty/src/mir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ impl MirBody {
10571057
TerminatorKind::FalseEdge { .. }
10581058
| TerminatorKind::FalseUnwind { .. }
10591059
| TerminatorKind::Goto { .. }
1060-
| TerminatorKind::Resume
1060+
| TerminatorKind::UnwindResume
10611061
| TerminatorKind::GeneratorDrop
10621062
| TerminatorKind::Abort
10631063
| TerminatorKind::Return

crates/hir-ty/src/mir/borrowck.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn moved_out_of_ref(db: &dyn HirDatabase, body: &MirBody) -> Vec<MovedOutOfRef>
160160
TerminatorKind::FalseEdge { .. }
161161
| TerminatorKind::FalseUnwind { .. }
162162
| TerminatorKind::Goto { .. }
163-
| TerminatorKind::Resume
163+
| TerminatorKind::UnwindResume
164164
| TerminatorKind::GeneratorDrop
165165
| TerminatorKind::Abort
166166
| TerminatorKind::Return
@@ -280,7 +280,7 @@ fn ever_initialized_map(
280280
let targets = match &terminator.kind {
281281
TerminatorKind::Goto { target } => vec![*target],
282282
TerminatorKind::SwitchInt { targets, .. } => targets.all_targets().to_vec(),
283-
TerminatorKind::Resume
283+
TerminatorKind::UnwindResume
284284
| TerminatorKind::Abort
285285
| TerminatorKind::Return
286286
| TerminatorKind::Unreachable => vec![],
@@ -371,7 +371,7 @@ fn mutability_of_locals(
371371
};
372372
match &terminator.kind {
373373
TerminatorKind::Goto { .. }
374-
| TerminatorKind::Resume
374+
| TerminatorKind::UnwindResume
375375
| TerminatorKind::Abort
376376
| TerminatorKind::Return
377377
| TerminatorKind::Unreachable

crates/hir-ty/src/mir/monomorphization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ impl Filler<'_> {
265265
self.fill_operand(discr)?;
266266
}
267267
TerminatorKind::Goto { .. }
268-
| TerminatorKind::Resume
268+
| TerminatorKind::UnwindResume
269269
| TerminatorKind::Abort
270270
| TerminatorKind::Return
271271
| TerminatorKind::Unreachable

0 commit comments

Comments
 (0)