Rustup to `sty` -> `kind` changes

diff --git a/rust-version b/rust-version
index e4cfa76225a4f3d4d61fc6cd3400502329c30755..e8bca6ea63b580d343f8184190b0a3e592bddf02 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-a5bc0f0e3f0c58518c0537d82dee0fcfeb57115c
+dc45735f29788924b9fc351d100e5bf3ebdca162

diff --git a/src/helpers.rs b/src/helpers.rs
index ad30040c2ddcc4bc7c5a68c4b243d1e6825daf40..3bee028c5eb7a7148620869755f8838107c66465 100644 (file)
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -211,7 +211,7 @@ fn ecx(&self) -> &MiriEvalContext<'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,
                 };

diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
index 01ed6ec225d204c23ad03ab0e3df18d2e0b63813..5258cbb5485b4bd5ce9ced346d68873483dca5a7 100644 (file)
--- a/src/stacked_borrows.rs
+++ b/src/stacked_borrows.rs
@@ -435,7 +435,7 @@ fn new(
 
         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 @@ fn retag(
         // 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)),