From faf974b2e626c28c03a2dc9368a7df486cfd04b8 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 16 Nov 2018 17:20:00 +0100
Subject: [PATCH] Rustup to rustc 1.32.0-nightly (6b9b97bd9 2018-11-15)

---
 src/base.rs     | 3 ++-
 src/constant.rs | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/base.rs b/src/base.rs
index 40955f2cd3d0..b40c38390037 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -648,7 +648,8 @@ fn trans_stmt<'a, 'tcx: 'a>(
         | StatementKind::FakeRead(..)
         | StatementKind::EndRegion(_)
         | StatementKind::Retag { .. }
-        | StatementKind::AscribeUserType(..) => {}
+        | StatementKind::AscribeUserType(..)
+        | StatementKind::EscapeToRaw(..) => {}
 
         StatementKind::InlineAsm { .. } => unimpl!("Inline assembly is not supported"),
     }
diff --git a/src/constant.rs b/src/constant.rs
index 0fc1b52b2f2d..984dbf5e0f4c 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -283,7 +283,6 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter {
     type AllocExtra = ();
     type MemoryMap = FxHashMap<AllocId, (MemoryKind<!>, Allocation<()>)>;
     const STATIC_KIND: Option<!> = None;
-    const ENABLE_PTR_TRACKING_HOOKS: bool = false;
 
     fn enforce_validity(_: &EvalContext<'a, 'mir, 'tcx, Self>) -> bool {
         false
@@ -334,14 +333,6 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter {
         panic!();
     }
 
-    fn tag_reference(
-        _: &mut EvalContext<'a, 'mir, 'tcx, Self>,
-        _: MPlaceTy<'tcx>,
-        _: Option<::rustc::hir::Mutability>,
-    ) -> EvalResult<'tcx, Scalar> {
-        panic!()
-    }
-
     fn tag_dereference(
         _: &EvalContext<'a, 'mir, 'tcx, Self>,
         _: MPlaceTy<'tcx>,