feat: update deps, move to syn v2

Author: loyd

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - derive: support `serde::skip_deserializing` ([#83]).
 
+### Changed
+- derive: move to syn v2.
+
 [#83]: https://github.com/loyd/clickhouse.rs/pull/83
 
 ## [0.11.6] - 2023-09-27

Cargo.toml

@@ -58,7 +58,7 @@ hyper-tls = { version = "0.5.0", optional = true }
 url = "2.1.1"
 futures = "0.3.5"
 static_assertions = "1.1"
-sealed = "0.4"
+sealed = "0.5"
 sha-1 = { version = "0.10", optional = true }
 serde_json = { version = "1.0.68", optional = true }
 lz4 = { version = "1.23.3", optional = true }
@@ -68,7 +68,7 @@ time = { version = "0.3", optional = true }
 bstr = { version = "1.2", default-features = false }
 
 [dev-dependencies]
-criterion = "0.4.0"
+criterion = "0.5.0"
 serde = { version = "1.0.106", features = ["derive"] }
 tokio = { version = "1.0.1", features = ["full", "test-util"] }
 hyper = { version = "0.14", features = ["client", "tcp", "http1", "stream", "server"] }

derive/Cargo.toml

@@ -11,6 +11,6 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = "1.0"
-syn = "1.0"
+syn = "2.0"
 quote = "1.0"
-serde_derive_internals = "0.26"
+serde_derive_internals = "0.29"

derive/src/lib.rs

@@ -1,60 +1,10 @@
 use proc_macro2::TokenStream;
 use quote::quote;
-use serde_derive_internals::{attr::get_serde_meta_items, Ctxt};
-use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Fields, Ident, Lit, Meta, NestedMeta};
-
-/// Parses `#[serde(skip_serializing)]` and `#[serde(skip_deserializing)]`
-fn serde_skipped(cx: &Ctxt, attrs: &[syn::Attribute]) -> bool {
-    for meta_items in attrs
-        .iter()
-        .filter_map(|attr| get_serde_meta_items(cx, attr).ok())
-    {
-        for meta_item in meta_items {
-            match meta_item {
-                NestedMeta::Meta(Meta::Path(path))
-                if path
-                    .get_ident()
-                    // will not work with skip_serializing_if
-                    .map_or(false, |i| *i == "skip_serializing" || *i == "skip_deserializing") =>
-                    {
-                        return true
-                    }
-                _ => continue,
-            }
-        }
-    }
-    false
-}
-
-/// Parses `#[serde(rename = "..")]`
-fn serde_rename(cx: &Ctxt, field: &syn::Field) -> Option<String> {
-    for meta_items in field
-        .attrs
-        .iter()
-        .filter_map(|attr| get_serde_meta_items(cx, attr).ok())
-    {
-        for meta_item in meta_items {
-            match meta_item {
-                NestedMeta::Meta(Meta::NameValue(nv))
-                    if nv
-                        .path
-                        .get_ident()
-                        .map_or(false, |i| *i == "rename") =>
-                {
-                    if let Lit::Str(lit) = nv.lit {
-                        return Some(lit.value());
-                    }
-                }
-                _ => continue,
-            }
-        }
-    }
-    None
-}
-
-fn unraw(ident: &Ident) -> String {
-    ident.to_string().trim_start_matches("r#").to_owned()
-}
+use serde_derive_internals::{
+    attr::{Default as SerdeDefault, Field},
+    Ctxt,
+};
+use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Fields};
 
 fn column_names(data: &DataStruct) -> TokenStream {
     match &data.fields {
@@ -63,11 +13,10 @@ fn column_names(data: &DataStruct) -> TokenStream {
             let column_names_iter = fields
                 .named
                 .iter()
-                .filter(|f| !serde_skipped(&cx, &f.attrs))
-                .map(|f| match serde_rename(&cx, f) {
-                    Some(name) => name,
-                    None => unraw(f.ident.as_ref().unwrap()),
-                });
+                .enumerate()
+                .map(|(index, field)| Field::from_ast(&cx, index, field, None, &SerdeDefault::None))
+                .filter(|field| !field.skip_serializing() && !field.skip_deserializing())
+                .map(|field| field.name().serialize_name().to_string());
 
             let tokens = quote! {
                 &[#( #column_names_iter,)*]

src/row.rs

@@ -4,6 +4,7 @@ pub trait Row {
     const COLUMN_NAMES: &'static [&'static str];
 
     // TODO: count
+    // TODO: different list for SELECT/INSERT (de/ser)
 }
 
 // Actually, it's not public now.
@@ -138,6 +139,21 @@ mod tests {
         assert_eq!(join_column_names::<TopLevel>().unwrap(), "`one`");
     }
 
+    #[test]
+    fn it_skips_deserializing() {
+        use serde::Deserialize;
+
+        #[derive(Row, Deserialize)]
+        #[allow(dead_code)]
+        struct TopLevel {
+            one: u32,
+            #[serde(skip_deserializing)]
+            two: u32,
+        }
+
+        assert_eq!(join_column_names::<TopLevel>().unwrap(), "`one`");
+    }
+
     #[test]
     fn it_rejects_other() {
         #[derive(Row)]