From 6abfa56b20009546be67837cc7cd92c9c13f5951 Mon Sep 17 00:00:00 2001
From: Pascal Hertleif <killercup@gmail.com>
Date: Thu, 14 Apr 2016 00:01:00 +0200
Subject: [PATCH 1/2] Update to Rust Nightly 2016-04-11

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

diff --git a/src/interpreter.rs b/src/interpreter.rs
index 850ddf8aa1..a1db521760 100644
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -1,7 +1,7 @@
 use arena::TypedArena;
 use rustc::infer;
 use rustc::middle::const_val;
-use rustc::middle::def_id::DefId;
+use rustc::hir::def_id::DefId;
 use rustc::mir::mir_map::MirMap;
 use rustc::mir::repr as mir;
 use rustc::traits::{self, ProjectionMode};

From 4b9d141e97ef040453fbd97a40839b8739126af4 Mon Sep 17 00:00:00 2001
From: Pascal Hertleif <killercup@gmail.com>
Date: Thu, 14 Apr 2016 10:21:32 +0200
Subject: [PATCH 2/2] Readme: Newer Nightly Version, Mention Rustup

---
 README.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index afe251f92a..c84d5ba203 100644
--- a/README.md
+++ b/README.md
@@ -10,26 +10,32 @@ I currently recommend that you install [multirust][multirust] and then use it to
 install the current rustc nightly version that works with Miri:
 
 ```sh
-multirust update nightly-2016-04-05
+multirust update nightly-2016-04-11
 ```
 
 ## Build
 
 ```sh
-multirust run nightly-2016-04-05 cargo build
+multirust run nightly-2016-04-11 cargo build
 ```
 
 ## Run a test
 
 ```sh
-multirust run nightly-2016-04-05 cargo run -- \
-  --sysroot $HOME/.multirust/toolchains/nightly-2016-04-05 \
+multirust run nightly-2016-04-11 cargo run -- \
+  --sysroot $HOME/.multirust/toolchains/nightly-2016-04-11 \
   test/filename.rs
 ```
 
-If you installed without using multirust, you'll need to adjust the command to
-run your cargo and set the `sysroot` to the directory where your rust compiler
-is installed (`$sysroot/bin/rustc` should be a valid path).
+If you are using [rustup][rustup] (the name of the multirust rewrite in Rust),
+the `sysroot` path will also include your build target (e.g.
+`$HOME/.multirust/toolchains/nightly-2016-04-11-x86_64-apple-darwin`). You can
+see the current toolchain's directory by running `rustup which cargo` (ignoring
+the trailing `/bin/cargo).
+
+If you installed without using multirust or rustup, you'll need to adjust the
+command to run your cargo and set the `sysroot` to the directory where your
+Rust compiler is installed (`$sysroot/bin/rustc` should be a valid path).
 
 ## License
 
@@ -49,3 +55,4 @@ additional terms or conditions.
 [mir]: https://github.com/rust-lang/rfcs/blob/master/text/1211-mir.md
 [usask]: https://www.usask.ca/
 [multirust]: https://github.com/brson/multirust
+[rustup]: https://www.rustup.rs
\ No newline at end of file