Merge pull request #74 from silwol/master

Update proc-macro2, quote, syn to version 1
sval-rs · Oct 10, 2019 · c2ed0a1 · c2ed0a1
2 parents 1968324 + bad8cc4
commit c2ed0a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -12,10 +12,10 @@ license = "Apache-2.0 OR MIT"
 proc-macro = true
 
 [dependencies.syn]
-version = "0.15"
+version = "1"
 
 [dependencies.quote]
-version = "0.6"
+version = "1"
 
 [dependencies.proc-macro2]
-version = "0.4"
+version = "1"
diff --git a/derive/src/attr.rs b/derive/src/attr.rs
@@ -19,10 +19,10 @@ pub(crate) fn derive_provider(input: &DeriveInput) -> DeriveProvider {
         for meta in list.nested {
             match meta {
                 NestedMeta::Meta(Meta::NameValue(MetaNameValue {
-                    ref ident,
+                    ref path,
                     lit: Lit::Str(ref s),
                     ..
-                })) if ident == "derive_from" && s.value() == "serde" => {
+                })) if path.is_ident("derive_from") && s.value() == "serde" => {
                     return DeriveProvider::Serde;
                 }
                 _ => panic!("unsupported attribute"),
@@ -39,7 +39,7 @@ pub(crate) fn name_of_field(field: &Field) -> String {
     for list in field.attrs.iter().filter_map(sval_attr) {
         for meta in list.nested {
             if let NestedMeta::Meta(Meta::NameValue(value)) = meta {
-                if value.ident == "rename" && rename.is_none() {
+                if value.path.is_ident("rename") && rename.is_none() {
                     if let Lit::Str(s) = value.lit {
                         rename = Some(s.value());
                         continue;
@@ -59,7 +59,7 @@ fn sval_attr(attr: &Attribute) -> Option<MetaList> {
         return None;
     }
 
-    match attr.interpret_meta() {
+    match attr.parse_meta().ok() {
         Some(Meta::List(list)) => Some(list),
         _ => panic!("unsupported attribute"),
     }