From ed028fc21825ed50fe8bcbc2d22232b7300c5b45 Mon Sep 17 00:00:00 2001
From: Greg Johnston <greg.johnston@gmail.com>
Date: Sun, 17 Nov 2024 16:31:06 -0500
Subject: [PATCH 1/3] fix: type inference regression due to `From<T> for
 Signal<T>` impl (closes #3200)

---
 leptos/tests/generic_component.rs | 25 ++++++++++++
 reactive_graph/src/wrappers.rs    | 63 ++-----------------------------
 2 files changed, 28 insertions(+), 60 deletions(-)
 create mode 100644 leptos/tests/generic_component.rs

diff --git a/leptos/tests/generic_component.rs b/leptos/tests/generic_component.rs
new file mode 100644
index 0000000000..966e45ce79
--- /dev/null
+++ b/leptos/tests/generic_component.rs
@@ -0,0 +1,25 @@
+#[test]
+fn generic_component_signal_inference() {
+    use leptos::prelude::*;
+
+    #[component]
+    pub fn SimpleCounter<T>(#[prop(into)] step: Signal<T>) -> impl IntoView
+    where
+        T: Send + Sync + 'static,
+    {
+        _ = step;
+        view! {
+            <div>
+            </div>
+        }
+    }
+
+    let a = RwSignal::new(1);
+    let (b, _) = signal(1);
+
+    view! {
+        <SimpleCounter step=a/>
+        <SimpleCounter step=b/>
+        <SimpleCounter step=Signal::stored(1)/>
+    };
+}
diff --git a/reactive_graph/src/wrappers.rs b/reactive_graph/src/wrappers.rs
index 37ac879401..543b27c887 100644
--- a/reactive_graph/src/wrappers.rs
+++ b/reactive_graph/src/wrappers.rs
@@ -606,33 +606,6 @@ pub mod read {
         }
     }
 
-    impl<T: Send + Sync + 'static> From<T> for ArcSignal<T, SyncStorage> {
-        #[track_caller]
-        fn from(value: T) -> Self {
-            ArcSignal::stored(value)
-        }
-    }
-
-    impl<T> From<T> for Signal<T>
-    where
-        T: Send + Sync + 'static,
-    {
-        #[track_caller]
-        fn from(value: T) -> Self {
-            Self::stored(value)
-        }
-    }
-
-    impl<T> From<T> for Signal<T, LocalStorage>
-    where
-        T: 'static,
-    {
-        #[track_caller]
-        fn from(value: T) -> Self {
-            Self::stored_local(value)
-        }
-    }
-
     impl<T> From<ArcSignal<T, SyncStorage>> for Signal<T>
     where
         T: Send + Sync + 'static,
@@ -856,36 +829,6 @@ pub mod read {
         }
     }
 
-    impl<T> From<T> for Signal<Option<T>>
-    where
-        T: Send + Sync + 'static,
-    {
-        #[track_caller]
-        fn from(value: T) -> Self {
-            Signal::stored(Some(value))
-        }
-    }
-
-    impl<T> From<T> for Signal<Option<T>, LocalStorage>
-    where
-        T: 'static,
-    {
-        #[track_caller]
-        fn from(value: T) -> Self {
-            Signal::stored_local(Some(value))
-        }
-    }
-
-    impl<T> From<Signal<T>> for Signal<Option<T>>
-    where
-        T: Clone + Send + Sync + 'static,
-    {
-        #[track_caller]
-        fn from(value: Signal<T>) -> Self {
-            Signal::derive(move || Some(value.get()))
-        }
-    }
-
     impl<T> From<Signal<T, LocalStorage>> for Signal<Option<T>, LocalStorage>
     where
         T: Clone + 'static,
@@ -1080,8 +1023,8 @@ pub mod read {
     #[deprecated(
         since = "0.7.0-rc1",
         note = "`MaybeSignal<T>` is deprecated in favour of `Signal<T>` which \
-                is `Copy`, now has a more efficient From<T> implementation \
-                and other benefits in 0.7."
+                is `Copy`, and has other benefits in 0.7. `Signal<T>` can be \
+                created from `T` with `Signal::stored()`."
     )]
     pub enum MaybeSignal<T, S = SyncStorage>
     where
