Skip to content

Commit 9fdb347

Browse files
committed
Rustup to sty -> kind changes
1 parent 20b10cc commit 9fdb347

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a5bc0f0e3f0c58518c0537d82dee0fcfeb57115c
1+
dc45735f29788924b9fc351d100e5bf3ebdca162

src/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
211211
fn visit_value(&mut self, v: MPlaceTy<'tcx, Tag>) -> InterpResult<'tcx>
212212
{
213213
trace!("UnsafeCellVisitor: {:?} {:?}", *v, v.layout.ty);
214-
let is_unsafe_cell = match v.layout.ty.sty {
214+
let is_unsafe_cell = match v.layout.ty.kind {
215215
ty::Adt(adt, _) => Some(adt.did) == self.ecx.tcx.lang_items().unsafe_cell_type(),
216216
_ => false,
217217
};

src/stacked_borrows.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ impl<'tcx> Stacks {
435435

436436
Stacks {
437437
stacks: RefCell::new(RangeMap::new(size, stack)),
438-
global: extra,
438+
global: extra,
439439
}
440440
}
441441

@@ -460,7 +460,7 @@ impl Stacks {
460460
pub fn new_allocation(
461461
id: AllocId,
462462
size: Size,
463-
extra: MemoryExtra,
463+
extra: MemoryExtra,
464464
kind: MemoryKind<MiriMemoryKind>,
465465
) -> (Self, Tag) {
466466
let (tag, perm) = match kind {
@@ -616,7 +616,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
616616
// Cannot use `builtin_deref` because that reports *immutable* for `Box`,
617617
// making it useless.
618618
fn qualify(ty: ty::Ty<'_>, kind: RetagKind) -> Option<(RefKind, bool)> {
619-
match ty.sty {
619+
match ty.kind {
620620
// References are simple.
621621
ty::Ref(_, _, MutMutable) =>
622622
Some((RefKind::Unique { two_phase: kind == RetagKind::TwoPhase}, kind == RetagKind::FnEntry)),

0 commit comments

Comments
 (0)