aboutsummaryrefslogtreecommitdiff
path: root/macros/src
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2023-08-15 23:15:19 +0200
committerHampusM <hampus@hampusmat.com>2023-08-15 23:18:59 +0200
commite381ae3b8649de47ba46925e402946658ac16d20 (patch)
tree32ecc7e4592f25d43dc1e76399d3fffae3272e1e /macros/src
parent9423d67efb161d9a94a7ab6c5899c6bc7ecaee7c (diff)
fix!: make the factory macro not change its input
BREAKING CHANGE: The factory macro no longer - Changes the return type to be inside of a TransientPtr - Adds Send + Sync bounds when the threadsafe or the async flag is set - Changes the return type be inside of a BoxFuture when the async flag is set
Diffstat (limited to 'macros/src')
-rw-r--r--macros/src/factory/type_alias.rs12
-rw-r--r--macros/src/lib.rs45
2 files changed, 10 insertions, 47 deletions
diff --git a/macros/src/factory/type_alias.rs b/macros/src/factory/type_alias.rs
index 790175b..fafcd54 100644
--- a/macros/src/factory/type_alias.rs
+++ b/macros/src/factory/type_alias.rs
@@ -1,7 +1,6 @@
use quote::ToTokens;
use syn::parse::{Parse, ParseStream};
-use syn::punctuated::Punctuated;
-use syn::{parse2, ItemType, Token, Type};
+use syn::{parse2, ItemType};
use crate::fn_trait::FnTrait;
@@ -9,8 +8,6 @@ pub struct FactoryTypeAlias
{
pub type_alias: ItemType,
pub factory_interface: FnTrait,
- pub arg_types: Punctuated<Type, Token![,]>,
- pub return_type: Type,
}
impl Parse for FactoryTypeAlias
@@ -27,8 +24,6 @@ impl Parse for FactoryTypeAlias
Ok(Self {
type_alias,
factory_interface: aliased_fn_trait.clone(),
- arg_types: aliased_fn_trait.inputs,
- return_type: aliased_fn_trait.output,
})
}
}
@@ -39,8 +34,9 @@ mod tests
use std::error::Error;
use quote::{format_ident, quote};
+ use syn::punctuated::Punctuated;
use syn::token::And;
- use syn::TypeReference;
+ use syn::{Type, TypeReference};
use super::*;
use crate::test_utils;
@@ -55,7 +51,7 @@ mod tests
let factory_type_alias = parse2::<FactoryTypeAlias>(input_args)?;
assert_eq!(
- factory_type_alias.arg_types,
+ factory_type_alias.factory_interface.inputs,
Punctuated::from_iter(vec![
test_utils::create_type(test_utils::create_path(&[
test_utils::create_path_segment(format_ident!("String"), &[])
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 41001ae..c179b95 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -248,15 +248,12 @@ pub fn injectable(args_stream: TokenStream, input_stream: TokenStream) -> TokenS
/// Makes a type alias usable as a factory interface.
///
-/// The return type is automatically put inside of a [`TransientPtr`].
-///
/// # Arguments
/// * (Zero or more) Flags. Like `a = true, b = false`
///
/// # Flags
/// - `threadsafe` - Mark as threadsafe.
-/// - `async` - Mark as async. Infers the `threadsafe` flag. The return type is
-/// automatically put inside of a pinned boxed future.
+/// - `async` - Mark as async. Infers the `threadsafe` flag.
///
/// # Examples
/// ```
@@ -277,7 +274,7 @@ pub fn injectable(args_stream: TokenStream, input_stream: TokenStream) -> TokenS
/// # impl IConfigurator for Configurator {}
/// #
/// #[factory]
-/// type IConfiguratorFactory = dyn Fn(Vec<String>) -> dyn IConfigurator;
+/// type IConfiguratorFactory = dyn Fn(Vec<String>) -> TransientPtr<dyn IConfigurator>;
/// ```
///
/// [`TransientPtr`]: https://docs.rs/syrette/latest/syrette/ptr/type.TransientPtr.html
@@ -288,16 +285,11 @@ pub fn injectable(args_stream: TokenStream, input_stream: TokenStream) -> TokenS
#[proc_macro_attribute]
pub fn factory(args_stream: TokenStream, input_stream: TokenStream) -> TokenStream
{
- use quote::ToTokens;
- use syn::{parse2, parse_str};
-
use crate::factory::build_declare_interfaces::build_declare_factory_interfaces;
use crate::factory::macro_args::FactoryMacroArgs;
use crate::factory::type_alias::FactoryTypeAlias;
- let input_stream: proc_macro2::TokenStream = input_stream.into();
-
- set_dummy(input_stream.clone());
+ set_dummy(input_stream.clone().into());
let FactoryMacroArgs { flags } = parse(args_stream).unwrap_or_abort();
@@ -318,34 +310,9 @@ pub fn factory(args_stream: TokenStream, input_stream: TokenStream) -> TokenStre
}
let FactoryTypeAlias {
- mut type_alias,
- mut factory_interface,
- arg_types: _,
- return_type: _,
- } = parse2(input_stream).unwrap_or_abort();
-
- let output = factory_interface.output.clone();
-
- factory_interface.output = parse(
- if is_async {
- quote! {
- syrette::future::BoxFuture<'static, syrette::ptr::TransientPtr<#output>>
- }
- } else {
- quote! {
- syrette::ptr::TransientPtr<#output>
- }
- }
- .into(),
- )
- .unwrap_or_abort();
-
- if is_threadsafe {
- factory_interface.add_trait_bound(parse_str("Send").unwrap_or_abort());
- factory_interface.add_trait_bound(parse_str("Sync").unwrap_or_abort());
- }
-
- type_alias.ty = Box::new(Type::Verbatim(factory_interface.to_token_stream()));
+ type_alias,
+ factory_interface,
+ } = parse(input_stream).unwrap_or_abort();
let decl_interfaces =
build_declare_factory_interfaces(&factory_interface, is_threadsafe);