@@ -1574,7 +1517,7 @@ pub mod read {
 
     impl From<&str> for MaybeProp<String> {
         fn from(value: &str) -> Self {
-            Self(Some(Signal::from(Some(value.to_string()))))
+            Self(Some(Signal::stored(Some(value.to_string()))))
         }
     }
 

From 78c21678aa5002be96dfce8933e8ac1a9bd75083 Mon Sep 17 00:00:00 2001
From: Greg Johnston <greg.johnston@gmail.com>
Date: Sun, 17 Nov 2024 18:51:51 -0500
Subject: [PATCH 2/3] update examples

---
 examples/errors_axum/src/landing.rs | 1 +
 examples/timer/src/lib.rs           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/errors_axum/src/landing.rs b/examples/errors_axum/src/landing.rs
index 4fe0d0f768..0ed62ed03c 100644
--- a/examples/errors_axum/src/landing.rs
+++ b/examples/errors_axum/src/landing.rs
@@ -48,6 +48,7 @@ pub fn App() -> impl IntoView {
                 <Routes fallback=|| {
                     let mut errors = Errors::default();
                     errors.insert_with_default_key(AppError::NotFound);
+                    let errors = Signal::stored(errors);
                     view! {
                         <ErrorTemplate errors/>
                     }
diff --git a/examples/timer/src/lib.rs b/examples/timer/src/lib.rs
index c04241940c..48ac44b9e8 100644
--- a/examples/timer/src/lib.rs
+++ b/examples/timer/src/lib.rs
@@ -38,7 +38,7 @@ pub fn TimerDemo() -> impl IntoView {
 pub fn use_interval<T, F>(interval_millis: T, f: F)
 where
     F: Fn() + Clone + 'static,
-    T: Into<Signal<u64>> + 'static,
+    T: Into<MaybeSignal<u64>> + 'static,
 {
     let interval_millis = interval_millis.into();
     Effect::new(move |prev_handle: Option<IntervalHandle>| {

From ed732192f03eec7cdbabac65e8b1c659e9e8c9a5 Mon Sep 17 00:00:00 2001
From: Greg Johnston <greg.johnston@gmail.com>
Date: Sun, 17 Nov 2024 19:00:03 -0500
Subject: [PATCH 3/3] remove deprecation on MaybeSignal

---
 reactive_graph/src/wrappers.rs | 38 ----------------------------------
 1 file changed, 38 deletions(-)

diff --git a/reactive_graph/src/wrappers.rs b/reactive_graph/src/wrappers.rs
index 543b27c887..c8fa4c2867 100644
--- a/reactive_graph/src/wrappers.rs
+++ b/reactive_graph/src/wrappers.rs
@@ -911,7 +911,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<MaybeSignal<T>> for Signal<T>
     where
         T: Send + Sync + 'static,
@@ -925,7 +924,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<MaybeSignal<T, LocalStorage>> for Signal<T, LocalStorage>
     where
         T: Send + Sync + 'static,
@@ -939,7 +937,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<MaybeSignal<T>> for Signal<Option<T>>
     where
         T: Clone + Send + Sync + 'static,
@@ -955,7 +952,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<MaybeSignal<T, LocalStorage>> for Signal<Option<T>, LocalStorage>
     where
         T: Clone + Send + Sync + 'static,
@@ -1020,12 +1016,6 @@ pub mod read {
     /// assert_eq!(above_3(&memoized_double_count.into()), true);
     /// ```
     #[derive(Debug, PartialEq, Eq)]
-    #[deprecated(
-        since = "0.7.0-rc1",
-        note = "`MaybeSignal<T>` is deprecated in favour of `Signal<T>` which \
-                is `Copy`, and has other benefits in 0.7. `Signal<T>` can be \
-                created from `T` with `Signal::stored()`."
-    )]
     pub enum MaybeSignal<T, S = SyncStorage>
     where
         T: 'static,
@@ -1037,7 +1027,6 @@ pub mod read {
         Dynamic(Signal<T, S>),
     }
 
-    #[allow(deprecated)]
     impl<T: Clone, S> Clone for MaybeSignal<T, S>
     where
         S: Storage<T>,
@@ -1050,10 +1039,8 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T: Copy, S> Copy for MaybeSignal<T, S> where S: Storage<T> {}
 
-    #[allow(deprecated)]
     impl<T: Default, S> Default for MaybeSignal<T, S>
     where
         S: Storage<T>,
@@ -1063,7 +1050,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T, S> DefinedAt for MaybeSignal<T, S>
     where
         S: Storage<T>,
@@ -1075,7 +1061,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T, S> Track for MaybeSignal<T, S>
     where
         S: Storage<T> + Storage<SignalTypes<T, S>>,
@@ -1088,7 +1073,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T, S> ReadUntracked for MaybeSignal<T, S>
     where
         T: Clone,
@@ -1113,7 +1097,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> MaybeSignal<T>
     where
         T: Send + Sync,
@@ -1127,7 +1110,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> MaybeSignal<T, LocalStorage> {
         /// Wraps a derived signal, i.e., any computation that accesses one or more
         /// reactive signals.
@@ -1136,7 +1118,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<T> for MaybeSignal<T, SyncStorage>
     where
         SyncStorage: Storage<T>,
@@ -1146,7 +1127,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> FromLocal<T> for MaybeSignal<T, LocalStorage>
     where
         LocalStorage: Storage<T>,
@@ -1156,7 +1136,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<ReadSignal<T>> for MaybeSignal<T>
     where
         T: Send + Sync,
@@ -1166,14 +1145,12 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<ReadSignal<T, LocalStorage>> for MaybeSignal<T, LocalStorage> {
         fn from(value: ReadSignal<T, LocalStorage>) -> Self {
             Self::Dynamic(value.into())
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<RwSignal<T>> for MaybeSignal<T>
     where
         T: Send + Sync,
@@ -1183,14 +1160,12 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<RwSignal<T, LocalStorage>> for MaybeSignal<T, LocalStorage> {
         fn from(value: RwSignal<T, LocalStorage>) -> Self {
             Self::Dynamic(value.into())
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<Memo<T>> for MaybeSignal<T>
     where
         T: Send + Sync,
@@ -1200,14 +1175,12 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<Memo<T, LocalStorage>> for MaybeSignal<T, LocalStorage> {
         fn from(value: Memo<T, LocalStorage>) -> Self {
             Self::Dynamic(value.into())
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<ArcReadSignal<T>> for MaybeSignal<T>
     where
         T: Send + Sync,
@@ -1217,14 +1190,12 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> FromLocal<ArcReadSignal<T>> for MaybeSignal<T, LocalStorage> {
         fn from_local(value: ArcReadSignal<T>) -> Self {
             ReadSignal::from_local(value).into()
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<ArcRwSignal<T>> for MaybeSignal<T>
     where
         T: Send + Sync + 'static,
@@ -1234,7 +1205,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> FromLocal<ArcRwSignal<T>> for MaybeSignal<T, LocalStorage>
     where
         T: 'static,
@@ -1244,7 +1214,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<ArcMemo<T>> for MaybeSignal<T>
     where
         T: Send + Sync,
@@ -1254,14 +1223,12 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> FromLocal<ArcMemo<T, LocalStorage>> for MaybeSignal<T, LocalStorage> {
         fn from_local(value: ArcMemo<T, LocalStorage>) -> Self {
             Memo::from_local(value).into()
         }
     }
 
-    #[allow(deprecated)]
     impl<T, S> From<Signal<T, S>> for MaybeSignal<T, S>
     where
         S: Storage<T>,
@@ -1271,7 +1238,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<S> From<&str> for MaybeSignal<String, S>
     where
         S: Storage<String> + Storage<Arc<RwLock<String>>>,
@@ -1420,7 +1386,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<MaybeSignal<Option<T>>> for MaybeProp<T>
     where
         T: Send + Sync,
@@ -1431,7 +1396,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<Option<MaybeSignal<Option<T>>>> for MaybeProp<T>
     where
         T: Send + Sync,
@@ -1543,7 +1507,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<MaybeSignal<Option<T>, LocalStorage>>
         for MaybeProp<T, LocalStorage>
     where
@@ -1554,7 +1517,6 @@ pub mod read {
         }
     }
 
-    #[allow(deprecated)]
     impl<T> From<Option<MaybeSignal<Option<T>, LocalStorage>>>
         for MaybeProp<T, LocalStorage>
     where