about summary refs log tree commit diff
path: root/src/librustc_const_eval
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2017-12-06 14:12:05 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2017-12-06 14:12:05 +0200
commitff6152cdc88f972f61530974b1b6fae08d9e8a7b (patch)
treebb49a347d4951ac4458ef41dde796ba6a8e4eefe /src/librustc_const_eval
parentbf5ec797255f95b7912c612942f6ece27b809d32 (diff)
downloadrust-ff6152cdc88f972f61530974b1b6fae08d9e8a7b.tar.gz
rust-ff6152cdc88f972f61530974b1b6fae08d9e8a7b.zip
miri: move param_env from Machine to EvalContext.
Diffstat (limited to 'src/librustc_const_eval')
-rw-r--r--src/librustc_const_eval/eval.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_const_eval/eval.rs b/src/librustc_const_eval/eval.rs
index d9a757f4bb1..a9f20828244 100644
--- a/src/librustc_const_eval/eval.rs
+++ b/src/librustc_const_eval/eval.rs
@@ -24,7 +24,7 @@ use rustc::util::common::ErrorReported;
 use rustc::util::nodemap::NodeMap;
 
 use rustc::mir::interpret::{PrimVal, Value, PtrAndAlign, HasMemory, EvalError};
-use rustc::mir::interpret::{CompileTimeFunctionEvaluator, EvalContext, Machine};
+use rustc::mir::interpret::{CompileTimeFunctionEvaluator, EvalContext};
 use rustc::mir::Field;
 use rustc::mir::interpret::{Place, PlaceExtra};
 use rustc_data_structures::indexed_vec::Idx;
@@ -937,7 +937,7 @@ fn check_ctfe_against_miri<'a, 'tcx>(
                 ConstVal::Function(did, substs) => {
                     let ctfe = ty::Instance::resolve(
                         ecx.tcx,
-                        CompileTimeFunctionEvaluator::param_env(&ecx),
+                        ecx.param_env,
                         did,
                         substs,
                     ).unwrap();