Skip to content

Commit 1991018

Browse files
Aaron1011oli-obk
andcommitted
Formatting improvements
Co-Authored-By: Oliver Scherer <github35764891676564198441@oli-obk.de>
1 parent 187d05f commit 1991018

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/librustc_mir/const_eval.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,8 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
474474
/// Called immediately before a stack frame gets popped.
475475
#[inline(always)]
476476
fn stack_pop(
477-
_ecx: &mut InterpCx<'mir, 'tcx, Self>, _extra: ()) -> InterpResult<'tcx, StackPopInfo> {
477+
_ecx: &mut InterpCx<'mir, 'tcx, Self>, _extra: (),
478+
) -> InterpResult<'tcx, StackPopInfo> {
478479
// Const-eval mode does not support unwinding from panics
479480
Ok(StackPopInfo::Normal)
480481
}

src/librustc_mir/interpret/eval_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
583583

584584
// If we're popping frames due to unwinding, and we didn't just exit
585585
// unwinding, we skip a bunch of validation and cleanup logic (including
586-
// jumping to the regular return block specified in the StackPopCleanu)
586+
// jumping to the regular return block specified in the StackPopCleanup)
587587
let cur_unwinding = unwinding && stack_pop_info != StackPopInfo::StopUnwinding;
588588

589589
info!("StackPopCleanup: {:?} StackPopInfo: {:?} cur_unwinding = {:?}",

src/librustc_mir/interpret/terminator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
169169
// to continue unwinding the next frame
170170
Resume => {
171171
trace!("unwinding: resuming from cleanup");
172-
// By definition, a Resume terminaor means
172+
// By definition, a Resume terminator means
173173
// that we're unwinding
174174
self.pop_stack_frame(/* unwinding */ true)?;
175175
return Ok(())

0 commit comments

Comments
 (0)