diff options
| author | Ralf Jung <post@ralfj.de> | 2020-03-14 12:10:00 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2020-03-14 13:09:02 +0100 |
| commit | b450e1baf4c35ad4812fba9cb1946ea20d405ad8 (patch) | |
| tree | b365505f2d6c1e7947b136ee2a8845cad7c41328 | |
| parent | b5938adb4d432bc6706f9b1f6ec0a85fc49bf11d (diff) | |
| download | rust-b450e1baf4c35ad4812fba9cb1946ea20d405ad8.tar.gz rust-b450e1baf4c35ad4812fba9cb1946ea20d405ad8.zip | |
fix comment, rustfmt
| -rw-r--r-- | src/libpanic_unwind/lib.rs | 1 | ||||
| -rw-r--r-- | src/libpanic_unwind/miri.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/eval_context.rs | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index c213b19d062..0a2a0e9e045 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -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))] diff --git a/src/libpanic_unwind/miri.rs b/src/libpanic_unwind/miri.rs index 5f44b98566f..9d92b2b2f32 100644 --- a/src/libpanic_unwind/miri.rs +++ b/src/libpanic_unwind/miri.rs @@ -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. diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index 0d43e4759f7..482c143a73e 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -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. |