diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/di_container/asynchronous/mod.rs | 8 | ||||
-rw-r--r-- | src/lib.rs | 2 | ||||
-rw-r--r-- | src/private/castable_factory/threadsafe.rs | 71 | ||||
-rw-r--r-- | src/private/factory.rs | 4 |
4 files changed, 12 insertions, 73 deletions
diff --git a/src/di_container/asynchronous/mod.rs b/src/di_container/asynchronous/mod.rs index e651d81..827364d 100644 --- a/src/di_container/asynchronous/mod.rs +++ b/src/di_container/asynchronous/mod.rs @@ -299,7 +299,9 @@ impl AsyncDIContainer } })?; - Ok(SomePtr::ThreadsafeFactory(factory(self.clone()).into())) + Ok(SomePtr::ThreadsafeFactory( + factory.call(self.clone()).into(), + )) } #[cfg(feature = "factory")] AsyncProvidable::DefaultFactory(binding) => { @@ -315,7 +317,7 @@ impl AsyncDIContainer DefaultFactoryFn<Interface>, >(binding, "default factory")?; - Ok(SomePtr::Transient(default_factory(self.clone())())) + Ok(SomePtr::Transient(default_factory.call(self.clone())())) } #[cfg(feature = "factory")] AsyncProvidable::AsyncDefaultFactory(binding) => { @@ -337,7 +339,7 @@ impl AsyncDIContainer )?; Ok(SomePtr::Transient( - async_default_factory(self.clone())().await, + async_default_factory.call(self.clone())().await, )) } } @@ -1,4 +1,4 @@ -#![cfg_attr(feature = "factory", feature(unboxed_closures, fn_traits, tuple_trait))] +#![cfg_attr(feature = "factory", feature(unboxed_closures, tuple_trait))] #![cfg_attr(doc_cfg, feature(doc_cfg))] #![deny(clippy::all)] #![deny(clippy::pedantic)] diff --git a/src/private/castable_factory/threadsafe.rs b/src/private/castable_factory/threadsafe.rs index cb8a04b..6e608b1 100644 --- a/src/private/castable_factory/threadsafe.rs +++ b/src/private/castable_factory/threadsafe.rs @@ -11,7 +11,7 @@ where DIContainerT: 'static, ReturnInterface: 'static + ?Sized, { - func: &'static (dyn Fn<(Arc<DIContainerT>,), Output = TransientPtr<ReturnInterface>> + func: &'static (dyn Fn(Arc<DIContainerT>) -> TransientPtr<ReturnInterface> + Send + Sync), } @@ -38,44 +38,9 @@ where DIContainerT: 'static, ReturnInterface: 'static + ?Sized, { -} - -impl<ReturnInterface, DIContainerT> Fn<(Arc<DIContainerT>,)> - for ThreadsafeCastableFactory<ReturnInterface, DIContainerT> -where - DIContainerT: 'static, - ReturnInterface: 'static + ?Sized, -{ - extern "rust-call" fn call(&self, args: (Arc<DIContainerT>,)) -> Self::Output + fn call(&self, di_container: Arc<DIContainerT>) -> TransientPtr<ReturnInterface> { - self.func.call(args) - } -} - -impl<ReturnInterface, DIContainerT> FnMut<(Arc<DIContainerT>,)> - for ThreadsafeCastableFactory<ReturnInterface, DIContainerT> -where - DIContainerT: 'static, - ReturnInterface: 'static + ?Sized, -{ - extern "rust-call" fn call_mut(&mut self, args: (Arc<DIContainerT>,)) - -> Self::Output - { - self.call(args) - } -} - -impl<ReturnInterface, DIContainerT> FnOnce<(Arc<DIContainerT>,)> - for ThreadsafeCastableFactory<ReturnInterface, DIContainerT> -where - DIContainerT: 'static, - ReturnInterface: 'static + ?Sized, -{ - type Output = TransientPtr<ReturnInterface>; - - extern "rust-call" fn call_once(self, args: (Arc<DIContainerT>,)) -> Self::Output - { - self.call(args) + (self.func)(di_container) } } @@ -133,36 +98,8 @@ mod tests let mock_di_container = Arc::new(MockAsyncDIContainer::new()); - let output = castable_factory.call((mock_di_container,)); + let output = castable_factory.call(mock_di_container); assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 27 })); } - - #[test] - fn can_call_mut() - { - let mut castable_factory = ThreadsafeCastableFactory::new(&|_| { - TransientPtr::new(Bacon { heal_amount: 1092 }) - }); - - let mock_di_container = Arc::new(MockAsyncDIContainer::new()); - - let output = castable_factory.call_mut((mock_di_container,)); - - assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 1092 })); - } - - #[test] - fn can_call_once() - { - let castable_factory = ThreadsafeCastableFactory::new(&|_| { - TransientPtr::new(Bacon { heal_amount: 547 }) - }); - - let mock_di_container = Arc::new(MockAsyncDIContainer::new()); - - let output = castable_factory.call_once((mock_di_container,)); - - assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 547 })); - } } diff --git a/src/private/factory.rs b/src/private/factory.rs index 730338f..c1672e1 100644 --- a/src/private/factory.rs +++ b/src/private/factory.rs @@ -15,9 +15,9 @@ where /// Interface for a threadsafe factory. #[cfg(feature = "async")] pub trait IThreadsafeFactory<ReturnInterface, DIContainerT>: - Fn<(Arc<DIContainerT>,), Output = TransientPtr<ReturnInterface>> - + crate::private::cast::CastFromArc + crate::private::cast::CastFromArc where ReturnInterface: 'static + ?Sized, { + fn call(&self, di_container: Arc<DIContainerT>) -> TransientPtr<ReturnInterface>; } |