Optimized the code structure of cache-related functions.

Author: fxdmhtt

cache/src/cache.rs

@@ -13,7 +13,10 @@ const CACHE_CAP: usize = 128;
 static mut CACHE: Lazy<LruCache<CacheKey, Rc<dyn Any>>> =
     Lazy::new(|| LruCache::new(NonZeroUsize::new(CACHE_CAP).unwrap()));
 
-pub(crate) fn touch<T: 'static>(key: &'static dyn Observable) -> Option<Rc<T>> {
+pub(crate) fn touch<T>(key: &'static dyn Observable) -> Option<Rc<T>>
+where
+    T: 'static,
+{
     // When the Effect performs dependency calculations for the first time,
     // it must ignore the relevant cache,
     // otherwise the underlying Signal will not remember the Effect.
@@ -28,7 +31,10 @@ pub(crate) fn touch<T: 'static>(key: &'static dyn Observable) -> Option<Rc<T>> {
         .map(|rc| unsafe { Rc::from_raw(Rc::into_raw(rc) as *const T) })
 }
 
-pub(crate) fn store_in_cache<T: 'static>(key: &'static dyn Observable, val: T) -> Rc<T> {
+pub(crate) fn store_in_cache<T>(key: &'static dyn Observable, val: T) -> Rc<T>
+where
+    T: 'static,
+{
     let rc = Rc::new(val);
     unsafe { CACHE.put(key, Rc::clone(&rc) as _) };
     rc

macros/src/lib.rs

@@ -183,7 +183,7 @@ pub fn memo(_attr: TokenStream, item: TokenStream) -> TokenStream {
         static mut #ident: #ty = #expr;
 
         #vis #sig
-        where #output_ty: Clone + 'static
+        where #output_ty: Clone
         {
             unsafe { (*#ident).get() }
         }