From 8976c166cff4c98c43cdc409275f548eb27ecb13 Mon Sep 17 00:00:00 2001 From: HampusM Date: Mon, 18 Jul 2022 20:48:41 +0200 Subject: refactor: reduce the capabilities of the castable_to macro --- syrette_macros/src/libs/intertrait_macros/args.rs | 77 +++-------------------- 1 file changed, 7 insertions(+), 70 deletions(-) (limited to 'syrette_macros/src/libs/intertrait_macros/args.rs') diff --git a/syrette_macros/src/libs/intertrait_macros/args.rs b/syrette_macros/src/libs/intertrait_macros/args.rs index d576ae2..a49567f 100644 --- a/syrette_macros/src/libs/intertrait_macros/args.rs +++ b/syrette_macros/src/libs/intertrait_macros/args.rs @@ -11,89 +11,26 @@ * at your option. */ -use std::collections::HashSet; - -use syn::bracketed; use syn::parse::{Parse, ParseStream, Result}; -use syn::punctuated::Punctuated; -use syn::{Error, Ident, Path, Token, Type}; - -#[derive(Hash, PartialEq, Eq)] -pub enum Flag -{ - Sync, -} - -impl Flag -{ - fn from(ident: &Ident) -> Result - { - match ident.to_string().as_str() { - "sync" => Ok(Flag::Sync), - unknown => { - let msg = format!("Unknown flag: {}", unknown); - Err(Error::new_spanned(ident, msg)) - } - } - } -} - -pub struct Targets -{ - pub flags: HashSet, - pub paths: Vec, -} +use syn::{Path, Token, Type}; -impl Parse for Targets -{ - fn parse(input: ParseStream) -> Result - { - let mut flags = HashSet::new(); - let mut paths = Vec::new(); - - if input.is_empty() { - return Ok(Targets { flags, paths }); - } - - if input.peek(syn::token::Bracket) { - let content; - bracketed!(content in input); - for ident in Punctuated::::parse_terminated(&content)? { - if !flags.insert(Flag::from(&ident)?) { - let msg = format!("Duplicated flag: {}", ident); - return Err(Error::new_spanned(ident, msg)); - } - } - } - - if input.is_empty() { - return Ok(Targets { flags, paths }); - } - - paths = Punctuated::::parse_terminated(input)? - .into_iter() - .collect(); - - Ok(Targets { flags, paths }) - } -} - -pub struct Casts +pub struct Cast { pub ty: Type, - pub targets: Targets, + pub target: Path, } -impl Parse for Casts +impl Parse for Cast { fn parse(input: ParseStream) -> Result { let ty: Type = input.parse()?; + input.parse::]>()?; - Ok(Casts { + Ok(Cast { ty, - targets: input.parse()?, + target: input.parse()?, }) } } -- cgit v1.2.3-18-g5258