diff options
| author | Ralf Jung <post@ralfj.de> | 2020-03-09 19:58:58 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2020-03-09 19:58:58 +0100 |
| commit | f34e0664a1fa63f89f2257dba7d0d13445f58c02 (patch) | |
| tree | 623391f4d2db895a1d1b60bdd82481f0cae4c436 | |
| parent | 51b60b75e79e39dcbb1fa96d72f4cbb82df7f2ae (diff) | |
| download | rust-f34e0664a1fa63f89f2257dba7d0d13445f58c02.tar.gz rust-f34e0664a1fa63f89f2257dba7d0d13445f58c02.zip | |
remove no-longer needed span from Miri Machine hook
| -rw-r--r-- | src/librustc_mir/const_eval/machine.rs | 1 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/machine.rs | 1 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/terminator.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/transform/const_prop.rs | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc_mir/const_eval/machine.rs b/src/librustc_mir/const_eval/machine.rs index ed802983468..bb661d3d2a3 100644 --- a/src/librustc_mir/const_eval/machine.rs +++ b/src/librustc_mir/const_eval/machine.rs @@ -280,7 +280,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, fn assert_panic( ecx: &mut InterpCx<'mir, 'tcx, Self>, - _span: Span, msg: &AssertMessage<'tcx>, _unwind: Option<mir::BasicBlock>, ) -> InterpResult<'tcx> { diff --git a/src/librustc_mir/interpret/machine.rs b/src/librustc_mir/interpret/machine.rs index 6615cc608fb..087517ff4e3 100644 --- a/src/librustc_mir/interpret/machine.rs +++ b/src/librustc_mir/interpret/machine.rs @@ -165,7 +165,6 @@ pub trait Machine<'mir, 'tcx>: Sized { /// Called to evaluate `Assert` MIR terminators that trigger a panic. fn assert_panic( ecx: &mut InterpCx<'mir, 'tcx, Self>, - span: Span, msg: &mir::AssertMessage<'tcx>, unwind: Option<mir::BasicBlock>, ) -> InterpResult<'tcx>; diff --git a/src/librustc_mir/interpret/terminator.rs b/src/librustc_mir/interpret/terminator.rs index ea8378574a3..b5c34daf8a3 100644 --- a/src/librustc_mir/interpret/terminator.rs +++ b/src/librustc_mir/interpret/terminator.rs @@ -95,7 +95,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { if expected == cond_val { self.go_to_block(target); } else { - M::assert_panic(self, terminator.source_info.span, msg, cleanup)?; + M::assert_panic(self, msg, cleanup)?; } } diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs index 0560f77f5c9..4c353d1ae22 100644 --- a/src/librustc_mir/transform/const_prop.rs +++ b/src/librustc_mir/transform/const_prop.rs @@ -197,7 +197,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine { fn assert_panic( _ecx: &mut InterpCx<'mir, 'tcx, Self>, - _span: Span, _msg: &rustc::mir::AssertMessage<'tcx>, _unwind: Option<rustc::mir::BasicBlock>, ) -> InterpResult<'tcx> { |