rebase fallout

src/test/ui/consts/miri_unleashed/mutable_references_err.rs

@@ -4,7 +4,7 @@
 
 use std::cell::UnsafeCell;
 
-// this test ICEs to ensure that our mutability story is sound
+// this test ensures that our mutability story is sound
 
 struct Meh {
     x: &'static UnsafeCell<i32>,

src/test/ui/consts/miri_unleashed/raw_mutable_const.rs

@@ -1,7 +1,5 @@
 // compile-flags: -Zunleash-the-miri-inside-of-you
 
-#![feature(const_raw_ptr_deref)]
-#![feature(const_mut_refs)]
 #![allow(const_err)]
 
 use std::cell::UnsafeCell;

src/test/ui/consts/miri_unleashed/raw_mutable_const.stderr

@@ -1,5 +1,5 @@
 error: untyped pointers are not allowed in constant
-  --> $DIR/raw_mutable_const.rs:9:1
+  --> $DIR/raw_mutable_const.rs:7:1
    |
 LL | const MUTABLE_BEHIND_RAW: *mut i32 = &UnsafeCell::new(42) as *const _ as *mut _;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | const MUTABLE_BEHIND_RAW: *mut i32 = &UnsafeCell::new(42) as *const _ as *m
 warning: skipping const checks
    |
 help: skipping check that does not even have a feature gate
-  --> $DIR/raw_mutable_const.rs:9:38
+  --> $DIR/raw_mutable_const.rs:7:38
    |
 LL | const MUTABLE_BEHIND_RAW: *mut i32 = &UnsafeCell::new(42) as *const _ as *mut _;
    |                                      ^^^^^^^^^^^^^^^^^^^^