Auto merge of #1662 - RalfJung:rustup, r=RalfJung

panicing now works with -Zmiri-track-raw-pointers

Author: bors

rust-version

@@ -1 +1 @@
-158f8d034b15e65ba8dc0d066358dd0632bfcd6e
+507bff92fadf1f25a830da5065a5a87113345163

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)",

test-cargo-miri/test.raw-ptr-track.stdout.ref

@@ -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() {

tests/run-pass/dyn-lcsit.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);