Skip to content

Commit

Permalink
Fix nightly test expectation
Browse files Browse the repository at this point in the history
rust-lang/rust#83954 removed the trailing :.
  • Loading branch information
illicitonion committed Apr 8, 2021
1 parent d6561cc commit d9e8dd9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
4 changes: 2 additions & 2 deletions num_enum/tests/try_build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ impl Renamer {
const STDERR_EXTENSION: &'static str = "stderr";

#[rustversion::all(beta)]
const VERSION_SPECIFIC_EXTENSION: &'static str = "stderr_nightly";
const VERSION_SPECIFIC_EXTENSION: &'static str = "stderr_beta";

#[rustversion::all(nightly)]
const VERSION_SPECIFIC_EXTENSION: &'static str = "stderr_beta";
const VERSION_SPECIFIC_EXTENSION: &'static str = "stderr_nightly";

#[rustversion::all(not(beta), not(nightly))]
const VERSION_SPECIFIC_EXTENSION: &'static str = "stderr_doesnotexist";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0119]: conflicting implementations of trait `std::convert::TryFrom<u8>` for type `Numbers`
--> $DIR/conflicting_derive.rs:1:35
|
1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: conflicting implementation in crate `core`:
- impl<T, U> TryFrom<U> for T
where U: Into<T>;
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0119]: conflicting implementations of trait `num_enum::TryFromPrimitive` for type `Numbers`
--> $DIR/conflicting_derive.rs:1:10
|
1 | #[derive(num_enum::FromPrimitive, num_enum::TryFromPrimitive)]
| ^^^^^^^^^^^^^^^^^^^^^^^ -------------------------- first implementation here
| |
| conflicting implementation for `Numbers`
|
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)

0 comments on commit d9e8dd9

Please sign in to comment.