Skip to content

Commit

Permalink
fix comment, rustfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Mar 14, 2020
1 parent b5938ad commit b450e1b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/libpanic_unwind/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#![feature(raw)]
#![panic_runtime]
#![feature(panic_runtime)]

// `real_imp` is unused with Miri, so silence warnings.
#![cfg_attr(miri, allow(dead_code))]

Expand Down
2 changes: 1 addition & 1 deletion src/libpanic_unwind/miri.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Unwinding panics for Miri.
use core::any::Any;
use alloc::boxed::Box;
use core::any::Any;

// The type of the payload that the Miri engine propagates through unwinding for us.
// Must be pointer-sized.
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_mir/interpret/eval_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {

if M::stack_pop(self, frame.extra, unwinding)? == StackPopJump::NoJump {
// The hook already did everything.
// We want to skip the `trace!` below, hence early return.
// We want to skip the `info!` below, hence early return.
return Ok(());
}
// Normal return.
Expand Down

0 comments on commit b450e1b

Please sign in to comment.