Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings when using with single-variant enum #4

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix warnings when using with single-variant enum #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 21 additions & 12 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! ```rust
//! # macro_rules! dont_test { () => {
//! use is_variant::IsVariant;
//!
//!
//! #[derive(IsVariant)]
//! enum TestEnum {
//! A,
Expand All @@ -14,17 +14,17 @@
//! D { _name: String, _age: i32 },
//! VariantTest,
//! }
//!
//!
//! fn main() {
//! let x = TestEnum::C(1, 2);
//! assert!(x.is_c());
//!
//!
//! let x = TestEnum::A;
//! assert!(x.is_a());
//!
//!
//! let x = TestEnum::B();
//! assert!(x.is_b());
//!
//!
//! let x = TestEnum::D {_name: "Jane Doe".into(), _age: 30 };
//! assert!(x.is_d());
//!
Expand Down Expand Up @@ -65,6 +65,7 @@ pub fn derive_is_variant(input: TokenStream) -> TokenStream {
match data {
Data::Enum(data_enum) => {
variant_checker_functions = TokenStream2::new();
let has_multiple_variants = data_enum.variants.len() > 1;

for variant in &data_enum.variants {
let ref variant_name = variant.ident;
Expand All @@ -79,14 +80,22 @@ pub fn derive_is_variant(input: TokenStream) -> TokenStream {
format_ident!("is_{}", variant_name.to_string().to_case(Case::Snake));
is_variant_func_name.set_span(variant_name.span());

variant_checker_functions.extend(quote_spanned! {variant.span()=>
fn #is_variant_func_name(&self) -> bool {
match self {
#name::#variant_name #fields_in_variant => true,
_ => false,
if has_multiple_variants {
variant_checker_functions.extend(quote_spanned! {variant.span()=>
fn #is_variant_func_name(&self) -> bool {
match self {
#name::#variant_name #fields_in_variant => true,
_ => false,
}
}
});
} else {
variant_checker_functions.extend(quote_spanned! {variant.span()=>
fn #is_variant_func_name(&self) -> bool {
true
}
}
});
});
}
}
}
_ => return derive_error!("IsVariant is only implemented for enums"),
Expand Down