diff options
| author | George Bateman <george.bateman16@gmail.com> | 2024-01-05 21:25:01 +0000 |
|---|---|---|
| committer | George Bateman <george.bateman16@gmail.com> | 2024-01-19 20:38:51 +0000 |
| commit | 803b810eac520c11c7f1ea0a81af535ee9bddd61 (patch) | |
| tree | d08af2f1d0ba9cfa097f79aebc749771fe15cc91 | |
| parent | 615946db4fc812bff3bb015dfe860c10da4b20c1 (diff) | |
Remove feature(offset_of) from tests
| -rw-r--r-- | library/core/tests/lib.rs | 1 | ||||
| -rw-r--r-- | tests/mir-opt/const_prop/offset_of.rs | 2 | ||||
| -rw-r--r-- | tests/mir-opt/dataflow-const-prop/offset_of.rs | 2 | ||||
| -rw-r--r-- | tests/pretty/offset_of.rs | 1 | ||||
| -rw-r--r-- | tests/ui/layout/issue-112048-unsizing-niche.rs | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index 02af3e6f947..13fb97fdc7f 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -59,6 +59,7 @@ #![feature(noop_waker)] #![feature(numfmt)] #![feature(num_midpoint)] +#![cfg_attr(not(bootstrap), feature(offset_of_nested))] #![feature(isqrt)] #![feature(step_trait)] #![feature(str_internals)] diff --git a/tests/mir-opt/const_prop/offset_of.rs b/tests/mir-opt/const_prop/offset_of.rs index 43ecbbed186..f15d15bfcb2 100644 --- a/tests/mir-opt/const_prop/offset_of.rs +++ b/tests/mir-opt/const_prop/offset_of.rs @@ -2,7 +2,7 @@ // unit-test: GVN // EMIT_MIR_FOR_EACH_PANIC_STRATEGY -#![feature(offset_of, offset_of_enum)] +#![feature(offset_of_enum, offset_of_nested)] use std::marker::PhantomData; use std::mem::offset_of; diff --git a/tests/mir-opt/dataflow-const-prop/offset_of.rs b/tests/mir-opt/dataflow-const-prop/offset_of.rs index e71b3f59eca..c1be6910258 100644 --- a/tests/mir-opt/dataflow-const-prop/offset_of.rs +++ b/tests/mir-opt/dataflow-const-prop/offset_of.rs @@ -2,7 +2,7 @@ // unit-test: DataflowConstProp // EMIT_MIR_FOR_EACH_PANIC_STRATEGY -#![feature(offset_of)] +#![feature(offset_of_nested)] use std::marker::PhantomData; use std::mem::offset_of; diff --git a/tests/pretty/offset_of.rs b/tests/pretty/offset_of.rs index e1783432857..1307c335ad3 100644 --- a/tests/pretty/offset_of.rs +++ b/tests/pretty/offset_of.rs @@ -1,4 +1,3 @@ // pp-exact -#![feature(offset_of)] fn main() { std::mem::offset_of!(std :: ops :: Range < usize >, end); } diff --git a/tests/ui/layout/issue-112048-unsizing-niche.rs b/tests/ui/layout/issue-112048-unsizing-niche.rs index 23588ba36ee..e59e063df99 100644 --- a/tests/ui/layout/issue-112048-unsizing-niche.rs +++ b/tests/ui/layout/issue-112048-unsizing-niche.rs @@ -2,7 +2,6 @@ // Check that unsizing does not change which field is considered for niche layout. -#![feature(offset_of)] #![allow(dead_code)] #[derive(Clone)] |