Auto merge of #963 - rust-lang:rustup, r=RalfJung

Update to latest nightly

Author: bors

.travis.yml

@@ -33,12 +33,15 @@ before_script:
 # Install Rust ("stable" toolchain for better caching, it is just used to build rustup-toolchain-install-master)
 - curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain stable
 - export PATH=$HOME/.cargo/bin:$PATH
+- rustup default stable
+- rustup uninstall beta
 - rustup update
 # Install "master" toolchain
 - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
 - travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src
 - rustup default master
 - rustc --version
+- cargo --version
 
 script:
 - ./travis.sh

Cargo.toml

@@ -59,5 +59,5 @@ cargo_miri = ["cargo_metadata", "directories", "rustc_version"]
 rustc_tests = []
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3.22", features = ["tmp", "stable"] }
+compiletest_rs = { version = "0.3.23", features = ["tmp"] }
 colored = "1.6"

rust-version

@@ -1 +1 @@
-ea3ba36f3f4b7f0168a27d23c499efeb2304e2d5
+dc45735f29788924b9fc351d100e5bf3ebdca162

src/helpers.rs

@@ -211,7 +211,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             fn visit_value(&mut self, v: MPlaceTy<'tcx, Tag>) -> InterpResult<'tcx>
             {
                 trace!("UnsafeCellVisitor: {:?} {:?}", *v, v.layout.ty);
-                let is_unsafe_cell = match v.layout.ty.sty {
+                let is_unsafe_cell = match v.layout.ty.kind {
                     ty::Adt(adt, _) => Some(adt.did) == self.ecx.tcx.lang_items().unsafe_cell_type(),
                     _ => false,
                 };

src/stacked_borrows.rs

@@ -435,7 +435,7 @@ impl<'tcx> Stacks {
 
         Stacks {
             stacks: RefCell::new(RangeMap::new(size, stack)),
-            global: extra, 
+            global: extra,
         }
     }
 
@@ -460,7 +460,7 @@ impl Stacks {
     pub fn new_allocation(
         id: AllocId,
         size: Size,
-        extra: MemoryExtra, 
+        extra: MemoryExtra,
         kind: MemoryKind<MiriMemoryKind>,
     ) -> (Self, Tag) {
         let (tag, perm) = match kind {
@@ -616,7 +616,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         // Cannot use `builtin_deref` because that reports *immutable* for `Box`,
         // making it useless.
         fn qualify(ty: ty::Ty<'_>, kind: RetagKind) -> Option<(RefKind, bool)> {
-            match ty.sty {
+            match ty.kind {
                 // References are simple.
                 ty::Ref(_, _, MutMutable) =>
                     Some((RefKind::Unique { two_phase: kind == RetagKind::TwoPhase}, kind == RetagKind::FnEntry)),