diff options
| author | Jubilee Young <workingjubilee@gmail.com> | 2024-05-31 23:40:11 -0700 |
|---|---|---|
| committer | Jubilee Young <workingjubilee@gmail.com> | 2024-07-22 14:54:36 -0700 |
| commit | b3cd9b5cd3470da7c8f05ed27a8c1db02422b805 (patch) | |
| tree | c0e68e1036cbfdb3dc6c0632b637fa8b25edc0e2 /src | |
| parent | bf454afcaabb2406dda5e5d880ad061750caf4a8 (diff) | |
miri: fixup for allowing &raw UNSAFE_STATIC
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/tests/fail/extern_static.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/extern_static.stderr | 4 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/static_mut.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/miri/tests/fail/extern_static.rs b/src/tools/miri/tests/fail/extern_static.rs index f8805db8d14..0cbf1646be9 100644 --- a/src/tools/miri/tests/fail/extern_static.rs +++ b/src/tools/miri/tests/fail/extern_static.rs @@ -5,5 +5,5 @@ extern "C" { } fn main() { - let _val = unsafe { std::ptr::addr_of!(FOO) }; //~ ERROR: is not supported by Miri + let _val = std::ptr::addr_of!(FOO); //~ ERROR: is not supported by Miri } diff --git a/src/tools/miri/tests/fail/extern_static.stderr b/src/tools/miri/tests/fail/extern_static.stderr index 21759f96019..c7ab128e2fe 100644 --- a/src/tools/miri/tests/fail/extern_static.stderr +++ b/src/tools/miri/tests/fail/extern_static.stderr @@ -1,8 +1,8 @@ error: unsupported operation: extern static `FOO` is not supported by Miri --> $DIR/extern_static.rs:LL:CC | -LL | let _val = unsafe { std::ptr::addr_of!(FOO) }; - | ^^^ extern static `FOO` is not supported by Miri +LL | let _val = std::ptr::addr_of!(FOO); + | ^^^ extern static `FOO` is not supported by Miri | = help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support = note: BACKTRACE: diff --git a/src/tools/miri/tests/pass/static_mut.rs b/src/tools/miri/tests/pass/static_mut.rs index 1b416cc4e9b..4488b5a09d5 100644 --- a/src/tools/miri/tests/pass/static_mut.rs +++ b/src/tools/miri/tests/pass/static_mut.rs @@ -2,7 +2,7 @@ use std::ptr::addr_of; static mut FOO: i32 = 42; -static BAR: Foo = Foo(unsafe { addr_of!(FOO) }); +static BAR: Foo = Foo(addr_of!(FOO)); #[allow(dead_code)] struct Foo(*const i32); |