Fix after recent refactorings

Author: varkor

src/librustc/infer/freshen.rs

@@ -141,7 +141,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
                     ty::FreshTy)
             }
 
-            ty::TyInfer(ty::IntVar(v)) => {
+            ty::Infer(ty::IntVar(v)) => {
                 self.freshen(
                     self.infcx.int_unification_table.borrow_mut()
                                                     .probe_value(v)

src/librustc/mir/interpret/value.rs

@@ -1,5 +1,6 @@
 #![allow(unknown_lints)]
 
+use ty;
 use ty::layout::{HasDataLayout, Size};
 use ty::subst::Substs;
 use hir::def_id::DefId;

src/librustc_mir/interpret/operand.rs

@@ -470,7 +470,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> {
 
     // Also used e.g. when miri runs into a constant.
     // Unfortunately, this needs an `&mut` to be able to allocate a copy of a `ByRef`
-    // constant.  This bleeds up to `eval_operand` needing `&mut`.
+    // constant. This bleeds up to `eval_operand` needing `&mut`.
     pub fn const_value_to_op(
         &mut self,
         val: ConstValue<'tcx>,
@@ -483,6 +483,8 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> {
                     promoted: None,
                 })
             }
+            ConstValue::Param(_) => bug!(),
+            ConstValue::Infer(_) => bug!(),
             ConstValue::ByRef(alloc, offset) => {
                 // FIXME: Allocate new AllocId for all constants inside
                 let id = self.memory.allocate_value(alloc.clone(), MemoryKind::Stack)?;