Begin removing Clone bounds on Msg if possible.

Author: AlterionX

src/dom_types.rs

@@ -67,100 +67,100 @@ pub trait UpdateEl<T> {
     fn update(self, el: &mut T);
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Attrs {
+impl<Ms> UpdateEl<El<Ms>> for Attrs {
     fn update(self, el: &mut El<Ms>) {
         el.attrs.merge(self);
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for &Attrs {
+impl<Ms> UpdateEl<El<Ms>> for &Attrs {
     fn update(self, el: &mut El<Ms>) {
         el.attrs.merge(self.clone());
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Style {
+impl<Ms> UpdateEl<El<Ms>> for Style {
     fn update(self, el: &mut El<Ms>) {
         el.style.merge(self);
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for &Style {
+impl<Ms> UpdateEl<El<Ms>> for &Style {
     fn update(self, el: &mut El<Ms>) {
         el.style.merge(self.clone());
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Listener<Ms> {
+impl<Ms> UpdateEl<El<Ms>> for Listener<Ms> {
     fn update(self, el: &mut El<Ms>) {
         el.listeners.push(self)
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Vec<Listener<Ms>> {
+impl<Ms> UpdateEl<El<Ms>> for Vec<Listener<Ms>> {
     fn update(mut self, el: &mut El<Ms>) {
         el.listeners.append(&mut self);
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for DidMount<Ms> {
+impl<Ms> UpdateEl<El<Ms>> for DidMount<Ms> {
     fn update(self, el: &mut El<Ms>) {
         el.hooks.did_mount = Some(self)
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for DidUpdate<Ms> {
+impl<Ms> UpdateEl<El<Ms>> for DidUpdate<Ms> {
     fn update(self, el: &mut El<Ms>) {
         el.hooks.did_update = Some(self)
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for WillUnmount<Ms> {
+impl<Ms> UpdateEl<El<Ms>> for WillUnmount<Ms> {
     fn update(self, el: &mut El<Ms>) {
         el.hooks.will_unmount = Some(self)
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for &str {
+impl<Ms> UpdateEl<El<Ms>> for &str {
     // This, or some other mechanism seems to work for String too... note sure why.
     fn update(self, el: &mut El<Ms>) {
         el.children.push(Node::Text(Text::new(self.to_string())))
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for El<Ms> {
+impl<Ms> UpdateEl<El<Ms>> for El<Ms> {
     fn update(self, el: &mut El<Ms>) {
         el.children.push(Node::Element(self))
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Vec<El<Ms>> {
+impl<Ms> UpdateEl<El<Ms>> for Vec<El<Ms>> {
     fn update(self, el: &mut El<Ms>) {
         el.children
             .append(&mut self.into_iter().map(Node::Element).collect());
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Node<Ms> {
+impl<Ms> UpdateEl<El<Ms>> for Node<Ms> {
     fn update(self, el: &mut El<Ms>) {
         el.children.push(self)
     }
 }
 
-impl<Ms: Clone> UpdateEl<El<Ms>> for Vec<Node<Ms>> {
+impl<Ms> UpdateEl<El<Ms>> for Vec<Node<Ms>> {
     fn update(mut self, el: &mut El<Ms>) {
         el.children.append(&mut self);
     }
 }
 
 /// This is intended only to be used for the custom! element macro.
-impl<Ms: Clone> UpdateEl<El<Ms>> for Tag {
+impl<Ms> UpdateEl<El<Ms>> for Tag {
     fn update(self, el: &mut El<Ms>) {
         el.tag = self;
     }
 }
 
-impl<Ms: Clone, I, U, F> UpdateEl<El<Ms>> for std::iter::Map<I, F>
+impl<Ms, I, U, F> UpdateEl<El<Ms>> for std::iter::Map<I, F>
 where
     I: Iterator,
     U: UpdateEl<El<Ms>>,
@@ -669,29 +669,29 @@ make_tags! {
     Placeholder => "placeholder"
 }
 
-pub trait View<Ms: 'static + Clone> {
+pub trait View<Ms: 'static> {
     fn els(self) -> Vec<Node<Ms>>;
 }
 
-impl<Ms: Clone> View<Ms> for El<Ms> {
+impl<Ms> View<Ms> for El<Ms> {
     fn els(self) -> Vec<Node<Ms>> {
         vec![Node::Element(self)]
     }
 }
 
-impl<Ms: Clone> View<Ms> for Vec<El<Ms>> {
+impl<Ms> View<Ms> for Vec<El<Ms>> {
     fn els(self) -> Vec<Node<Ms>> {
         self.into_iter().map(Node::Element).collect()
     }
 }
 
-impl<Ms: 'static + Clone> View<Ms> for Node<Ms> {
+impl<Ms: 'static> View<Ms> for Node<Ms> {
     fn els(self) -> Vec<Node<Ms>> {
         vec![self]
     }
 }
 
-impl<Ms: 'static + Clone> View<Ms> for Vec<Node<Ms>> {
+impl<Ms: 'static> View<Ms> for Vec<Node<Ms>> {
     fn els(self) -> Vec<Node<Ms>> {
         self
     }
@@ -727,16 +727,25 @@ impl Text {
 
 /// An component in our virtual DOM. Related to, but different from
 /// [DOM Nodes](https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType)
-#[derive(Clone, Debug, PartialEq)]
-pub enum Node<Ms: 'static + Clone> {
+#[derive(Debug, PartialEq)]
+pub enum Node<Ms: 'static> {
     Element(El<Ms>),
     //    Svg(El<Ms>),  // May be best to handle using namespace field on El
     Text(Text),
     Empty,
 }
+impl<Ms: 'static> Clone for Node<Ms> {
+    fn clone(&self) -> Self {
+        match self {
+            Self::Element(e) => Self::Element(e.clone()),
+            Self::Text(t) => Self::Text(t.clone()),
+            Self::Empty => Self::Empty,
+        }
+    }
+}
 
 // Mappers for `El` manipulations.
-impl<Ms: Clone> Node<Ms> {
+impl<Ms> Node<Ms> {
     /// See `El::from_markdown`
     pub fn from_markdown(markdown: &str) -> Vec<Node<Ms>> {
         El::from_markdown(markdown)
@@ -817,7 +826,7 @@ impl<Ms: Clone> Node<Ms> {
     }
 }
 // Workspace manipulations.
-impl<Ms: Clone> Node<Ms> {
+impl<Ms> Node<Ms> {
     pub(crate) fn strip_ws_nodes(&mut self) -> &mut Self {
         match self {
             Node::Element(e) => e.strip_ws_nodes(),
@@ -828,7 +837,7 @@ impl<Ms: Clone> Node<Ms> {
     }
 }
 // Convenience methods for `Node` a la `Result` and `Option`.
-impl<Ms: Clone> Node<Ms> {
+impl<Ms> Node<Ms> {
     pub fn new_text(text: impl Into<Cow<'static, str>>) -> Self {
         Node::Text(Text::new(text))
     }
@@ -883,7 +892,7 @@ impl<Ms: Clone> Node<Ms> {
     }
 }
 
-impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> for Node<Ms> {
+impl<Ms: 'static, OtherMs: 'static> MessageMapper<Ms, OtherMs> for Node<Ms> {
     type SelfWithOtherMs = Node<OtherMs>;
     /// See note on impl for El
     fn map_message(self, f: impl FnOnce(Ms) -> OtherMs + 'static + Clone) -> Node<OtherMs> {
@@ -895,7 +904,7 @@ impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> f
     }
 }
 
-impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> for Vec<Node<Ms>> {
+impl<Ms: 'static, OtherMs: 'static> MessageMapper<Ms, OtherMs> for Vec<Node<Ms>> {
     type SelfWithOtherMs = Vec<Node<OtherMs>>;
     fn map_message(self, f: impl FnOnce(Ms) -> OtherMs + 'static + Clone) -> Vec<Node<OtherMs>> {
         self.into_iter()
@@ -906,7 +915,7 @@ impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> f
 
 /// An component in our virtual DOM.
 #[derive(Debug)] // todo: Custom debug implementation where children are on new lines and indented.
-pub struct El<Ms: 'static + Clone> {
+pub struct El<Ms: 'static> {
     // Ms is a message type, as in part of TEA.
     // We call this 'El' instead of 'Element' for brevity, and to prevent
     // confusion with web_sys::Element.
@@ -920,7 +929,7 @@ pub struct El<Ms: 'static + Clone> {
     pub namespace: Option<Namespace>,
     pub hooks: LifecycleHooks<Ms>,
 }
-impl<Ms: Clone> El<Ms> {
+impl<Ms> El<Ms> {
     pub(crate) fn strip_ws_nodes(&mut self) {
         self.node_ws.take();
         for child in &mut self.children {
@@ -979,7 +988,7 @@ impl<Ms: 'static, OtherMs: 'static> MessageMapper<Ms, OtherMs> for LifecycleHook
     }
 }
 
-impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> for El<Ms> {
+impl<Ms: 'static, OtherMs: 'static> MessageMapper<Ms, OtherMs> for El<Ms> {
     type SelfWithOtherMs = El<OtherMs>;
     /// Maps an element's message to have another message.
     ///
@@ -1011,7 +1020,7 @@ impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> f
     }
 }
 
-impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> for Vec<El<Ms>> {
+impl<Ms: 'static, OtherMs: 'static> MessageMapper<Ms, OtherMs> for Vec<El<Ms>> {
     type SelfWithOtherMs = Vec<El<OtherMs>>;
     fn map_message(self, f: impl FnOnce(Ms) -> OtherMs + 'static + Clone) -> Vec<El<OtherMs>> {
         self.into_iter()
@@ -1020,7 +1029,7 @@ impl<Ms: 'static + Clone, OtherMs: 'static + Clone> MessageMapper<Ms, OtherMs> f
     }
 }
 
-impl<Ms: Clone> El<Ms> {
+impl<Ms> El<Ms> {
     /// Create an empty element, specifying only the tag
     pub fn empty(tag: Tag) -> Self {
         Self {
@@ -1153,7 +1162,7 @@ impl<Ms: Clone> El<Ms> {
 
 /// Allow the user to clone their Els. Note that there's no easy way to clone the
 /// closures within listeners or lifestyle hooks, so we omit them.
-impl<Ms: Clone> Clone for El<Ms> {
+impl<Ms> Clone for El<Ms> {
     fn clone(&self) -> Self {
         Self {
             tag: self.tag.clone(),
@@ -1168,7 +1177,7 @@ impl<Ms: Clone> Clone for El<Ms> {
     }
 }
 
-impl<Ms: Clone> PartialEq for El<Ms> {
+impl<Ms> PartialEq for El<Ms> {
     fn eq(&self, other: &Self) -> bool {
         // todo Again, note that the listeners check only checks triggers.
         // Don't check children.

src/events.rs

@@ -319,7 +319,7 @@ pub fn input_ev<Ms, T: ToString + Copy>(
 
 /// Create an event that passes a `web_sys::KeyboardEvent`, allowing easy access
 /// to items like `key_code`() and key().
-pub fn keyboard_ev<Ms: Clone, T: ToString + Copy>(
+pub fn keyboard_ev<Ms, T: ToString + Copy>(
     trigger: T,
     handler: impl FnOnce(web_sys::KeyboardEvent) -> Ms + 'static + Clone,
 ) -> Listener<Ms> {
@@ -335,7 +335,7 @@ pub fn keyboard_ev<Ms: Clone, T: ToString + Copy>(
 }
 
 /// See `keyboard_ev`
-pub fn mouse_ev<Ms: Clone, T: ToString + Copy>(
+pub fn mouse_ev<Ms, T: ToString + Copy>(
     trigger: T,
     handler: impl FnOnce(web_sys::MouseEvent) -> Ms + 'static + Clone,
 ) -> Listener<Ms> {
@@ -381,28 +381,28 @@ pub fn raw_ev<Ms, T: ToString + Copy>(
     )
 }
 
+// TODO: Remove seemingly arbitrary `Clone` bound here.
 /// Create an event that passes no data, other than it occurred. Foregoes using a closure,
 /// in favor of pointing to a message directly.
 pub fn simple_ev<Ms: Clone, T>(trigger: T, message: Ms) -> Listener<Ms>
 where
-    Ms: Clone + 'static,
+    Ms: 'static,
     T: ToString + Copy,
 {
-    let msg_closure = message.clone();
-    let handler = || msg_closure;
-    let closure = move |_| handler.clone()();
+    let stored_msg = message.clone();
+    let closure = move |_| message.clone();
     Listener::new(
         &trigger.to_string(),
         Some(Box::new(closure)),
         Some(Category::Simple),
-        Some(message),
+        Some(stored_msg),
     )
 }
 
 /// Create an event that passes a `web_sys::CustomEvent`, allowing easy access
 /// to detail() and then trigger update
 #[deprecated]
-pub fn trigger_update_ev<Ms: Clone>(
+pub fn trigger_update_ev<Ms>(
     handler: impl FnOnce(web_sys::CustomEvent) -> Ms + 'static + Clone,
 ) -> Listener<Ms> {
     let closure = move |event: web_sys::Event| {
@@ -431,7 +431,7 @@ pub(crate) fn fmt_hook_fn<T>(h: &Option<T>) -> &'static str {
 
 /// Trigger update function from outside of App
 #[deprecated]
-pub fn trigger_update_handler<Ms: Clone + DeserializeOwned>() -> Listener<Ms> {
+pub fn trigger_update_handler<Ms: DeserializeOwned>() -> Listener<Ms> {
     trigger_update_ev(|ev| {
         ev.detail()
             .into_serde()

src/lib.rs

@@ -33,7 +33,7 @@ mod websys_bridge;
 
 /// Create an element flagged in a way that it will not be rendered. Useful
 /// in ternary operations.
-pub fn empty<Ms: Clone>() -> dom_types::Node<Ms> {
+pub const fn empty<Ms>() -> dom_types::Node<Ms> {
     dom_types::Node::Empty
 }
 
@@ -133,7 +133,6 @@ pub mod tests {
             }
         }
 
-        #[derive(Clone)]
         enum Msg {
             Increment,
         }