Merge pull request #156 from oli-obk/master

Use rustc generated shims instead of interpreter hacks

Author: eddyb

.travis.yml

@@ -2,18 +2,16 @@ language: rust
 rust:
 - nightly
 before_script:
-- |
-  pip install 'travis-cargo<0.2' --user &&
-  export PATH=$HOME/.local/bin:$PATH
-- sh ~/rust-installer/rustup.sh --add-target=i686-unknown-linux-gnu --prefix=/home/travis/rust -y --disable-sudo
-- sh ~/rust-installer/rustup.sh --add-target=i686-pc-windows-gnu --prefix=/home/travis/rust -y --disable-sudo
-- sh ~/rust-installer/rustup.sh --add-target=i686-pc-windows-msvc --prefix=/home/travis/rust -y --disable-sudo
+- export PATH=$HOME/.local/bin:$PATH
+- rustup target add i686-unknown-linux-gnu
+- rustup target add i686-pc-windows-gnu
+- rustup target add i686-pc-windows-msvc
 script:
 - |
   export RUST_SYSROOT=$HOME/rust &&
-  travis-cargo build &&
-  travis-cargo test &&
-  travis-cargo install &&
+  cargo build &&
+  cargo test &&
+  cargo install &&
   cd cargo-miri-test &&
   cargo miri &&
   cargo miri test &&

Cargo.lock

@@ -2,7 +2,7 @@ use std::error::Error;
 use std::fmt;
 use rustc::mir;
 use rustc::ty::{FnSig, Ty, layout};
-use memory::{Pointer, Function};
+use memory::Pointer;
 use rustc_const_math::ConstMathErr;
 use syntax::codemap::Span;
 
@@ -52,9 +52,6 @@ pub enum EvalError<'tcx> {
     DeallocatedStaticMemory,
     Layout(layout::LayoutError<'tcx>),
     Unreachable,
-    ExpectedConcreteFunction(Function<'tcx>),
-    ExpectedDropGlue(Function<'tcx>),
-    ManuallyCalledDropGlue,
     Panic,
 }
 
@@ -128,12 +125,6 @@ impl<'tcx> Error for EvalError<'tcx> {
                 "attempted to get length of a null terminated string, but no null found before end of allocation",
             EvalError::Unreachable =>
                 "entered unreachable code",
-            EvalError::ExpectedConcreteFunction(_) =>
-                "tried to use glue function as function",
-            EvalError::ExpectedDropGlue(_) =>
-                "tried to use non-drop-glue function as drop glue",
-            EvalError::ManuallyCalledDropGlue =>
-                "tried to manually invoke drop glue",
             EvalError::Panic =>
                 "the evaluated program panicked",
         }