feat(macros): 🎸 derive Declare will generate FatObj

RibirX · Mar 1, 2024 · c455cf1 · c455cf1
1 parent b0b8b7c
commit c455cf1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/core/src/builtin_widgets.rs b/core/src/builtin_widgets.rs
@@ -10,12 +10,12 @@ pub use key::{Key, KeyWidget};
 pub mod image_widget;
 pub use image_widget::*;
 pub mod delay_drop;
-pub use delay_drop::DelayDrop;
+pub use delay_drop::*;
 mod theme;
 use ribir_algo::Sc;
 pub use theme::*;
 mod cursor;
-pub use cursor::Cursor;
+pub use cursor::*;
 pub use winit::window::CursorIcon;
 mod margin;
 pub use margin::*;

diff --git a/core/src/builtin_widgets/mix_builtin.rs b/core/src/builtin_widgets/mix_builtin.rs
@@ -350,9 +350,9 @@ impl MixBuiltin {
 }
 
 impl MixBuiltinDeclarer {
-  pub fn tab_index<_M, _V>(self, v: _V) -> Self
+  pub fn tab_index<M, V>(self, v: V) -> Self
   where
-    DeclareInit<i16>: DeclareFrom<_V, _M>,
+    DeclareInit<i16>: DeclareFrom<V, M>,
   {
     let inner = self.0.read();
     self.0.read().flag_mark(BuiltinFlags::Focus);
@@ -370,9 +370,9 @@ impl MixBuiltinDeclarer {
     self
   }
 
-  pub fn auto_focus<_M, _V>(self, v: _V) -> Self
+  pub fn auto_focus<M, V>(self, v: V) -> Self
   where
-    DeclareInit<bool>: DeclareFrom<_V, _M>,
+    DeclareInit<bool>: DeclareFrom<V, M>,
   {
     let inner = self.0.read();
     inner.flag_mark(BuiltinFlags::Focus);

diff --git a/core/src/declare.rs b/core/src/declare.rs
@@ -52,8 +52,9 @@ impl<V, U: From<V>> DeclareFrom<V, ()> for DeclareInit<U> {
   fn declare_from(value: V) -> Self { Self::Value(value.into()) }
 }
 
-impl<P: Pipe + 'static, V> DeclareFrom<P, &dyn Pipe<Value = ()>> for DeclareInit<V>
+impl<P, V> DeclareFrom<P, &dyn Pipe<Value = ()>> for DeclareInit<V>
 where
+  P: Pipe + 'static,
   V: From<P::Value> + 'static,
 {
   #[inline]

diff --git a/macros/src/simple_declarer_attr.rs b/macros/src/simple_declarer_attr.rs
@@ -188,7 +188,7 @@ impl<'a> DeclareField<'a> {
       .map_or(true, |attr| attr.custom.is_none() && attr.skip.is_none())
   }
 
-  pub fn check_reserve(&mut self) {
+  pub fn check_reserve(&self) {
     // reverse name check.
     let reserve_ident = &crate::variable_names::RESERVE_IDENT;