rust-embed

rust macro which loads files into the rust binary at compile time during release and loads the file from the fs during dev.

e956a1ed — Peter John

Merge pull request #211 from smoelius/syn-2

Files changed (2) hide show

impl/Cargo.toml CHANGED Viewed

@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 rust-embed-utils = { version = "7.5.0", path = "../utils"}
-syn = { version = "1", default-features = false, features = ["derive", "parsing", "proc-macro"] }
+syn = { version = "2", default-features = false, features = ["derive", "parsing", "proc-macro"] }
 quote = "1"
 proc-macro2 = "1"
 walkdir = "2.3.1"

impl/src/lib.rs CHANGED Viewed

@@ -7,7 +7,7 @@ extern crate proc_macro;
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use std::{env, path::Path};
-use syn::{Data, DeriveInput, Fields, Lit, Meta, MetaNameValue};
+use syn::{Data, DeriveInput, Expr, ExprLit, Fields, Lit, Meta, MetaNameValue};
 fn embedded(ident: &syn::Ident, folder_path: String, prefix: Option<&str>, includes: &[String], excludes: &[String]) -> TokenStream2 {
   extern crate rust_embed_utils;
@@ -210,10 +210,12 @@ fn find_attribute_values(ast: &syn::DeriveInput, attr_name: &str) -> Vec<String>
   ast
     .attrs
     .iter()
-    .filter(|value| value.path.is_ident(attr_name))
+    .filter(|value| value.path().is_ident(attr_name))
-    .filter_map(|attr| attr.parse_meta().ok())
-    .filter_map(|meta| match meta {
+    .filter_map(|attr| match &attr.meta {
+      Meta::NameValue(MetaNameValue {
-      Meta::NameValue(MetaNameValue { lit: Lit::Str(val), .. }) => Some(val.value()),
+        value: Expr::Lit(ExprLit { lit: Lit::Str(val), .. }),
+        ..
+      }) => Some(val.value()),
       _ => None,
     })
     .collect()