Update for changes in rustc.

Author: solson

src/interpreter/mod.rs

@@ -688,7 +688,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
 
         // Handle the field index for the outer non-null variant.
         let inner_ty = match ty.sty {
-            ty::TyEnum(adt_def, substs) => {
+            ty::TyAdt(adt_def, substs) => {
                 let variant = &adt_def.variants[nndiscr as usize];
                 let index = path.next().unwrap();
                 let field = &variant.fields[index];
@@ -715,7 +715,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
 
     fn get_field_ty(&self, ty: Ty<'tcx>, field_index: usize) -> EvalResult<'tcx, Ty<'tcx>> {
         match ty.sty {
-            ty::TyStruct(adt_def, substs) => {
+            ty::TyAdt(adt_def, substs) => {
                 Ok(adt_def.struct_variant().fields[field_index].ty(self.tcx, substs))
             }
 
@@ -953,7 +953,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                 }
             }
 
-            (_, &ty::TyEnum(..)) => {
+            (_, &ty::TyAdt(..)) => {
                 use rustc::ty::layout::Layout::*;
                 if let CEnum { discr, signed, .. } = *self.type_layout(ty) {
                     match (discr.size().bytes(), signed) {

src/interpreter/vtable.rs

@@ -51,15 +51,15 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                         abi: closure_type.abi,
                         sig: closure_type.sig,
                     };
-                    let fn_ty = self.tcx.mk_bare_fn(fn_ty);
+                    let _fn_ty = self.tcx.mk_bare_fn(fn_ty);
                     unimplemented!()
                     //vec![Some(self.memory.create_fn_ptr(closure_def_id, substs.func_substs, fn_ty))].into_iter()
                 }
                 traits::VtableFnPointer(
                     traits::VtableFnPointerData {
-                        fn_ty: bare_fn_ty,
+                        fn_ty: _bare_fn_ty,
                         nested: _ }) => {
-                    let trait_closure_kind = tcx.lang_items.fn_trait_kind(trait_ref.def_id()).unwrap();
+                    let _trait_closure_kind = tcx.lang_items.fn_trait_kind(trait_ref.def_id()).unwrap();
                     //vec![trans_fn_pointer_shim(ccx, trait_closure_kind, bare_fn_ty)].into_iter()
                     unimplemented!()
                 }