From: Scott Olson Date: Fri, 1 Apr 2016 04:34:07 +0000 (-0600) Subject: Update for changes in rustc master. X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=e72d8f8dc66cc0c20af129d4c99ca4e47fdc08ea;p=rust.git Update for changes in rustc master. --- diff --git a/src/interpreter.rs b/src/interpreter.rs index 5b7b60433b1..09b380f92b7 100644 --- a/src/interpreter.rs +++ b/src/interpreter.rs @@ -1,6 +1,6 @@ use arena::TypedArena; use rustc::infer; -use rustc::middle::const_eval; +use rustc::middle::const_val; use rustc::middle::def_id::DefId; use rustc::mir::mir_map::MirMap; use rustc::mir::repr as mir; @@ -786,8 +786,8 @@ fn eval_lvalue(&mut self, lvalue: &mir::Lvalue<'tcx>) -> EvalResult { } // TODO(tsion): Try making const_to_primval instead. - fn const_to_ptr(&mut self, const_val: &const_eval::ConstVal) -> EvalResult { - use rustc::middle::const_eval::ConstVal::*; + fn const_to_ptr(&mut self, const_val: &const_val::ConstVal) -> EvalResult { + use rustc::middle::const_val::ConstVal::*; match *const_val { Float(_f) => unimplemented!(), Integral(int) => {