macros: share Flavor between ser and deser macros

Author: wprzytula

scylla-macros/src/lib.rs

@@ -1,4 +1,4 @@
-use darling::ToTokens;
+use darling::{FromMeta, ToTokens};
 use proc_macro::TokenStream;
 
 mod from_row;
@@ -7,6 +7,24 @@ mod into_user_type;
 mod parser;
 mod value_list;
 
+// Flavor of serialization/deserialization macros ({De,S}erialize{Value,Row}).
+#[derive(Copy, Clone, PartialEq, Eq, Default)]
+enum Flavor {
+    #[default]
+    MatchByName,
+    EnforceOrder,
+}
+
+impl FromMeta for Flavor {
+    fn from_string(value: &str) -> darling::Result<Self> {
+        match value {
+            "match_by_name" => Ok(Self::MatchByName),
+            "enforce_order" => Ok(Self::EnforceOrder),
+            _ => Err(darling::Error::unknown_value(value)),
+        }
+    }
+}
+
 mod serialize;
 
 /// Documentation for this macro can only be found

scylla-macros/src/serialize/mod.rs

@@ -1,21 +1,2 @@
-use darling::FromMeta;
-
 pub(crate) mod row;
 pub(crate) mod value;
-
-#[derive(Copy, Clone, PartialEq, Eq, Default)]
-enum Flavor {
-    #[default]
-    MatchByName,
-    EnforceOrder,
-}
-
-impl FromMeta for Flavor {
-    fn from_string(value: &str) -> darling::Result<Self> {
-        match value {
-            "match_by_name" => Ok(Self::MatchByName),
-            "enforce_order" => Ok(Self::EnforceOrder),
-            _ => Err(darling::Error::unknown_value(value)),
-        }
-    }
-}

scylla-macros/src/serialize/row.rs

@@ -5,7 +5,7 @@ use proc_macro::TokenStream;
 use proc_macro2::Span;
 use syn::parse_quote;
 
-use super::Flavor;
+use crate::Flavor;
 
 #[derive(FromAttributes)]
 #[darling(attributes(scylla))]

scylla-macros/src/serialize/value.rs

@@ -5,7 +5,7 @@ use proc_macro::TokenStream;
 use proc_macro2::Span;
 use syn::parse_quote;
 
-use super::Flavor;
+use crate::Flavor;
 
 #[derive(FromAttributes)]
 #[darling(attributes(scylla))]