From 3773c0ef1c75fc65f5ebd25c69daa6bf7cea635e Mon Sep 17 00:00:00 2001 From: Pantonshire Date: Fri, 21 May 2021 15:02:59 +0100 Subject: [PATCH] Fix deserialize error message --- enumscribe_derive/src/lib.rs | 9 +++++---- enumscribe_tests/src/main.rs | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 enumscribe_tests/src/main.rs diff --git a/enumscribe_derive/src/lib.rs b/enumscribe_derive/src/lib.rs index 109caad..59d3035 100644 --- a/enumscribe_derive/src/lib.rs +++ b/enumscribe_derive/src/lib.rs @@ -556,11 +556,12 @@ pub fn derive_enum_deserialize(input: TokenStream) -> TokenStream { let deserialized_str_ident = quote! { __enumscribe_deserialized_str }; let variant_strings = parsed_enum.variants.iter() - .filter(|variant| match &variant.v_type { - VariantType::Ignore => false, - _ => true + .map(|variant| match &variant.v_type { + VariantType::Named { name, .. } => Some(name.as_str()), + _ => None }) - .map(|variant| variant.data.ident.to_string()) + .filter(|name| name.is_some()) + .map(|name| name.unwrap()) .collect::>(); let main_match = proc_try!(gen_unscribe_match( diff --git a/enumscribe_tests/src/main.rs b/enumscribe_tests/src/main.rs deleted file mode 100644 index e7a11a9..0000000 --- a/enumscribe_tests/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -}