From 9f27a925bd323e8e0864bedeb33a3c6953517ea1 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Sat, 19 Nov 2022 15:45:12 +0100
Subject: refactor: reorganize non-public API items

---
 src/castable_factory/blocking.rs   | 153 ---------------------------------
 src/castable_factory/mod.rs        |   4 -
 src/castable_factory/threadsafe.rs | 172 -------------------------------------
 3 files changed, 329 deletions(-)
 delete mode 100644 src/castable_factory/blocking.rs
 delete mode 100644 src/castable_factory/mod.rs
 delete mode 100644 src/castable_factory/threadsafe.rs

(limited to 'src/castable_factory')

diff --git a/src/castable_factory/blocking.rs b/src/castable_factory/blocking.rs
deleted file mode 100644
index f16d86a..0000000
--- a/src/castable_factory/blocking.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::any::type_name;
-use std::fmt::Debug;
-use std::marker::Tuple;
-
-use crate::interfaces::any_factory::AnyFactory;
-use crate::interfaces::factory::IFactory;
-use crate::ptr::TransientPtr;
-
-pub struct CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    func: &'static dyn Fn<Args, Output = TransientPtr<ReturnInterface>>,
-}
-
-impl<Args, ReturnInterface> CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    pub fn new(
-        func: &'static dyn Fn<Args, Output = TransientPtr<ReturnInterface>>,
-    ) -> Self
-    {
-        Self { func }
-    }
-}
-
-impl<Args, ReturnInterface> IFactory<Args, ReturnInterface>
-    for CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<Args, ReturnInterface> Fn<Args> for CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    extern "rust-call" fn call(&self, args: Args) -> Self::Output
-    {
-        self.func.call(args)
-    }
-}
-
-impl<Args, ReturnInterface> FnMut<Args> for CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output
-    {
-        self.call(args)
-    }
-}
-
-impl<Args, ReturnInterface> FnOnce<Args> for CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    type Output = TransientPtr<ReturnInterface>;
-
-    extern "rust-call" fn call_once(self, args: Args) -> Self::Output
-    {
-        self.call(args)
-    }
-}
-
-impl<Args, ReturnInterface> AnyFactory for CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<Args, ReturnInterface> Debug for CastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    #[cfg(not(tarpaulin_include))]
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result
-    {
-        let mut args = type_name::<Args>();
-
-        if args.len() < 2 {
-            return Err(std::fmt::Error::default());
-        }
-
-        args = args
-            .get(1..args.len() - 1)
-            .map_or_else(|| Err(std::fmt::Error::default()), Ok)?;
-
-        if args.ends_with(',') {
-            args = args
-                .get(..args.len() - 1)
-                .map_or_else(|| Err(std::fmt::Error), Ok)?;
-        }
-
-        let ret = type_name::<TransientPtr<ReturnInterface>>();
-
-        formatter.write_fmt(format_args!("CastableFactory ({}) -> {}", args, ret))
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use super::*;
-
-    #[derive(Debug, PartialEq, Eq)]
-    struct Bacon
-    {
-        heal_amount: u32,
-    }
-
-    #[test]
-    fn can_call()
-    {
-        let castable_factory =
-            CastableFactory::new(&|heal_amount| TransientPtr::new(Bacon { heal_amount }));
-
-        let output = castable_factory.call((27,));
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 27 }));
-    }
-
-    #[test]
-    fn can_call_mut()
-    {
-        let mut castable_factory =
-            CastableFactory::new(&|heal_amount| TransientPtr::new(Bacon { heal_amount }));
-
-        let output = castable_factory.call_mut((103,));
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 103 }));
-    }
-
-    #[test]
-    fn can_call_once()
-    {
-        let castable_factory =
-            CastableFactory::new(&|heal_amount| TransientPtr::new(Bacon { heal_amount }));
-
-        let output = castable_factory.call_once((19,));
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 19 }));
-    }
-}
diff --git a/src/castable_factory/mod.rs b/src/castable_factory/mod.rs
deleted file mode 100644
index e81b842..0000000
--- a/src/castable_factory/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod blocking;
-
-#[cfg(feature = "async")]
-pub mod threadsafe;
diff --git a/src/castable_factory/threadsafe.rs b/src/castable_factory/threadsafe.rs
deleted file mode 100644
index d17a87f..0000000
--- a/src/castable_factory/threadsafe.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use std::any::type_name;
-use std::fmt::Debug;
-use std::marker::Tuple;
-
-use crate::interfaces::any_factory::{AnyFactory, AnyThreadsafeFactory};
-use crate::interfaces::factory::IThreadsafeFactory;
-use crate::ptr::TransientPtr;
-
-pub struct ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    func: &'static (dyn Fn<Args, Output = TransientPtr<ReturnInterface>> + Send + Sync),
-}
-
-impl<Args, ReturnInterface> ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    pub fn new(
-        func: &'static (dyn Fn<Args, Output = TransientPtr<ReturnInterface>>
-                      + Send
-                      + Sync),
-    ) -> Self
-    {
-        Self { func }
-    }
-}
-
-impl<Args, ReturnInterface> IThreadsafeFactory<Args, ReturnInterface>
-    for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<Args, ReturnInterface> Fn<Args> for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    extern "rust-call" fn call(&self, args: Args) -> Self::Output
-    {
-        self.func.call(args)
-    }
-}
-
-impl<Args, ReturnInterface> FnMut<Args>
-    for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output
-    {
-        self.call(args)
-    }
-}
-
-impl<Args, ReturnInterface> FnOnce<Args>
-    for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    type Output = TransientPtr<ReturnInterface>;
-
-    extern "rust-call" fn call_once(self, args: Args) -> Self::Output
-    {
-        self.call(args)
-    }
-}
-
-impl<Args, ReturnInterface> AnyFactory
-    for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<Args, ReturnInterface> AnyThreadsafeFactory
-    for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-}
-
-impl<Args, ReturnInterface> Debug for ThreadsafeCastableFactory<Args, ReturnInterface>
-where
-    Args: Tuple + 'static,
-    ReturnInterface: 'static + ?Sized,
-{
-    #[cfg(not(tarpaulin_include))]
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result
-    {
-        let mut args = type_name::<Args>();
-
-        if args.len() < 2 {
-            return Err(std::fmt::Error::default());
-        }
-
-        args = args
-            .get(1..args.len() - 1)
-            .map_or_else(|| Err(std::fmt::Error::default()), Ok)?;
-
-        if args.ends_with(',') {
-            args = args
-                .get(..args.len() - 1)
-                .map_or_else(|| Err(std::fmt::Error), Ok)?;
-        }
-
-        let ret = type_name::<TransientPtr<ReturnInterface>>();
-
-        formatter.write_fmt(format_args!(
-            "ThreadsafeCastableFactory ({}) -> {}",
-            args, ret
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use super::*;
-
-    #[derive(Debug, PartialEq, Eq)]
-    struct Bacon
-    {
-        heal_amount: u32,
-    }
-
-    #[test]
-    fn can_call()
-    {
-        let castable_factory = ThreadsafeCastableFactory::new(&|heal_amount| {
-            TransientPtr::new(Bacon { heal_amount })
-        });
-
-        let output = castable_factory.call((27,));
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 27 }));
-    }
-
-    #[test]
-    fn can_call_mut()
-    {
-        let mut castable_factory = ThreadsafeCastableFactory::new(&|heal_amount| {
-            TransientPtr::new(Bacon { heal_amount })
-        });
-
-        let output = castable_factory.call_mut((1092,));
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 1092 }));
-    }
-
-    #[test]
-    fn can_call_once()
-    {
-        let castable_factory = ThreadsafeCastableFactory::new(&|heal_amount| {
-            TransientPtr::new(Bacon { heal_amount })
-        });
-
-        let output = castable_factory.call_once((547,));
-
-        assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 547 }));
-    }
-}
-- 
cgit v1.2.3-18-g5258