non-tuple Fn implementation

leptos-rs · Sep 28, 2023 · d78686f · d78686f
1 parent fb7662c
commit d78686f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/leptos/src/callback.rs b/leptos/src/callback.rs
@@ -146,34 +146,25 @@ where
 }
 
 #[cfg(feature = "nightly")]
-impl<In, Out> FnOnce<In> for Callback<In, Out>
-where
-    In: std::marker::Tuple,
-{
+impl<In, Out> FnOnce<(In,)> for Callback<In, Out> {
     type Output = Out;
 
-    extern "rust-call" fn call_once(self, args: In) -> Self::Output {
-        Callable::call(&self, args)
+    extern "rust-call" fn call_once(self, args: (In,)) -> Self::Output {
+        Callable::call(&self, args.0)
     }
 }
 
 #[cfg(feature = "nightly")]
-impl<In, Out> FnMut<In> for Callback<In, Out>
-where
-    In: std::marker::Tuple,
-{
-    extern "rust-call" fn call_mut(&mut self, args: In) -> Self::Output {
-        Callable::call(&*self, args)
+impl<In, Out> FnMut<(In,)> for Callback<In, Out> {
+    extern "rust-call" fn call_mut(&mut self, args: (In,)) -> Self::Output {
+        Callable::call(&*self, args.0)
     }
 }
 
 #[cfg(feature = "nightly")]
-impl<In, Out> Fn<In> for Callback<In, Out>
-where
-    In: std::marker::Tuple,
-{
-    extern "rust-call" fn call(&self, args: In) -> Self::Output {
-        Callable::call(self, args)
+impl<In, Out> Fn<(In,)> for Callback<In, Out> {
+    extern "rust-call" fn call(&self, args: (In,)) -> Self::Output {
+        Callable::call(self, args.0)
     }
 }
 

diff --git a/leptos/src/lib.rs b/leptos/src/lib.rs
@@ -4,7 +4,6 @@
 #![cfg_attr(feature = "nightly", feature(unboxed_closures))]
 #![cfg_attr(feature = "nightly", feature(negative_impls))]
 #![cfg_attr(feature = "nightly", feature(auto_traits))]
-#![cfg_attr(feature = "nightly", feature(tuple_trait))]
 //! # About Leptos
 //!
 //! Leptos is a full-stack framework for building web applications in Rust. You can use it to build