From 7e198147df98fa09b09bb1f878a4989754915106 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 31 Dec 2020 00:17:08 +0100
Subject: [PATCH] panicing now works with -Zmiri-track-raw-pointers

---
 rust-version                                  |  2 +-
 test-cargo-miri/run-test.py                   |  4 ++--
 test-cargo-miri/test.raw-ptr-track.stdout.ref | 10 ----------
 tests/run-pass/dyn-lcsit.rs                   |  2 +-
 tests/run-pass/intrinsics.rs                  |  2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 test-cargo-miri/test.raw-ptr-track.stdout.ref

diff --git a/rust-version b/rust-version
index e261b13e8183..9d755c730934 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-158f8d034b15e65ba8dc0d066358dd0632bfcd6e
+507bff92fadf1f25a830da5065a5a87113345163
diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py
index 8eeafc4ed674..60924d4f8ddc 100755
--- a/test-cargo-miri/run-test.py
+++ b/test-cargo-miri/run-test.py
@@ -84,8 +84,8 @@ def test_cargo_miri_test():
         env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
     )
     test("`cargo miri test` (raw-ptr tracking)",
-        cargo_miri("test") + ["--", "-Zunstable-options", "--exclude-should-panic"],
-        "test.raw-ptr-track.stdout.ref", rustdoc_ref,
+        cargo_miri("test"),
+        "test.default.stdout.ref", rustdoc_ref,
         env={'MIRIFLAGS': "-Zmiri-track-raw-pointers"},
     )
     test("`cargo miri test` (with filter)",
diff --git a/test-cargo-miri/test.raw-ptr-track.stdout.ref b/test-cargo-miri/test.raw-ptr-track.stdout.ref
deleted file mode 100644
index c9678beac8f4..000000000000
--- a/test-cargo-miri/test.raw-ptr-track.stdout.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-
-running 1 test
-.
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-
-running 5 tests
-.i...
-test result: ok. 4 passed; 0 failed; 1 ignored; 0 measured; 2 filtered out
-
diff --git a/tests/run-pass/dyn-lcsit.rs b/tests/run-pass/dyn-lcsit.rs
index fa11e9a2a318..e7a5f13923a8 100644
--- a/tests/run-pass/dyn-lcsit.rs
+++ b/tests/run-pass/dyn-lcsit.rs
@@ -32,7 +32,7 @@ const cdef_et3: &dyn Tr1<As1: Clone + Iterator<Item: Add<u8, Output: Into<u8>>>>
     impl Tr1 for A {
         type As1 = core::ops::Range<u8>;
         fn mk(&self) -> Self::As1 { 0..10 }
-    };
+    }
     &A
 };
 pub fn use_et3() {
diff --git a/tests/run-pass/intrinsics.rs b/tests/run-pass/intrinsics.rs
index 8f7dbac67064..00c966b049c4 100644
--- a/tests/run-pass/intrinsics.rs
+++ b/tests/run-pass/intrinsics.rs
@@ -24,7 +24,7 @@ fn main() {
     assert_eq!(intrinsics::likely(false), false);
     assert_eq!(intrinsics::unlikely(true), true);
 
-    unsafe { intrinsics::forget(Bomb); }
+    intrinsics::forget(Bomb);
 
     let _v = intrinsics::discriminant_value(&Some(()));
     let _v = intrinsics::discriminant_value(&0);