Skip to content

Commit f34e066

Browse files
committed
remove no-longer needed span from Miri Machine hook
1 parent 51b60b7 commit f34e066

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

src/librustc_mir/const_eval/machine.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
280280

281281
fn assert_panic(
282282
ecx: &mut InterpCx<'mir, 'tcx, Self>,
283-
_span: Span,
284283
msg: &AssertMessage<'tcx>,
285284
_unwind: Option<mir::BasicBlock>,
286285
) -> InterpResult<'tcx> {

src/librustc_mir/interpret/machine.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ pub trait Machine<'mir, 'tcx>: Sized {
165165
/// Called to evaluate `Assert` MIR terminators that trigger a panic.
166166
fn assert_panic(
167167
ecx: &mut InterpCx<'mir, 'tcx, Self>,
168-
span: Span,
169168
msg: &mir::AssertMessage<'tcx>,
170169
unwind: Option<mir::BasicBlock>,
171170
) -> InterpResult<'tcx>;

src/librustc_mir/interpret/terminator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
9595
if expected == cond_val {
9696
self.go_to_block(target);
9797
} else {
98-
M::assert_panic(self, terminator.source_info.span, msg, cleanup)?;
98+
M::assert_panic(self, msg, cleanup)?;
9999
}
100100
}
101101

src/librustc_mir/transform/const_prop.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine {
197197

198198
fn assert_panic(
199199
_ecx: &mut InterpCx<'mir, 'tcx, Self>,
200-
_span: Span,
201200
_msg: &rustc::mir::AssertMessage<'tcx>,
202201
_unwind: Option<rustc::mir::BasicBlock>,
203202
) -> InterpResult<'tcx> {

0 commit comments

Comments
 (0)