From f8352122a301c30db7c7851ebf50ad1608ebdad3 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 3 Jan 2023 15:10:59 +0100
Subject: Min codegen

---
 macros/src/syntax/parse/util.rs | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'macros/src/syntax/parse/util.rs')

diff --git a/macros/src/syntax/parse/util.rs b/macros/src/syntax/parse/util.rs
index 3fa51ef..119129c 100644
--- a/macros/src/syntax/parse/util.rs
+++ b/macros/src/syntax/parse/util.rs
@@ -3,8 +3,8 @@ use syn::{
     parse::{self, ParseStream},
     punctuated::Punctuated,
     spanned::Spanned,
-    Abi, AttrStyle, Attribute, Expr, FnArg, ForeignItemFn, Ident, ItemFn, Pat, PatType, Path,
-    PathArguments, ReturnType, Token, Type, Visibility,
+    Abi, AttrStyle, Attribute, Expr, FnArg, ForeignItemFn, Ident, ItemFn, Pat, Path, PathArguments,
+    ReturnType, Token, Type, Visibility,
 };
 
 use crate::syntax::{
@@ -231,29 +231,23 @@ pub fn parse_local_resources(content: ParseStream<'_>) -> parse::Result<LocalRes
     Ok(resources)
 }
 
-type ParseInputResult = Option<(Box<Pat>, Result<Vec<PatType>, FnArg>)>;
-
-pub fn parse_inputs(inputs: Punctuated<FnArg, Token![,]>, name: &str) -> ParseInputResult {
+pub fn parse_inputs(inputs: Punctuated<FnArg, Token![,]>, name: &str) -> Option<Box<Pat>> {
     let mut inputs = inputs.into_iter();
 
     match inputs.next() {
         Some(FnArg::Typed(first)) => {
             if type_is_path(&first.ty, &[name, "Context"]) {
-                let rest = inputs
-                    .map(|arg| match arg {
-                        FnArg::Typed(arg) => Ok(arg),
-                        _ => Err(arg),
-                    })
-                    .collect::<Result<Vec<_>, _>>();
-
-                Some((first.pat, rest))
-            } else {
-                None
+                // No more inputs
+                if inputs.next().is_none() {
+                    return Some(first.pat);
+                }
             }
         }
 
-        _ => None,
+        _ => {}
     }
+
+    None
 }
 
 pub fn type_is_bottom(ty: &ReturnType) -> bool {
-- 
cgit v1.2.3