mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72 from bluss/rustup

Browse Source 
rustup to rustc 1.14.0-nightly (3f4408347 2016-10-27)
This commit is contained in:
Scott Olson 2016-11-01 15:59:24 -07:00 committed by GitHub
commit c50c6e52da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interpreter/mod.rs
View File

@ -895,7 +895,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
} }
Static(def_id) => { Static(def_id) => {
let substs = subst::Substs::empty(self.tcx); let substs = self.tcx.intern_substs(&[]);
let cid = GlobalId { let cid = GlobalId {
def_id: def_id, def_id: def_id,
substs: substs, substs: substs,
@ -1655,7 +1655,7 @@ pub fn eval_main<'a, 'tcx: 'a>(
def_id, def_id,
mir.span, mir.span,
CachedMir::Ref(mir), CachedMir::Ref(mir),
subst::Substs::empty(tcx), tcx.intern_substs(&[]),
Lvalue::from_ptr(Pointer::zst_ptr()), Lvalue::from_ptr(Pointer::zst_ptr()),
StackPopCleanup::None StackPopCleanup::None
).expect("could not allocate first stack frame"); ).expect("could not allocate first stack frame");

2
src/interpreter/step.rs
View File

@ -197,7 +197,7 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'tcx> {
) { ) {
self.super_lvalue(lvalue, context, location); self.super_lvalue(lvalue, context, location);
if let mir::Lvalue::Static(def_id) = *lvalue { if let mir::Lvalue::Static(def_id) = *lvalue {
let substs = subst::Substs::empty(self.ecx.tcx); let substs = self.ecx.tcx.intern_substs(&[]);
let span = self.span; let span = self.span;
if let Some(node_item) = self.ecx.tcx.map.get_if_local(def_id) { if let Some(node_item) = self.ecx.tcx.map.get_if_local(def_id) {
if let hir::map::Node::NodeItem(&hir::Item { ref node, .. }) = node_item { if let hir::map::Node::NodeItem(&hir::Item { ref node, .. }) = node_item {