Merge pull request #6 from Eijebong/syn-1.0

Update syn related dependencies to 1.0 and bump version
ihrwein · Sep 25, 2019 · 8ad1fcd · 8ad1fcd
2 parents bb64c42 + 5df8b73
commit 8ad1fcd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "enum-display-derive"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Tibor Benke <ihrwein@gmail.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -15,5 +15,6 @@ Display trait's custom derive for simple enums.
 proc-macro = true
 
 [dependencies]
-syn = "0.11"
-quote = "0.3"
+syn = "1"
+quote = "1"
+proc-macro2 = "1"
diff --git a/src/lib.rs b/src/lib.rs
@@ -61,6 +61,7 @@
 //!
 
 extern crate proc_macro;
+extern crate proc_macro2;
 extern crate syn;
 #[macro_use]
 extern crate quote;
@@ -70,25 +71,20 @@ use proc_macro::TokenStream;
 #[proc_macro_derive(Display)]
 #[doc(hidden)]
 pub fn display(input: TokenStream) -> TokenStream {
-    // Construct a string representation of the type definition
-    let s = input.to_string();
-
     // Parse the string representation
-    let ast = syn::parse_macro_input(&s).unwrap();
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
 
-    let gen = match ast.body {
-        syn::Body::Enum(ref variants) => {
+    match ast.data {
+        syn::Data::Enum(ref enum_data) => {
             let name = &ast.ident;
-            impl_display(name, variants)
+            impl_display(name, enum_data).into()
         }
         _ => panic!("#[derive(Display)] works only on enums"),
-    };
-
-    gen.parse().unwrap()
+    }
 }
 
-fn impl_display(name: &syn::Ident, variants: &[syn::Variant]) -> quote::Tokens {
-    let variants = variants.iter()
+fn impl_display(name: &syn::Ident, data: &syn::DataEnum) -> proc_macro2::TokenStream {
+    let variants = data.variants.iter()
         .map(|variant| impl_display_for_variant(name, variant));
 
     quote! {
@@ -102,18 +98,18 @@ fn impl_display(name: &syn::Ident, variants: &[syn::Variant]) -> quote::Tokens {
     }
 }
 
-fn impl_display_for_variant(name: &syn::Ident, variant: &syn::Variant) -> quote::Tokens {
+fn impl_display_for_variant(name: &syn::Ident, variant: &syn::Variant) -> proc_macro2::TokenStream {
     let id = &variant.ident;
-    match variant.data {
-        syn::VariantData::Unit => {
+    match variant.fields {
+        syn::Fields::Unit => {
             quote! {
                 #name::#id => {
                     f.write_str(stringify!(#id))
                 }
             }
         }
-        syn::VariantData::Tuple(ref fields) => {
-            match fields.len() {
+        syn::Fields::Unnamed(ref fields) => {
+            match fields.unnamed.len() {
                 0 => {
                     quote! {
                         #name::#id() => {