Skip to content

Commit d9ae028

Browse files
committed
Auto merge of #1024 - RalfJung:rustup, r=RalfJung
rustup for projection interning
2 parents 9566803 + d8a3a1f commit d9ae028

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8e0007f829661e57d008d2e908c95f6e84b04b25
1+
084edc426f2e7e4bbedb5c6afa7fc422a52ee379

src/helpers.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
55
use rustc::mir;
66
use rustc::ty::{
77
self,
8+
List,
89
layout::{self, LayoutOf, Size, TyLayout},
910
};
1011

@@ -75,7 +76,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
7576
/// Get the `Place` for a local
7677
fn local_place(&mut self, local: mir::Local) -> InterpResult<'tcx, PlaceTy<'tcx, Tag>> {
7778
let this = self.eval_context_mut();
78-
let place = mir::Place { base: mir::PlaceBase::Local(local), projection: Box::new([]) };
79+
let place = mir::Place { base: mir::PlaceBase::Local(local), projection: List::empty() };
7980
this.eval_place(&place)
8081
}
8182

0 commit comments

Comments
 (0)