From 080cc42bb1da09059dbc35049a7ded0649961e0c Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Mon, 29 Aug 2022 20:52:56 +0200
Subject: feat: implement async functionality

---
 macros/src/injectable_macro_args.rs | 55 ++++++++++++-------------------------
 1 file changed, 17 insertions(+), 38 deletions(-)

(limited to 'macros/src/injectable_macro_args.rs')

diff --git a/macros/src/injectable_macro_args.rs b/macros/src/injectable_macro_args.rs
index 43f8e11..6cc1d7e 100644
--- a/macros/src/injectable_macro_args.rs
+++ b/macros/src/injectable_macro_args.rs
@@ -1,49 +1,16 @@
 use syn::parse::{Parse, ParseStream};
 use syn::punctuated::Punctuated;
-use syn::{braced, Ident, LitBool, Token, TypePath};
+use syn::{braced, Token, TypePath};
 
+use crate::macro_flag::MacroFlag;
 use crate::util::iterator_ext::IteratorExt;
 
-pub const INJECTABLE_MACRO_FLAGS: &[&str] = &["no_doc_hidden"];
-
-pub struct InjectableMacroFlag
-{
-    pub flag: Ident,
-    pub is_on: LitBool,
-}
-
-impl Parse for InjectableMacroFlag
-{
-    fn parse(input: ParseStream) -> syn::Result<Self>
-    {
-        let input_forked = input.fork();
-
-        let flag: Ident = input_forked.parse()?;
-
-        let flag_str = flag.to_string();
-
-        if !INJECTABLE_MACRO_FLAGS.contains(&flag_str.as_str()) {
-            return Err(input.error(format!(
-                "Unknown flag '{}'. Expected one of [ {} ]",
-                flag_str,
-                INJECTABLE_MACRO_FLAGS.join(",")
-            )));
-        }
-
-        input.parse::<Ident>()?;
-
-        input.parse::<Token![=]>()?;
-
-        let is_on: LitBool = input.parse()?;
-
-        Ok(Self { flag, is_on })
-    }
-}
+pub const INJECTABLE_MACRO_FLAGS: &[&str] = &["no_doc_hidden", "async"];
 
 pub struct InjectableMacroArgs
 {
     pub interface: Option<TypePath>,
-    pub flags: Punctuated<InjectableMacroFlag, Token![,]>,
+    pub flags: Punctuated<MacroFlag, Token![,]>,
 }
 
 impl Parse for InjectableMacroArgs
@@ -76,7 +43,19 @@ impl Parse for InjectableMacroArgs
 
         braced!(braced_content in input);
 
-        let flags = braced_content.parse_terminated(InjectableMacroFlag::parse)?;
+        let flags = braced_content.parse_terminated(MacroFlag::parse)?;
+
+        for flag in &flags {
+            let flag_str = flag.flag.to_string();
+
+            if !INJECTABLE_MACRO_FLAGS.contains(&flag_str.as_str()) {
+                return Err(input.error(format!(
+                    "Unknown flag '{}'. Expected one of [ {} ]",
+                    flag_str,
+                    INJECTABLE_MACRO_FLAGS.join(",")
+                )));
+            }
+        }
 
         let flag_names = flags
             .iter()
-- 
cgit v1.2.3-18-g5258