OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-03-22 06:45:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove get_or_return!, use ?/Result instead

Browse source
This commit is contained in:
Maybe Waffle 2022-08-22 15:32:57 +04:00
parent 845cd453d6
commit af6e18149f
1 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/lib.rs
View file

@ -17,29 +17,21 @@ use crate::{
}; };
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::{quote, ToTokens}; use quote::{quote, ToTokens};
use syn::{parse_macro_input, DeriveInput, Fields}; use syn::{DeriveInput, Fields};
macro_rules! get_or_return {
($($some:tt)*) => {
match $($some)* {
Ok(elem) => elem,
Err(e) => return e
}
}
}
#[proc_macro_derive(BotCommands, attributes(command))] #[proc_macro_derive(BotCommands, attributes(command))]
pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream { pub fn bot_commands_derive(tokens: TokenStream) -> TokenStream {
let input = parse_macro_input!(tokens as DeriveInput); bot_commands_impl(tokens).unwrap_or_else(|err| err)
}
let data_enum: &syn::DataEnum = get_or_return!(get_enum_data(&input)); fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, TokenStream> {
let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)
.map_err(|e| compile_error(e.to_compile_error()))?;
let enum_attrs: Vec<Attr> = get_or_return!(parse_attributes(&input.attrs)); let data_enum: &syn::DataEnum = get_enum_data(&input)?;
let enum_attrs: Vec<Attr> = parse_attributes(&input.attrs)?;
let command_enum = match CommandEnum::try_from(enum_attrs.as_slice()) { let command_enum =
Ok(command_enum) => command_enum, CommandEnum::try_from(enum_attrs.as_slice()).map_err(compile_error)?;
Err(e) => return compile_error(e),
};
let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect(); let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect();
@ -47,19 +39,16 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
for variant in variants.iter() { for variant in variants.iter() {
let mut attrs = Vec::new(); let mut attrs = Vec::new();
for attr in &variant.attrs { for attr in &variant.attrs {
match attr.parse_args::<VecAttrs>() { let mut attrs_ = attr
Ok(mut attrs_) => { .parse_args::<VecAttrs>()
attrs.append(attrs_.data.as_mut()); .map_err(|e| compile_error(e.to_compile_error()))?;
} attrs.append(attrs_.data.as_mut());
Err(e) => {
return compile_error(e.to_compile_error());
}
}
}
match Command::try_from(attrs.as_slice(), &variant.ident.to_string()) {
Ok(command) => variant_infos.push(command),
Err(e) => return compile_error(e),
} }
let command =
Command::try_from(attrs.as_slice(), &variant.ident.to_string())
.map_err(compile_error)?;
variant_infos.push(command);
} }
let mut vec_impl_create = vec![]; let mut vec_impl_create = vec![];
@ -99,7 +88,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
} }
}; };
TokenStream::from(trait_impl) Ok(TokenStream::from(trait_impl))
} }
fn impl_commands( fn impl_commands(