Switch HashMap in FormatData to Vec<(_, _)> to remove syn features

Author: luisfi-dev

impl/Cargo.toml

@@ -33,7 +33,7 @@ panic = "warn"
 proc-macro2 = "1.0.101"
 quote = "1.0.40"
 regex = "1.11.2"
-syn = { version = "2.0.106", features = ["full", "extra-traits"] }
+syn = { version = "2.0.106", features = [] }
 
 [dev-dependencies]
 error-stack = "0.6.0"

impl/src/types/fmt/input.rs

@@ -1,3 +1,6 @@
+#[cfg(test)]
+use std::fmt::{self, Debug, Formatter};
+
 use proc_macro2::{Span, TokenStream as TokenStream2};
 use quote::{ToTokens, quote};
 use regex::Regex;
@@ -8,12 +11,18 @@ use syn::{
     token::Comma,
 };
 
-#[derive(Debug)]
 pub(crate) struct StructFormatInput {
     lit_str: LitStr,
     args: Punctuated<Expr, Comma>,
 }
 
+#[cfg(test)]
+impl Debug for StructFormatInput {
+    fn fmt(&self, _: &mut Formatter<'_>) -> fmt::Result {
+        Ok(())
+    }
+}
+
 impl Parse for StructFormatInput {
     fn parse(input: ParseStream) -> syn::Result<Self> {
         let mut lit_str: LitStr = input.parse()?;
@@ -66,12 +75,18 @@ impl ToTokens for StructFormatInput {
     }
 }
 
-#[derive(Debug)]
 pub(crate) struct EnumVariantFormatInput {
     lit_str: LitStr,
     args: Punctuated<Ident, Comma>,
 }
 
+#[cfg(test)]
+impl Debug for EnumVariantFormatInput {
+    fn fmt(&self, _: &mut Formatter<'_>) -> fmt::Result {
+        Ok(())
+    }
+}
+
 impl Parse for EnumVariantFormatInput {
     fn parse(input: ParseStream) -> syn::Result<Self> {
         let mut lit_str: LitStr = input.parse()?;

impl/src/types/fmt/mod.rs

@@ -1,4 +1,5 @@
-use std::collections::HashMap;
+#[cfg(test)]
+use std::fmt::{self, Debug, Formatter};
 
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{ToTokens, quote};
@@ -12,15 +13,14 @@ use input::{EnumVariantFormatInput, StructFormatInput};
 
 use crate::util::traits::IteratorExt;
 
-#[derive(Debug)]
 pub(crate) enum FormatData {
     Struct {
         display_input: StructFormatInput,
     },
 
     Enum {
         default_display_input: Option<LitStr>,
-        variant_display_inputs: HashMap<Variant, EnumVariantFormatInput>,
+        variant_display_inputs: Vec<(Variant, EnumVariantFormatInput)>,
     },
 
     EmptyEnum,
@@ -59,7 +59,7 @@ impl FormatData {
                         Self::get_format_input(attr)
                             .map(|input| (variant.clone(), input))
                     })
-                    .collect_hashmap_and_combine_syn_errors();
+                    .collect_vec_and_combine_syn_errors();
 
                 if let Some(attr) = default_display_attr {
                     let default_display_input =
@@ -143,6 +143,13 @@ impl FormatData {
     }
 }
 
+#[cfg(test)]
+impl Debug for FormatData {
+    fn fmt(&self, _: &mut Formatter<'_>) -> fmt::Result {
+        Ok(())
+    }
+}
+
 impl ToTokens for FormatData {
     fn to_tokens(&self, tokens: &mut TokenStream2) {
         match self {

impl/src/types/mod.rs

@@ -8,7 +8,6 @@ use syn::{
 mod fmt;
 use fmt::FormatData;
 
-#[derive(Debug)]
 pub(crate) struct ErrorStackDeriveInput {
     ident: Ident,
     display_data: FormatData,

impl/src/util/traits.rs

@@ -1,20 +1,15 @@
-use std::{collections::HashMap, hash::Hash};
-
-pub(crate) trait IteratorExt<K, V>:
-    Sized + Iterator<Item = syn::Result<(K, V)>>
-where
-    K: Eq + Hash,
+pub(crate) trait IteratorExt<T>:
+    Sized + Iterator<Item = syn::Result<T>>
 {
-    fn collect_hashmap_and_combine_syn_errors(
-        mut self,
-    ) -> syn::Result<HashMap<K, V>> {
-        let mut map = HashMap::new();
+    fn collect_vec_and_combine_syn_errors(mut self) -> syn::Result<Vec<T>> {
+        let mut vec = Vec::new();
 
         while let Some(res) = self.next() {
             match res {
-                Ok((k, v)) => {
-                    map.insert(k, v);
+                Ok(item) => {
+                    vec.push(item);
                 }
+
                 Err(mut err) => {
                     while let Some(Err(err2)) = self.next() {
                         err.combine(err2);
@@ -25,13 +20,8 @@ where
             }
         }
 
-        Ok(map)
+        Ok(vec)
     }
 }
 
-impl<I, K, V> IteratorExt<K, V> for I
-where
-    I: Sized + Iterator<Item = syn::Result<(K, V)>>,
-    K: Eq + Hash,
-{
-}
+impl<I, T> IteratorExt<T> for I where I: Sized + Iterator<Item = syn::Result<T>> {}