From e381ae3b8649de47ba46925e402946658ac16d20 Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 15 Aug 2023 23:15:19 +0200 Subject: 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 --- src/di_container/asynchronous/binding/builder.rs | 25 ++++++++---- src/di_container/asynchronous/mod.rs | 6 ++- src/di_container/blocking/binding/builder.rs | 7 ++-- src/di_container/blocking/mod.rs | 48 +++++++++--------------- 4 files changed, 44 insertions(+), 42 deletions(-) (limited to 'src') diff --git a/src/di_container/asynchronous/binding/builder.rs b/src/di_container/asynchronous/binding/builder.rs index 45597e8..306d196 100644 --- a/src/di_container/asynchronous/binding/builder.rs +++ b/src/di_container/asynchronous/binding/builder.rs @@ -147,7 +147,7 @@ where /// # impl Foo for Bar {} /// # /// # #[factory(threadsafe = true)] - /// # type FooFactory = dyn Fn(i32, String) -> dyn Foo; + /// # type FooFactory = dyn Fn(i32, String) -> TransientPtr + Send + Sync; /// # /// # #[tokio::main] /// # async fn main() -> Result<(), Box> @@ -226,6 +226,7 @@ where /// # use syrette::{factory}; /// # use syrette::di_container::asynchronous::prelude::*; /// # use syrette::ptr::TransientPtr; + /// # use syrette::future::BoxFuture; /// # /// # trait Foo: Send + Sync {} /// # @@ -238,7 +239,10 @@ where /// # impl Foo for Bar {} /// # /// # #[factory(async = true)] - /// # type FooFactory = dyn Fn(i32, String) -> dyn Foo; + /// # type FooFactory = dyn Fn(i32, String) -> BoxFuture< + /// # 'static, + /// # TransientPtr + /// # > + Send + Sync; /// # /// # #[tokio::main] /// # async fn main() -> Result<(), Box> @@ -546,10 +550,12 @@ mod tests #[factory(threadsafe = true)] type IUserManagerFactory = dyn Fn( - String, - i32, - subjects_async::Number, - ) -> dyn subjects_async::IUserManager; + String, + i32, + subjects_async::Number, + ) -> TransientPtr + + Send + + Sync; let mut di_container_mock = mocks::async_di_container::MockAsyncDIContainer::new(); @@ -590,12 +596,17 @@ mod tests #[cfg(feature = "factory")] async fn can_bind_to_async_factory() -> Result<(), Box> { + use crate::future::BoxFuture; use crate::ptr::TransientPtr; use crate::test_utils::async_closure; use crate::{self as syrette, factory}; + #[rustfmt::skip] #[factory(async = true)] - type IUserManagerFactory = dyn Fn(String) -> dyn subjects_async::IUserManager; + type IUserManagerFactory = dyn Fn(String) -> BoxFuture< + 'static, + TransientPtr + > + Send + Sync; let mut di_container_mock = mocks::async_di_container::MockAsyncDIContainer::new(); diff --git a/src/di_container/asynchronous/mod.rs b/src/di_container/asynchronous/mod.rs index 927f549..d330f4a 100644 --- a/src/di_container/asynchronous/mod.rs +++ b/src/di_container/asynchronous/mod.rs @@ -657,7 +657,8 @@ mod tests use crate::private::castable_factory::threadsafe::ThreadsafeCastableFactory; #[crate::factory(threadsafe = true)] - type IUserManagerFactory = dyn Fn(Vec) -> dyn IUserManager; + type IUserManagerFactory = + dyn Fn(Vec) -> TransientPtr + Send + Sync; let di_container = AsyncDIContainer::new(); @@ -752,7 +753,8 @@ mod tests use crate::private::castable_factory::threadsafe::ThreadsafeCastableFactory; #[crate::factory(threadsafe = true)] - type IUserManagerFactory = dyn Fn(Vec) -> dyn IUserManager; + type IUserManagerFactory = + dyn Fn(Vec) -> TransientPtr + Send + Sync; let di_container = AsyncDIContainer::new(); diff --git a/src/di_container/blocking/binding/builder.rs b/src/di_container/blocking/binding/builder.rs index 991961c..91855f5 100644 --- a/src/di_container/blocking/binding/builder.rs +++ b/src/di_container/blocking/binding/builder.rs @@ -151,10 +151,10 @@ where /// # impl ICustomer for Customer {} /// # /// # #[factory] - /// # type ICustomerFactory = dyn Fn(String, u32) -> dyn ICustomer; + /// # type ICustomerFactory = dyn Fn(String, u32) -> TransientPtr; /// # /// # #[factory] - /// # type ICustomerIDFactory = dyn Fn(u32) -> dyn ICustomerID; + /// # type ICustomerIDFactory = dyn Fn(u32) -> TransientPtr; /// # /// # fn main() -> Result<(), Box> /// # { @@ -354,7 +354,8 @@ mod tests use crate::ptr::TransientPtr; #[factory] - type IUserManagerFactory = dyn Fn(i32, String) -> dyn subjects::IUserManager; + type IUserManagerFactory = + dyn Fn(i32, String) -> TransientPtr; let mut mock_di_container = mocks::blocking_di_container::MockDIContainer::new(); diff --git a/src/di_container/blocking/mod.rs b/src/di_container/blocking/mod.rs index 5781583..aa89aad 100644 --- a/src/di_container/blocking/mod.rs +++ b/src/di_container/blocking/mod.rs @@ -493,28 +493,22 @@ mod tests } } - type FactoryFunc = dyn Fn< - (std::rc::Rc,), - Output = Box< - dyn Fn<(Vec,), Output = crate::ptr::TransientPtr>, - >, - >; - use crate as syrette; #[crate::factory] - type IUserManagerFactory = dyn Fn(Vec) -> dyn IUserManager; + type IUserManagerFactory = dyn Fn(Vec) -> TransientPtr; let di_container = DIContainer::new(); - let factory_func: &'static FactoryFunc = &|_: Rc| { - Box::new(move |users| { - let user_manager: TransientPtr = - TransientPtr::new(UserManager::new(users)); + let factory_func: &dyn Fn(Rc) -> Box = + &|_: Rc| { + Box::new(move |users| { + let user_manager: TransientPtr = + TransientPtr::new(UserManager::new(users)); - user_manager - }) - }; + user_manager + }) + }; let mut mock_provider = mocks::blocking_provider::MockProvider::new(); @@ -577,28 +571,22 @@ mod tests } } - type FactoryFunc = dyn Fn< - (std::rc::Rc,), - Output = Box< - dyn Fn<(Vec,), Output = crate::ptr::TransientPtr>, - >, - >; - use crate as syrette; #[crate::factory] - type IUserManagerFactory = dyn Fn(Vec) -> dyn IUserManager; + type IUserManagerFactory = dyn Fn(Vec) -> TransientPtr; let di_container = DIContainer::new(); - let factory_func: &'static FactoryFunc = &|_: Rc| { - Box::new(move |users| { - let user_manager: TransientPtr = - TransientPtr::new(UserManager::new(users)); + let factory_func: &dyn Fn(Rc) -> Box = + &|_: Rc| { + Box::new(move |users| { + let user_manager: TransientPtr = + TransientPtr::new(UserManager::new(users)); - user_manager - }) - }; + user_manager + }) + }; let mut mock_provider = mocks::blocking_provider::MockProvider::new(); -- cgit v1.2.3-18-g5258