Skip to content

Commit e73ee41

Browse files
committed
rebase fallout
1 parent a06740c commit e73ee41

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use std::cell::UnsafeCell;
66

7-
// this test ICEs to ensure that our mutability story is sound
7+
// this test ensures that our mutability story is sound
88

99
struct Meh {
1010
x: &'static UnsafeCell<i32>,

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

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// compile-flags: -Zunleash-the-miri-inside-of-you
22

3-
#![feature(const_raw_ptr_deref)]
4-
#![feature(const_mut_refs)]
53
#![allow(const_err)]
64

75
use std::cell::UnsafeCell;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: untyped pointers are not allowed in constant
2-
--> $DIR/raw_mutable_const.rs:9:1
2+
--> $DIR/raw_mutable_const.rs:7:1
33
|
44
LL | const MUTABLE_BEHIND_RAW: *mut i32 = &UnsafeCell::new(42) as *const _ as *mut _;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
warning: skipping const checks
88
|
99
help: skipping check that does not even have a feature gate
10-
--> $DIR/raw_mutable_const.rs:9:38
10+
--> $DIR/raw_mutable_const.rs:7:38
1111
|
1212
LL | const MUTABLE_BEHIND_RAW: *mut i32 = &UnsafeCell::new(42) as *const _ as *mut _;
1313
| ^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)