about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-06-08 11:40:55 +0200
committerRalf Jung <post@ralfj.de>2019-06-08 11:40:55 +0200
commitb86c050f64b871348bdd09ee097c7b03f8538b03 (patch)
treef5bc524f39bc9372d91c6c4c583f5b26972f01c8
parent059e7c0c80413b9913eed143b4152821d8f46340 (diff)
downloadrust-b86c050f64b871348bdd09ee097c7b03f8538b03.tar.gz
rust-b86c050f64b871348bdd09ee097c7b03f8538b03.zip
fix rebase fallout
-rw-r--r--src/librustc_mir/interpret/place.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs
index 57c6f7fddc9..05642e3cad4 100644
--- a/src/librustc_mir/interpret/place.rs
+++ b/src/librustc_mir/interpret/place.rs
@@ -669,7 +669,7 @@ where
         &mut self,
         src: Immediate<M::PointerTag>,
         dest: MPlaceTy<'tcx, M::PointerTag>,
-    ) -> EvalResult<'tcx> {
+    ) -> InterpResult<'tcx> {
         self.write_immediate_to_mplace_no_validate(src, dest)?;
 
         if M::enforce_validity(self) {