Auto merge of #1290 - RalfJung:rustup, r=RalfJung

Rustup

Also remove ICEing `breakpoint` intrinsic shim.

rust-version

@@ -1 +1 @@
-9a12971da5c08f9a95d54bdaef5cd83698ed4509
+235938d1acdd93d6641a741c81f64e415b786751

src/helpers.rs

@@ -128,7 +128,7 @@ fn test_null(&self, val: Scalar<Tag>) -> InterpResult<'tcx, Option<Scalar<Tag>>>
     fn local_place(&mut self, local: mir::Local) -> InterpResult<'tcx, PlaceTy<'tcx, Tag>> {
         let this = self.eval_context_mut();
         let place = mir::Place { local: local, projection: List::empty() };
-        this.eval_place(&place)
+        this.eval_place(place)
     }
 
     /// Generate some random bytes, and write them to `dest`.

src/shims/intrinsics.rs

@@ -217,8 +217,6 @@ fn call_intrinsic(
                 this.write_immediate(*val, place.into())?;
             }
 
-            "breakpoint" => unimplemented!(), // halt miri
-
             #[rustfmt::skip]
             | "copy"
             | "copy_nonoverlapping"