From 1b27423ae2f2455c72cc7020051c861227aeeeb5 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Mon, 7 Nov 2022 21:01:10 +0100
Subject: fix: make factories work again after Rust nightly-2022-11-07

---
 src/castable_factory/blocking.rs   | 17 +++++++++--------
 src/castable_factory/threadsafe.rs | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'src/castable_factory')

diff --git a/src/castable_factory/blocking.rs b/src/castable_factory/blocking.rs
index 48f426d..f16d86a 100644
--- a/src/castable_factory/blocking.rs
+++ b/src/castable_factory/blocking.rs
@@ -1,5 +1,6 @@
 use std::any::type_name;
 use std::fmt::Debug;
+use std::marker::Tuple;
 
 use crate::interfaces::any_factory::AnyFactory;
 use crate::interfaces::factory::IFactory;
@@ -7,7 +8,7 @@ use crate::ptr::TransientPtr;
 
 pub struct CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     func: &'static dyn Fn<Args, Output = TransientPtr<ReturnInterface>>,
@@ -15,7 +16,7 @@ where
 
 impl<Args, ReturnInterface> CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     pub fn new(
@@ -29,14 +30,14 @@ where
 impl<Args, ReturnInterface> IFactory<Args, ReturnInterface>
     for CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
 }
 
 impl<Args, ReturnInterface> Fn<Args> for CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     extern "rust-call" fn call(&self, args: Args) -> Self::Output
@@ -47,7 +48,7 @@ where
 
 impl<Args, ReturnInterface> FnMut<Args> for CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output
@@ -58,7 +59,7 @@ where
 
 impl<Args, ReturnInterface> FnOnce<Args> for CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     type Output = TransientPtr<ReturnInterface>;
@@ -71,14 +72,14 @@ where
 
 impl<Args, ReturnInterface> AnyFactory for CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
 }
 
 impl<Args, ReturnInterface> Debug for CastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     #[cfg(not(tarpaulin_include))]
diff --git a/src/castable_factory/threadsafe.rs b/src/castable_factory/threadsafe.rs
index c1a90c4..d17a87f 100644
--- a/src/castable_factory/threadsafe.rs
+++ b/src/castable_factory/threadsafe.rs
@@ -1,5 +1,6 @@
 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;
@@ -7,7 +8,7 @@ use crate::ptr::TransientPtr;
 
 pub struct ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     func: &'static (dyn Fn<Args, Output = TransientPtr<ReturnInterface>> + Send + Sync),
@@ -15,7 +16,7 @@ where
 
 impl<Args, ReturnInterface> ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     pub fn new(
@@ -31,14 +32,14 @@ where
 impl<Args, ReturnInterface> IThreadsafeFactory<Args, ReturnInterface>
     for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
 }
 
 impl<Args, ReturnInterface> Fn<Args> for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     extern "rust-call" fn call(&self, args: Args) -> Self::Output
@@ -50,7 +51,7 @@ where
 impl<Args, ReturnInterface> FnMut<Args>
     for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output
@@ -62,7 +63,7 @@ where
 impl<Args, ReturnInterface> FnOnce<Args>
     for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     type Output = TransientPtr<ReturnInterface>;
@@ -76,7 +77,7 @@ where
 impl<Args, ReturnInterface> AnyFactory
     for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
 }
@@ -84,14 +85,14 @@ where
 impl<Args, ReturnInterface> AnyThreadsafeFactory
     for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
 }
 
 impl<Args, ReturnInterface> Debug for ThreadsafeCastableFactory<Args, ReturnInterface>
 where
-    Args: 'static,
+    Args: Tuple + 'static,
     ReturnInterface: 'static + ?Sized,
 {
     #[cfg(not(tarpaulin_include))]
-- 
cgit v1.2.3-18-g5258