Merge pull request #2 from killercup/feature/update-rustc

Update to Rust Nightly 2016-04-11

Author: solson

README.md

@@ -13,26 +13,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
 
@@ -52,3 +58,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

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};