Upgrade implicit-clone to 0.4.7 and use derive macro when possible

Author: cecton

Cargo.lock

@@ -40,16 +40,14 @@ impl<COMP: Component> PartialEq for WeakComponentLink<COMP> {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, ImplicitClone, PartialEq, Eq, Hash)]
 pub enum Hovered {
     Header,
     Item(AttrValue),
     List,
     None,
 }
 
-impl ImplicitClone for Hovered {}
-
 impl fmt::Display for Hovered {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(

examples/nested_list/src/main.rs

@@ -61,14 +61,12 @@ impl ::yew::Component for Container {
     }
 }
 
-#[derive(::std::clone::Clone, ::std::cmp::PartialEq)]
+#[derive(::std::clone::Clone, ::yew::html::ImplicitClone, ::std::cmp::PartialEq)]
 pub enum ChildrenVariants {
     Child(::yew::virtual_dom::VChild<Child>),
     AltChild(::yew::virtual_dom::VChild<AltChild>),
 }
 
-impl ::yew::html::ImplicitClone for ChildrenVariants {}
-
 impl ::std::convert::From<::yew::virtual_dom::VChild<Child>> for ChildrenVariants {
     fn from(comp: ::yew::virtual_dom::VChild<Child>) -> Self {
         ChildrenVariants::Child(comp)

packages/yew-macro/tests/html_macro/component-pass.rs

@@ -27,7 +27,7 @@ yew-macro = { version = "^0.21.0", path = "../yew-macro" }
 thiserror = "1.0"
 futures = { version = "0.3", default-features = false, features = ["std"] }
 html-escape = { version = "0.2.13", optional = true }
-implicit-clone = { version = "0.4.5", features = ["map"] }
+implicit-clone = { version = "0.4.7", features = ["map"] }
 base64ct = { version = "1.6.0", features = ["std"], optional = true }
 bincode = { version = "1.3.3", optional = true }
 serde = { version = "1", features = ["derive"] }

packages/yew/Cargo.toml

@@ -2,23 +2,21 @@ use std::borrow::Cow;
 use std::iter::FromIterator;
 use std::rc::Rc;
 
-use implicit_clone::ImplicitClone;
 use indexmap::IndexSet;
 
 use super::IntoPropValue;
+use crate::html::ImplicitClone;
 use crate::utils::RcExt;
 use crate::virtual_dom::AttrValue;
 
 /// A set of classes, cheap to clone.
 ///
 /// The preferred way of creating this is using the [`classes!`][yew::classes!] macro.
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone, ImplicitClone, Default)]
 pub struct Classes {
     set: Rc<IndexSet<AttrValue>>,
 }
 
-impl ImplicitClone for Classes {}
-
 /// helper method to efficiently turn a set of classes into a space-separated
 /// string. Abstracts differences between ToString and IntoPropValue. The
 /// `rest` iterator is cloned to pre-compute the length of the String; it

packages/yew/src/html/classes.rs

@@ -6,10 +6,9 @@ use implicit_clone::unsync::{IArray, IMap};
 pub use implicit_clone::ImplicitClone;
 
 use crate::callback::Callback;
-use crate::html::{BaseComponent, ChildrenRenderer, Component, NodeRef, Scope};
+use crate::html::{BaseComponent, ChildrenRenderer, Component, Scope};
 use crate::virtual_dom::{AttrValue, VChild, VList, VNode, VText};
 
-impl ImplicitClone for NodeRef {}
 impl<Comp: Component> ImplicitClone for Scope<Comp> {}
 // TODO there are still a few missing
 

packages/yew/src/html/conversion/into_prop_value.rs

@@ -87,7 +87,7 @@ impl IntoHtmlResult for Html {
 /// ```
 /// ## Relevant examples
 /// - [Node Refs](https://github.com/yewstack/yew/tree/master/examples/node_refs)
-#[derive(Default, Clone)]
+#[derive(Default, Clone, ImplicitClone)]
 pub struct NodeRef(Rc<RefCell<NodeRefInner>>);
 
 impl PartialEq for NodeRef {

packages/yew/src/html/mod.rs

@@ -9,7 +9,7 @@ use crate::html::ImplicitClone;
 /// Represents the (optional) key of Yew's virtual nodes.
 ///
 /// Keys are cheap to clone.
-#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
+#[derive(Clone, ImplicitClone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
 pub struct Key {
     key: Rc<str>,
 }
@@ -41,8 +41,6 @@ impl From<&'_ str> for Key {
     }
 }
 
-impl ImplicitClone for Key {}
-
 macro_rules! key_impl_from_to_string {
     ($type:ty) => {
         impl From<$type> for Key {

packages/yew/src/virtual_dom/key.rs

@@ -160,18 +160,17 @@ gen_listener_kinds! {
 }
 
 /// A list of event listeners
-#[derive(Debug)]
+#[derive(Debug, Clone, ImplicitClone, Default)]
 pub enum Listeners {
     /// No listeners registered or pending.
     /// Distinct from `Pending` with an empty slice to avoid an allocation.
+    #[default]
     None,
 
     /// Not yet added to the element or registry
     Pending(Box<[Option<Rc<dyn Listener>>]>),
 }
 
-impl ImplicitClone for Listeners {}
-
 impl PartialEq for Listeners {
     fn eq(&self, rhs: &Self) -> bool {
         use Listeners::*;
@@ -201,18 +200,3 @@ impl PartialEq for Listeners {
         }
     }
 }
-
-impl Clone for Listeners {
-    fn clone(&self) -> Self {
-        match self {
-            Self::None => Self::None,
-            Self::Pending(v) => Self::Pending(v.clone()),
-        }
-    }
-}
-
-impl Default for Listeners {
-    fn default() -> Self {
-        Self::None
-    }
-}

packages/yew/src/virtual_dom/listeners.rs

@@ -5,7 +5,7 @@ use std::rc::Rc;
 use super::{Key, VNode};
 use crate::html::ImplicitClone;
 
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, ImplicitClone, Copy, Debug, PartialEq)]
 enum FullyKeyedState {
     KnownFullyKeyed,
     KnownMissingKeys,
@@ -24,8 +24,6 @@ pub struct VList {
     pub key: Option<Key>,
 }
 
-impl ImplicitClone for VList {}
-
 impl PartialEq for VList {
     fn eq(&self, other: &Self) -> bool {
         self.key == other.key && self.children == other.children