From 0f2756536e8fc311119da2af5b4dcc33f41bec6e Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Wed, 4 Oct 2023 12:51:06 +0200
Subject: refactor!: remove factory & declare_default_factory macros

BREAKING CHANGE: The factory and the declare_default_factory macros have been removed. They are no longer needed to use factories
---
 src/private/castable_factory/mod.rs        |  91 -------------------------
 src/private/castable_factory/threadsafe.rs | 103 -----------------------------
 2 files changed, 194 deletions(-)
 delete mode 100644 src/private/castable_factory/mod.rs
 delete mode 100644 src/private/castable_factory/threadsafe.rs

(limited to 'src/private/castable_factory')

diff --git a/src/private/castable_factory/mod.rs b/src/private/castable_factory/mod.rs
deleted file mode 100644
index 2ac5918..0000000
--- a/src/private/castable_factory/mod.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use std::any::type_name;
-use std::fmt::Debug;
-
-use crate::private::any_factory::AnyFactory;
-use crate::private::factory::IFactory;
-use crate::ptr::TransientPtr;
-
-#[cfg(feature = "async")]
-pub mod threadsafe;
-
-pub struct CastableFactory<ReturnInterface, DIContainerT>
-where
-    ReturnInterface: 'static + ?Sized,
-    DIContainerT: 'static,
-{
-    func: &'static dyn Fn(&DIContainerT) -> TransientPtr<ReturnInterface>,
-}
-
-impl<ReturnInterface, DIContainerT> CastableFactory<ReturnInterface, DIContainerT>
-where
-    ReturnInterface: 'static + ?Sized,
-{
-    pub fn new(
-        func: &'static dyn Fn(&DIContainerT) -> TransientPtr<ReturnInterface>,
-    ) -> Self
-    {
-        Self { func }
-    }
-}
-
-impl<ReturnInterface, DIContainerT> IFactory<ReturnInterface, DIContainerT>
-    for CastableFactory<ReturnInterface, DIContainerT>
-where
-    ReturnInterface: 'static + ?Sized,
-{
-    fn call(&self, di_container: &DIContainerT) -> TransientPtr<ReturnInterface>
-    {
-        (self.func)(di_container)
-    }
-}
-
-impl<ReturnInterface, DIContainerT> AnyFactory
-    for CastableFactory<ReturnInterface, DIContainerT>
-where
-    ReturnInterface: 'static + ?Sized,
-    DIContainerT: 'static,
-{
-}
-
-impl<ReturnInterface, DIContainerT> Debug
-    for CastableFactory<ReturnInterface, DIContainerT>
-where
-    ReturnInterface: 'static + ?Sized,
-{
-    #[cfg(not(tarpaulin_include))]
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result
-    {
-        let ret = type_name::<TransientPtr<ReturnInterface>>();
-
-        formatter.write_fmt(format_args!(
-            "CastableFactory (&DIContainer) -> {ret} {{ ... }}"
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use super::*;
-    use crate::di_container::blocking::MockDIContainer;
-
-    #[derive(Debug, PartialEq, Eq)]
-    struct Bacon
-    {
-        heal_amount: u32,
-    }
-
-    #[test]
-    fn can_call()
-    {
-        let castable_factory = CastableFactory::new(&|_: &MockDIContainer| {
-            TransientPtr::new(Bacon { heal_amount: 27 })
-        });
-
-        let mock_di_container = MockDIContainer::new();
-
-        let output = castable_factory.call(&mock_di_container);
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 27 }));
-    }
-}
diff --git a/src/private/castable_factory/threadsafe.rs b/src/private/castable_factory/threadsafe.rs
deleted file mode 100644
index 6e8da42..0000000
--- a/src/private/castable_factory/threadsafe.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use std::any::type_name;
-use std::fmt::Debug;
-
-use crate::private::any_factory::{AnyFactory, AnyThreadsafeFactory};
-use crate::private::factory::IThreadsafeFactory;
-use crate::ptr::TransientPtr;
-
-pub struct ThreadsafeCastableFactory<ReturnInterface, DIContainerT>
-where
-    DIContainerT: 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    func: &'static (dyn Fn(&DIContainerT) -> TransientPtr<ReturnInterface> + Send + Sync),
-}
-
-impl<ReturnInterface, DIContainerT>
-    ThreadsafeCastableFactory<ReturnInterface, DIContainerT>
-where
-    DIContainerT: 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    pub fn new(
-        func: &'static (dyn Fn(&DIContainerT) -> TransientPtr<ReturnInterface>
-                      + Send
-                      + Sync),
-    ) -> Self
-    {
-        Self { func }
-    }
-}
-
-impl<ReturnInterface, DIContainerT> IThreadsafeFactory<ReturnInterface, DIContainerT>
-    for ThreadsafeCastableFactory<ReturnInterface, DIContainerT>
-where
-    DIContainerT: 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    fn call(&self, di_container: &DIContainerT) -> TransientPtr<ReturnInterface>
-    {
-        (self.func)(di_container)
-    }
-}
-
-impl<ReturnInterface, DIContainerT> AnyFactory
-    for ThreadsafeCastableFactory<ReturnInterface, DIContainerT>
-where
-    DIContainerT: 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<ReturnInterface, DIContainerT> AnyThreadsafeFactory
-    for ThreadsafeCastableFactory<ReturnInterface, DIContainerT>
-where
-    DIContainerT: 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<ReturnInterface, DIContainerT> Debug
-    for ThreadsafeCastableFactory<ReturnInterface, DIContainerT>
-where
-    DIContainerT: 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    #[cfg(not(tarpaulin_include))]
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result
-    {
-        let ret = type_name::<TransientPtr<ReturnInterface>>();
-
-        formatter.write_fmt(format_args!(
-            "ThreadsafeCastableFactory (&AsyncDIContainer) -> {ret} {{ ... }}",
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use super::*;
-    use crate::di_container::asynchronous::MockAsyncDIContainer;
-
-    #[derive(Debug, PartialEq, Eq)]
-    struct Bacon
-    {
-        heal_amount: u32,
-    }
-
-    #[test]
-    fn can_call()
-    {
-        let castable_factory =
-            ThreadsafeCastableFactory::new(&|_: &MockAsyncDIContainer| {
-                TransientPtr::new(Bacon { heal_amount: 27 })
-            });
-
-        let mock_di_container = MockAsyncDIContainer::new();
-
-        let output = castable_factory.call(&mock_di_container);
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 27 }));
-    }
-}
-- 
cgit v1.2.3-18-g5258