From a1dd460714f05610a5bb9ccbfd5d69cc1478e3f5 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 4 Aug 2019 13:42:40 +0200
Subject: [PATCH] Rustup to rustc 1.38.0-nightly (6e0d27d93 2019-08-03)

---
 src/constant.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/constant.rs b/src/constant.rs
index b8f7d039855..c8428d8d634 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -5,7 +5,7 @@ use rustc::mir::interpret::{
 };
 use rustc::ty::{Const, layout::Align};
 use rustc_mir::interpret::{
-    InterpCx, ImmTy, Machine, Memory, MemoryKind, OpTy, PlaceTy,
+    InterpCx, ImmTy, Machine, Memory, MemoryKind, OpTy, PlaceTy, Pointer,
     StackPopCleanup,
 };
 
@@ -378,7 +378,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
         panic!();
     }
 
-    fn ptr_op(
+    fn binary_ptr_op(
         _: &InterpCx<'mir, 'tcx, Self>,
         _: mir::BinOp,
         _: ImmTy<'tcx>,
@@ -387,6 +387,13 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
         panic!();
     }
 
+    fn ptr_to_int(
+        _: &Memory<'mir, 'tcx, Self>,
+        _: Pointer<()>,
+    ) -> InterpResult<'tcx, u64> {
+        panic!();
+    }
+
     fn box_alloc(_: &mut InterpCx<'mir, 'tcx, Self>, _: PlaceTy<'tcx>) -> InterpResult<'tcx> {
         panic!();
     }