From 476ef4bce0a1dc0254b04ee12fe217f23f68a83f Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Thu, 26 Jan 2023 23:32:37 +0000 Subject: [PATCH] Fix tests since 1.67.0 was released (#100) --- .../compile_fail/conflicting_default.stderr | 2 +- .../conflicting_default.stderr_beta | 9 --------- .../conflicting_default.stderr_nightly | 9 --------- .../compile_fail/conflicting_derive.stderr | 8 ++++---- .../conflicting_derive.stderr_beta | 20 ------------------- .../conflicting_derive.stderr_nightly | 20 ------------------- 6 files changed, 5 insertions(+), 63 deletions(-) delete mode 100644 num_enum/tests/try_build/compile_fail/conflicting_default.stderr_beta delete mode 100644 num_enum/tests/try_build/compile_fail/conflicting_default.stderr_nightly delete mode 100644 num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_beta delete mode 100644 num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_nightly diff --git a/num_enum/tests/try_build/compile_fail/conflicting_default.stderr b/num_enum/tests/try_build/compile_fail/conflicting_default.stderr index cefd1e4..69b8872 100644 --- a/num_enum/tests/try_build/compile_fail/conflicting_default.stderr +++ b/num_enum/tests/try_build/compile_fail/conflicting_default.stderr @@ -1,4 +1,4 @@ -error[E0119]: conflicting implementations of trait `std::default::Default` for type `Number` +error[E0119]: conflicting implementations of trait `Default` for type `Number` --> tests/try_build/compile_fail/conflicting_default.rs:1:19 | 1 | #[derive(Default, num_enum::Default)] diff --git a/num_enum/tests/try_build/compile_fail/conflicting_default.stderr_beta b/num_enum/tests/try_build/compile_fail/conflicting_default.stderr_beta deleted file mode 100644 index 69b8872..0000000 --- a/num_enum/tests/try_build/compile_fail/conflicting_default.stderr_beta +++ /dev/null @@ -1,9 +0,0 @@ -error[E0119]: conflicting implementations of trait `Default` for type `Number` - --> tests/try_build/compile_fail/conflicting_default.rs:1:19 - | -1 | #[derive(Default, num_enum::Default)] - | ------- ^^^^^^^^^^^^^^^^^ conflicting implementation for `Number` - | | - | first implementation here - | - = note: this error originates in the derive macro `num_enum::Default` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/num_enum/tests/try_build/compile_fail/conflicting_default.stderr_nightly b/num_enum/tests/try_build/compile_fail/conflicting_default.stderr_nightly deleted file mode 100644 index 69b8872..0000000 --- a/num_enum/tests/try_build/compile_fail/conflicting_default.stderr_nightly +++ /dev/null @@ -1,9 +0,0 @@ -error[E0119]: conflicting implementations of trait `Default` for type `Number` - --> tests/try_build/compile_fail/conflicting_default.rs:1:19 - | -1 | #[derive(Default, num_enum::Default)] - | ------- ^^^^^^^^^^^^^^^^^ conflicting implementation for `Number` - | | - | first implementation here - | - = note: this error originates in the derive macro `num_enum::Default` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr b/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr index 4189539..679eb06 100644 --- a/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr +++ b/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr @@ -1,5 +1,5 @@ -error[E0119]: conflicting implementations of trait `num_enum::TryFromPrimitive` for type `Numbers` - --> $DIR/conflicting_derive.rs:1:35 +error[E0119]: conflicting implementations of trait `TryFromPrimitive` for type `Numbers` + --> tests/try_build/compile_fail/conflicting_derive.rs:1:35 | 1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)] | ----------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Numbers` @@ -8,8 +8,8 @@ error[E0119]: conflicting implementations of trait `num_enum::TryFromPrimitive` | = note: this error originates in the derive macro `num_enum::TryFromPrimitive` (in Nightly builds, run with -Z macro-backtrace for more info) -error[E0119]: conflicting implementations of trait `std::convert::TryFrom` for type `Numbers` - --> $DIR/conflicting_derive.rs:1:35 +error[E0119]: conflicting implementations of trait `TryFrom` for type `Numbers` + --> tests/try_build/compile_fail/conflicting_derive.rs:1:35 | 1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_beta b/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_beta deleted file mode 100644 index 679eb06..0000000 --- a/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_beta +++ /dev/null @@ -1,20 +0,0 @@ -error[E0119]: conflicting implementations of trait `TryFromPrimitive` for type `Numbers` - --> tests/try_build/compile_fail/conflicting_derive.rs:1:35 - | -1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)] - | ----------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Numbers` - | | - | first implementation here - | - = note: this error originates in the derive macro `num_enum::TryFromPrimitive` (in Nightly builds, run with -Z macro-backtrace for more info) - -error[E0119]: conflicting implementations of trait `TryFrom` for type `Numbers` - --> tests/try_build/compile_fail/conflicting_derive.rs:1:35 - | -1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: conflicting implementation in crate `core`: - - impl TryFrom for T - where U: Into; - = note: this error originates in the derive macro `num_enum::TryFromPrimitive` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_nightly b/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_nightly deleted file mode 100644 index 679eb06..0000000 --- a/num_enum/tests/try_build/compile_fail/conflicting_derive.stderr_nightly +++ /dev/null @@ -1,20 +0,0 @@ -error[E0119]: conflicting implementations of trait `TryFromPrimitive` for type `Numbers` - --> tests/try_build/compile_fail/conflicting_derive.rs:1:35 - | -1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)] - | ----------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Numbers` - | | - | first implementation here - | - = note: this error originates in the derive macro `num_enum::TryFromPrimitive` (in Nightly builds, run with -Z macro-backtrace for more info) - -error[E0119]: conflicting implementations of trait `TryFrom` for type `Numbers` - --> tests/try_build/compile_fail/conflicting_derive.rs:1:35 - | -1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: conflicting implementation in crate `core`: - - impl TryFrom for T - where U: Into; - = note: this error originates in the derive macro `num_enum::TryFromPrimitive` (in Nightly builds, run with -Z macro-backtrace for more info)