From 277a1ee86954481b711d991719c5a33d527ed83b Mon Sep 17 00:00:00 2001 From: bluss Date: Tue, 1 Nov 2016 23:26:04 +0100 Subject: [PATCH] rustup to rustc 1.14.0-nightly (3f4408347 2016-10-27) --- src/interpreter/mod.rs | 4 ++-- src/interpreter/step.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs index c7e5e12794fa..02f93900d483 100644 --- a/src/interpreter/mod.rs +++ b/src/interpreter/mod.rs @@ -895,7 +895,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { } Static(def_id) => { - let substs = subst::Substs::empty(self.tcx); + let substs = self.tcx.intern_substs(&[]); let cid = GlobalId { def_id: def_id, substs: substs, @@ -1655,7 +1655,7 @@ pub fn eval_main<'a, 'tcx: 'a>( def_id, mir.span, CachedMir::Ref(mir), - subst::Substs::empty(tcx), + tcx.intern_substs(&[]), Lvalue::from_ptr(Pointer::zst_ptr()), StackPopCleanup::None ).expect("could not allocate first stack frame"); diff --git a/src/interpreter/step.rs b/src/interpreter/step.rs index eac5494f4310..7a14a5d8da4a 100644 --- a/src/interpreter/step.rs +++ b/src/interpreter/step.rs @@ -197,7 +197,7 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'tcx> { ) { self.super_lvalue(lvalue, context, location); 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; 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 {