From 1ce05523c41d97a26cc037a5fe8b2d6a8907fbd3 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 1 Oct 2018 08:24:42 +0200
Subject: [PATCH 1/2] remove needs_drop impl

---
 rust-toolchain   |  2 +-
 src/intrinsic.rs | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index 27d32f2954..c062614a6f 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2018-09-29
+nightly-2018-10-01
diff --git a/src/intrinsic.rs b/src/intrinsic.rs
index 5ee82bf56a..53462488b6 100644
--- a/src/intrinsic.rs
+++ b/src/intrinsic.rs
@@ -272,16 +272,6 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
                 self.copy_op(args[1], ptr.into())?;
             }
 
-            "needs_drop" => {
-                let ty = substs.type_at(0);
-                let env = ty::ParamEnv::reveal_all();
-                let needs_drop = ty.needs_drop(self.tcx.tcx, env);
-                self.write_scalar(
-                    Scalar::from_bool(needs_drop),
-                    dest,
-                )?;
-            }
-
             "offset" => {
                 let offset = self.read_scalar(args[1])?.to_isize(&self)?;
                 let ptr = self.read_scalar(args[0])?.not_undef()?;

From eaff451d5e8e489ec34b161022d4b82360362465 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 1 Oct 2018 08:27:03 +0200
Subject: [PATCH 2/2] move 'cargo miri' test down so it is not the first thing
 testing start-fn

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f346b5104..414b407e92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,10 @@ script:
   xargo/build.sh &&
   export MIRI_SYSROOT=~/.xargo/HOST
 - |
-  # Test `cargo miri`
+  # run all tests with full mir
+  cargo test --release --all-features
+- |
+  # test `cargo miri`
   cd cargo-miri-test &&
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cargo miri -q -- -Zmiri-start-fn
@@ -50,12 +53,9 @@ script:
     diff -u stdout.ref stdout.real &&
     diff -u stderr.ref stderr.real
   fi &&
-  # Test `cargo miri test`
+  # test `cargo miri test`
   cargo miri test &&
   cd ..
-- |
-  # and run all tests with full mir
-  cargo test --release --all-features
 
 notifications:
   email: