Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion num_enum/tests/try_from_primitive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ fn alternative_values() {
#[repr(i8)]
enum Enum {
Zero = 0,
#[num_enum(alternatives = [-1, 2, 3])]
#[num_enum(alternatives = [-1, 2, b'\x03'])]
OneTwoThreeOrMinusOne = 1,
}

Expand Down
22 changes: 13 additions & 9 deletions num_enum_derive/src/parsing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -429,16 +429,20 @@ fn parse_discriminant(val_exp: &Expr) -> Result<DiscriminantValue> {
unsigned_expr = expr;
sign = -1;
}
if let Expr::Lit(ExprLit {
lit: Lit::Int(ref lit_int),
..
}) = unsigned_expr
{
Ok(DiscriminantValue::Literal(
match unsigned_expr {
Expr::Lit(ExprLit {
lit: Lit::Int(lit_int),
..
}) => Ok(DiscriminantValue::Literal(
sign * lit_int.base10_parse::<i128>()?,
))
} else {
Ok(DiscriminantValue::Expr(val_exp.clone()))
)),
Expr::Lit(ExprLit {
lit: Lit::Byte(lit_byte),
..
}) => Ok(DiscriminantValue::Literal(
sign * i128::from(lit_byte.value()),
)),
_ => Ok(DiscriminantValue::Expr(val_exp.clone())),
}
}

Expand Down
Loading