Move arbitrary_enum_discriminant tests to stable

The feature stabilised in 1.66.0.
illicitonion · Dec 31, 2022 · 866c4b6 · 866c4b6
1 parent bc957b1
commit 866c4b6
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 67 deletions.
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
@@ -47,13 +47,6 @@ jobs:
           command: test
           args: --manifest-path=num_enum/Cargo.toml --no-default-features --features=complex-expressions
           toolchain: ${{ matrix.toolchain }}
-      - name: Run tests with std and nightly features
-        if: matrix.toolchain == 'nightly'
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --manifest-path=num_enum/Cargo.toml --no-default-features --features=std,nightly
-          toolchain: ${{ matrix.toolchain }}
       - name: Build no-std
         uses: actions-rs/cargo@v1
         with:

diff --git a/num_enum/Cargo.toml b/num_enum/Cargo.toml
@@ -18,7 +18,6 @@ license = "BSD-3-Clause OR MIT OR Apache-2.0"
 std = ["num_enum_derive/std"]
 complex-expressions = ["num_enum_derive/complex-expressions"]
 external_doc = []
-nightly = []
 
 default = ["std"]  # disable to use in a `no_std` environment
 

diff --git a/num_enum/tests/from_primitive.rs b/num_enum/tests/from_primitive.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "nightly", feature(arbitrary_enum_discriminant))]
-
 use ::std::convert::TryFrom;
 
 use ::num_enum::{FromPrimitive, TryFromPrimitive};

diff --git a/num_enum/tests/into_primitive.rs b/num_enum/tests/into_primitive.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "nightly", feature(arbitrary_enum_discriminant))]
-
 use ::num_enum::IntoPrimitive;
 
 // Guard against https://github.com/illicitonion/num_enum/issues/27

diff --git a/...compile_fail/catch_all_multiple_fields.rs → ...compile_fail/catch_all_multiple_fields.rs b/...compile_fail/catch_all_multiple_fields.rs → ...compile_fail/catch_all_multiple_fields.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/...ile_fail/catch_all_multiple_fields.stderr → ...ile_fail/catch_all_multiple_fields.stderr b/...ile_fail/catch_all_multiple_fields.stderr → ...ile_fail/catch_all_multiple_fields.stderr
@@ -1,5 +1,5 @@
 error: Variant with `catch_all` must be a tuple with exactly 1 field matching the repr type
- --> tests/try_build/nightly/compile_fail/catch_all_multiple_fields.rs:7:16
+ --> tests/try_build/compile_fail/catch_all_multiple_fields.rs:5:16
   |
-7 |     #[num_enum(catch_all)]
+5 |     #[num_enum(catch_all)]
   |                ^^^^^^^^^
diff --git a/...ghtly/compile_fail/catch_all_non_tuple.rs → ...build/compile_fail/catch_all_non_tuple.rs b/...ghtly/compile_fail/catch_all_non_tuple.rs → ...build/compile_fail/catch_all_non_tuple.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/...y/compile_fail/catch_all_non_tuple.stderr → ...d/compile_fail/catch_all_non_tuple.stderr b/...y/compile_fail/catch_all_non_tuple.stderr → ...d/compile_fail/catch_all_non_tuple.stderr
@@ -1,5 +1,5 @@
 error: Variant with `catch_all` must be a tuple with exactly 1 field matching the repr type
- --> tests/try_build/nightly/compile_fail/catch_all_non_tuple.rs:7:16
+ --> tests/try_build/compile_fail/catch_all_non_tuple.rs:5:16
   |
-7 |     #[num_enum(catch_all)]
+5 |     #[num_enum(catch_all)]
   |                ^^^^^^^^^
diff --git a/...y/compile_fail/catch_all_type_mismatch.rs → ...d/compile_fail/catch_all_type_mismatch.rs b/...y/compile_fail/catch_all_type_mismatch.rs → ...d/compile_fail/catch_all_type_mismatch.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/...mpile_fail/catch_all_type_mismatch.stderr → ...mpile_fail/catch_all_type_mismatch.stderr b/...mpile_fail/catch_all_type_mismatch.stderr → ...mpile_fail/catch_all_type_mismatch.stderr
@@ -1,5 +1,5 @@
 error: Variant with `catch_all` must be a tuple with exactly 1 field matching the repr type
- --> tests/try_build/nightly/compile_fail/catch_all_type_mismatch.rs:7:16
+ --> tests/try_build/compile_fail/catch_all_type_mismatch.rs:5:16
   |
-7 |     #[num_enum(catch_all)]
+5 |     #[num_enum(catch_all)]
   |                ^^^^^^^^^
diff --git a/...ghtly/compile_fail/conflicting_default.rs → ...build/compile_fail/conflicting_default.rs b/...ghtly/compile_fail/conflicting_default.rs → ...build/compile_fail/conflicting_default.rs
diff --git a/...y/compile_fail/conflicting_default.stderr → ...d/compile_fail/conflicting_default.stderr b/...y/compile_fail/conflicting_default.stderr → ...d/compile_fail/conflicting_default.stderr
@@ -1,5 +1,5 @@
 error[E0119]: conflicting implementations of trait `std::default::Default` for type `Number`
- --> tests/try_build/nightly/compile_fail/conflicting_default.rs:1:19
+ --> tests/try_build/compile_fail/conflicting_default.rs:1:19
   |
 1 | #[derive(Default, num_enum::Default)]
   |          -------  ^^^^^^^^^^^^^^^^^ conflicting implementation for `Number`

