fix(macros): enumerate after filtering (#288)

specta-rs · Nov 4, 2024 · 03b4e9a · 03b4e9a
1 parent 8509af0
commit 03b4e9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/specta-macros/src/type/enum.rs b/specta-macros/src/type/enum.rs
@@ -23,11 +23,11 @@ pub fn parse_enum(
     let generic_idents = generics
         .params
         .iter()
-        .enumerate()
-        .filter_map(|(i, p)| match p {
-            GenericParam::Type(t) => Some((i, &t.ident)),
+        .filter_map(|p| match p {
+            GenericParam::Type(t) => Some(&t.ident),
             _ => None,
-        });
+        })
+        .enumerate();
 
     let definition_generics = generic_idents.clone().map(|(_, ident)| {
         let ident = ident.to_string();

diff --git a/specta-macros/src/type/struct.rs b/specta-macros/src/type/struct.rs
@@ -46,11 +46,11 @@ pub fn parse_struct(
     let generic_idents = generics
         .params
         .iter()
-        .enumerate()
-        .filter_map(|(i, p)| match p {
-            GenericParam::Type(t) => Some((i, &t.ident)),
+        .filter_map(|p| match p {
+            GenericParam::Type(t) => Some(&t.ident),
             _ => None,
         })
+        .enumerate()
         .collect::<Vec<_>>();
 
     let reference_generics = generic_idents.iter().map(|(i, ident)| {