diff options
| author | bors <bors@rust-lang.org> | 2023-10-28 19:38:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-28 19:38:15 +0000 |
| commit | 7cc36de72d9a5fd6881946c673ff47586214ad1e (patch) | |
| tree | bec6f12ea93b1ed807196ac45cb4da2c1cc3017f /tests | |
| parent | 6b78377245eae0b023fff31d15f2f8d183cfc326 (diff) | |
| parent | fd207e67d5923f4cec2a96c4b095a1e3bbdac5a7 (diff) | |
| download | rust-7cc36de72d9a5fd6881946c673ff47586214ad1e.tar.gz rust-7cc36de72d9a5fd6881946c673ff47586214ad1e.zip | |
Auto merge of #116240 - dtolnay:constdiscriminant, r=thomcc
Const stabilize mem::discriminant Tracking issue: #69821. This PR is a rebase of https://github.com/rust-lang/rust/pull/103893 to resolve conflicts in library/core/src/lib.rs (against #102470 and #110393).
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/consts/const-eval/ub-enum.rs | 2 | ||||
| -rw-r--r-- | tests/ui/consts/const_discriminant.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/ui/consts/const-eval/ub-enum.rs b/tests/ui/consts/const-eval/ub-enum.rs index 078283fbd1f..72a0c9efed2 100644 --- a/tests/ui/consts/const-eval/ub-enum.rs +++ b/tests/ui/consts/const-eval/ub-enum.rs @@ -2,7 +2,7 @@ // Strip out raw byte dumps to make comparison platform-independent: // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP" -#![feature(never_type, const_discriminant)] +#![feature(never_type)] #![allow(invalid_value)] use std::mem; diff --git a/tests/ui/consts/const_discriminant.rs b/tests/ui/consts/const_discriminant.rs index b1180faa697..80deb0f784d 100644 --- a/tests/ui/consts/const_discriminant.rs +++ b/tests/ui/consts/const_discriminant.rs @@ -1,5 +1,4 @@ // run-pass -#![feature(const_discriminant)] #![allow(dead_code)] use std::mem::{discriminant, Discriminant}; |