diff --git a/...tly/compile_fail/default_and_catch_all.rs → ...ild/compile_fail/default_and_catch_all.rs b/...tly/compile_fail/default_and_catch_all.rs → ...ild/compile_fail/default_and_catch_all.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/num_enum/tests/try_build/compile_fail/default_and_catch_all.stderr b/num_enum/tests/try_build/compile_fail/default_and_catch_all.stderr
@@ -0,0 +1,5 @@
+error: Attribute `catch_all` is mutually exclusive with `default`
+ --> tests/try_build/compile_fail/default_and_catch_all.rs:6:16
+  |
+6 |     #[num_enum(catch_all)]
+  |                ^^^^^^^^^
diff --git a/...compile_fail/default_and_catch_all_alt.rs → ...compile_fail/default_and_catch_all_alt.rs b/...compile_fail/default_and_catch_all_alt.rs → ...compile_fail/default_and_catch_all_alt.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/num_enum/tests/try_build/compile_fail/default_and_catch_all_alt.stderr b/num_enum/tests/try_build/compile_fail/default_and_catch_all_alt.stderr
@@ -0,0 +1,5 @@
+error: Attribute `catch_all` is mutually exclusive with `default`
+ --> tests/try_build/compile_fail/default_and_catch_all_alt.rs:6:16
+  |
+6 |     #[num_enum(catch_all)]
+  |                ^^^^^^^^^
diff --git a/...ail/default_and_catch_all_same_variant.rs → ...ail/default_and_catch_all_same_variant.rs b/...ail/default_and_catch_all_same_variant.rs → ...ail/default_and_catch_all_same_variant.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/num_enum/tests/try_build/compile_fail/default_and_catch_all_same_variant.stderr b/num_enum/tests/try_build/compile_fail/default_and_catch_all_same_variant.stderr
@@ -0,0 +1,5 @@
+error: Attribute `default` is mutually exclusive with `catch_all`
+ --> tests/try_build/compile_fail/default_and_catch_all_same_variant.rs:6:5
+  |
+6 |     #[default]
+  |     ^^^^^^^^^^
diff --git a/...default_and_catch_all_same_variant_alt.rs → ...default_and_catch_all_same_variant_alt.rs b/...default_and_catch_all_same_variant_alt.rs → ...default_and_catch_all_same_variant_alt.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/num_enum/tests/try_build/compile_fail/default_and_catch_all_same_variant_alt.stderr b/num_enum/tests/try_build/compile_fail/default_and_catch_all_same_variant_alt.stderr
@@ -0,0 +1,5 @@
+error: Attribute `default` is mutually exclusive with `catch_all`
+ --> tests/try_build/compile_fail/default_and_catch_all_same_variant_alt.rs:6:16
+  |
+6 |     #[num_enum(default)]
+  |                ^^^^^^^
diff --git a/...ightly/compile_fail/multiple_catch_all.rs → ..._build/compile_fail/multiple_catch_all.rs b/...ightly/compile_fail/multiple_catch_all.rs → ..._build/compile_fail/multiple_catch_all.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/num_enum/tests/try_build/compile_fail/multiple_catch_all.stderr b/num_enum/tests/try_build/compile_fail/multiple_catch_all.stderr
@@ -0,0 +1,5 @@
+error: Multiple variants marked with `#[num_enum(catch_all)]`
+ --> tests/try_build/compile_fail/multiple_catch_all.rs:6:16
+  |
+6 |     #[num_enum(catch_all)]
+  |                ^^^^^^^^^
diff --git a/...e_fail/multiple_catch_all_same_variant.rs → ...e_fail/multiple_catch_all_same_variant.rs b/...e_fail/multiple_catch_all_same_variant.rs → ...e_fail/multiple_catch_all_same_variant.rs
@@ -1,5 +1,3 @@
-#![feature(arbitrary_enum_discriminant)]
-
 #[derive(Debug, Eq, PartialEq, num_enum::FromPrimitive)]
 #[repr(u8)]
 enum Enum {

diff --git a/num_enum/tests/try_build/compile_fail/multiple_catch_all_same_variant.stderr b/num_enum/tests/try_build/compile_fail/multiple_catch_all_same_variant.stderr
@@ -0,0 +1,5 @@
+error: Multiple variants marked with `#[num_enum(catch_all)]`
+ --> tests/try_build/compile_fail/multiple_catch_all_same_variant.rs:6:16
+  |
+6 |     #[num_enum(catch_all)]
+  |                ^^^^^^^^^
diff --git a/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all.stderr b/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all.stderr
diff --git a/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all_alt.stderr b/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all_alt.stderr
diff --git a/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all_same_variant.stderr b/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all_same_variant.stderr
diff --git a/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all_same_variant_alt.stderr b/num_enum/tests/try_build/nightly/compile_fail/default_and_catch_all_same_variant_alt.stderr
diff --git a/num_enum/tests/try_build/nightly/compile_fail/multiple_catch_all.stderr b/num_enum/tests/try_build/nightly/compile_fail/multiple_catch_all.stderr
diff --git a/num_enum/tests/try_build/nightly/compile_fail/multiple_catch_all_same_variant.stderr b/num_enum/tests/try_build/nightly/compile_fail/multiple_catch_all_same_variant.stderr