From 130f9488d3b861e02c9282b686eec717e30912cf Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 17 Sep 2019 12:30:14 +0200
Subject: [PATCH 1/2] rustup

---
 src/machine.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/machine.rs b/src/machine.rs
index 95cb31d67b..340dd109e1 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -287,7 +287,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
             (Some(stacks), base_tag)
         };
         let mut stacked_borrows = memory_extra.stacked_borrows.borrow_mut();
-        let alloc: Allocation<Tag, Self::AllocExtra> = alloc.retag(
+        let alloc: Allocation<Tag, Self::AllocExtra> = alloc.with_tags_and_extra(
             |alloc| if !memory_extra.validate {
                 Tag::Untagged
             } else {

From d610d9de9092d3607f68bb98bee671ca08edc3ca Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 18 Sep 2019 11:22:28 +0200
Subject: [PATCH 2/2] bump Rust version

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index 464b061edb..5081720aed 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-a44881d892fb4f4a8ed93f8f392bab942fac7a41
+64c09694a6ecc434cd3a61ade89beb1de17770c5