clippy, fmt

ranile · ranile · commit d7336e801574 · 2021-03-30T19:54:08.000+05:00
diff --git a/examples/nested_list/src/list.rs b/examples/nested_list/src/list.rs
@@ -40,9 +40,9 @@ where
     }
 }
 
-impl Into<Html> for ListVariant {
-    fn into(self) -> Html {
-        match self.props {
+impl From<ListVariant> for Html {
+    fn from(variant: ListVariant) -> Html {
+        match variant.props {
             Variants::Header(props) => {
                 VComp::new::<ListHeader>(props, NodeRef::default(), None).into()
             }
diff --git a/packages/yew-dsl/src/lib.rs b/packages/yew-dsl/src/lib.rs
@@ -37,9 +37,9 @@ impl<COMP: Component> BoxedVNodeProducer<COMP> {
     }
 }
 
-impl<COMP: Component> Into<VNode> for BoxedVNodeProducer<COMP> {
-    fn into(self) -> VNode {
-        self.build()
+impl<COMP: Component> From<BoxedVNodeProducer<COMP>> for VNode {
+    fn from(value: BoxedVNodeProducer<COMP>) -> VNode {
+        value.build()
     }
 }
 
diff --git a/packages/yew-macro/src/props/prop_macro.rs b/packages/yew-macro/src/props/prop_macro.rs
@@ -64,13 +64,13 @@ impl Parse for PropValue {
     }
 }
 
-impl Into<Prop> for PropValue {
-    fn into(self) -> Prop {
-        let Self {
+impl From<PropValue> for Prop {
+    fn from(prop_value: PropValue) -> Prop {
+        let PropValue {
             label,
             colon_token,
             value,
-        } = self;
+        } = prop_value;
         Prop {
             label,
             question_mark: None,
diff --git a/packages/yew-router/src/alias.rs b/packages/yew-router/src/alias.rs
@@ -37,52 +37,49 @@ macro_rules! define_router_state {
             #[doc = ">](route_service/struct.RouteService.html)."]
             pub type RouteService = $crate::service::RouteService<$StateT>;
 
-            #[cfg(feature="agent")]
+            #[cfg(feature = "agent")]
             #[doc = "Alias to [RouteAgent<"]
             #[doc = $StateName]
             #[doc = ">](agent/struct.RouteAgent.html)."]
             pub type RouteAgent = $crate::agent::RouteAgent<$StateT>;
 
-            #[cfg(feature="agent")]
+            #[cfg(feature = "agent")]
             #[doc = "Alias to [RouteAgentBridge<"]
             #[doc = $StateName]
             #[doc = ">](agent/bridge/struct.RouteAgentBridge.html)`."]
             pub type RouteAgentBridge = $crate::agent::RouteAgentBridge<$StateT>;
 
-            #[cfg(feature="agent")]
+            #[cfg(feature = "agent")]
             #[doc = "Alias to [RouteAgentDispatcher<"]
             #[doc = $StateName]
             #[doc = ">](agent/struct.RouteAgentDispatcher.html)`."]
             pub type RouteAgentDispatcher = $crate::agent::RouteAgentDispatcher<$StateT>;
 
-
             #[allow(deprecated)]
             #[deprecated(note = "Has been renamed to RouterAnchor")]
-            #[cfg(feature="components")]
+            #[cfg(feature = "components")]
             #[doc = "Alias to [RouterLink<"]
             #[doc = $StateName]
             #[doc = ">](components/struct.RouterLink.html)`."]
             pub type RouterLink = $crate::components::RouterLink<$StateT>;
 
-
-            #[cfg(feature="components")]
+            #[cfg(feature = "components")]
             #[doc = "Alias to [RouterAnchor<"]
             #[doc = $StateName]
             #[doc = ">](components/struct.RouterAnchor.html)`."]
             pub type RouterAnchor = $crate::components::RouterAnchor<$StateT>;
 
-            #[cfg(feature="components")]
+            #[cfg(feature = "components")]
             #[doc = "Alias to [RouterButton<"]
             #[doc = $StateName]
             #[doc = ">](components/struct.RouterButton.html)`."]
             pub type RouterButton = $crate::components::RouterButton<$StateT>;
 
-            #[cfg(feature="router")]
+            #[cfg(feature = "router")]
             #[doc = "Alias to [Router<"]
             #[doc = $StateName]
             #[doc = ">](router/router/struct.Router.html)."]
             pub type Router<SW> = $crate::router::Router<$StateT, SW>;
-
         }
-    }
+    };
 }
diff --git a/packages/yew-services/src/callback_test_util.rs b/packages/yew-services/src/callback_test_util.rs
@@ -35,9 +35,9 @@ impl<T> Default for CallbackFuture<T> {
     }
 }
 
-impl<T: 'static> Into<Callback<T>> for CallbackFuture<T> {
-    fn into(self) -> Callback<T> {
-        Callback::from(move |r| self.finish(r))
+impl<T: 'static> From<CallbackFuture<T>> for Callback<T> {
+    fn from(f: CallbackFuture<T>) -> Self {
+        Callback::from(move |r| f.finish(r))
     }
 }
 
diff --git a/packages/yew-services/src/fetch.rs b/packages/yew-services/src/fetch.rs
@@ -74,39 +74,39 @@ pub struct FetchOptions {
     pub integrity: Option<String>,
 }
 
-impl Into<RequestInit> for FetchOptions {
-    fn into(self) -> RequestInit {
+impl From<FetchOptions> for RequestInit {
+    fn from(fetch_options: FetchOptions) -> RequestInit {
         let mut init = RequestInit::new();
 
-        if let Some(cache) = self.cache {
+        if let Some(cache) = fetch_options.cache {
             init.cache(cache);
         }
 
-        if let Some(credentials) = self.credentials {
+        if let Some(credentials) = fetch_options.credentials {
             init.credentials(credentials);
         }
 
-        if let Some(redirect) = self.redirect {
+        if let Some(redirect) = fetch_options.redirect {
             init.redirect(redirect);
         }
 
-        if let Some(mode) = self.mode {
+        if let Some(mode) = fetch_options.mode {
             init.mode(mode);
         }
 
-        if let Some(referrer) = self.referrer {
+        if let Some(referrer) = fetch_options.referrer {
             match referrer {
                 Referrer::SameOriginUrl(referrer) => init.referrer(&referrer),
                 Referrer::AboutClient => init.referrer("about:client"),
                 Referrer::Empty => init.referrer(""),
             };
         }
 
-        if let Some(referrer_policy) = self.referrer_policy {
+        if let Some(referrer_policy) = fetch_options.referrer_policy {
             init.referrer_policy(referrer_policy);
         }
 
-        if let Some(integrity) = self.integrity {
+        if let Some(integrity) = fetch_options.integrity {
             init.integrity(&integrity);
         }
 
diff --git a/packages/yew/src/format/macros.rs b/packages/yew/src/format/macros.rs
@@ -20,12 +20,12 @@
 #[macro_export]
 macro_rules! text_format {
     ($type:ident based on $format:ident) => {
-        impl<'a, T> Into<$crate::format::Text> for $type<&'a T>
+        impl<'a, T> From<$type<&'a T>> for $crate::format::Text
         where
             T: ::serde::Serialize,
         {
-            fn into(self) -> $crate::format::Text {
-                $format::to_string(&self.0).map_err(::anyhow::Error::from)
+            fn from(value: $type<&'a T>) -> $crate::format::Text {
+                $format::to_string(&value.0).map_err(::anyhow::Error::from)
             }
         }
 
@@ -108,12 +108,12 @@ macro_rules! binary_format {
         binary_format!($type, $format::to_vec, $format::from_slice);
     };
     ($type:ident, $into:path, $from:path) => {
-        impl<'a, T> Into<$crate::format::Binary> for $type<&'a T>
+        impl<'a, T> From<$type<&'a T>> for $crate::format::Binary
         where
             T: ::serde::Serialize,
         {
-            fn into(self) -> $crate::format::Binary {
-                $into(&self.0).map_err(::anyhow::Error::from)
+            fn from(value: $type<&'a T>) -> $crate::format::Binary {
+                $into(&value.0).map_err(::anyhow::Error::from)
             }
         }
 
diff --git a/packages/yew/src/format/nothing.rs b/packages/yew/src/format/nothing.rs
@@ -7,6 +7,7 @@ use anyhow::bail;
 #[derive(Debug)]
 pub struct Nothing;
 
+#[allow(clippy::from_over_into)]
 impl Into<Text> for Nothing {
     fn into(self) -> Text {
         bail!("nothing")
@@ -19,6 +20,7 @@ impl From<Text> for Nothing {
     }
 }
 
+#[allow(clippy::from_over_into)]
 impl Into<Binary> for Nothing {
     fn into(self) -> Binary {
         bail!("nothing")

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ where`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-impl Into<Html> for ListVariant {`
`44`		`- fn into(self) -> Html {`
`45`		`- match self.props {`
	`43`	`+impl From<ListVariant> for Html {`
	`44`	`+ fn from(variant: ListVariant) -> Html {`
	`45`	`+ match variant.props {`
`46`	`46`	`Variants::Header(props) => {`
`47`	`47`	`VComp::new::<ListHeader>(props, NodeRef::default(), None).into()`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ impl<COMP: Component> BoxedVNodeProducer<COMP> {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-impl<COMP: Component> Into<VNode> for BoxedVNodeProducer<COMP> {`
`41`		`- fn into(self) -> VNode {`
`42`		`- self.build()`
	`40`	`+impl<COMP: Component> From<BoxedVNodeProducer<COMP>> for VNode {`
	`41`	`+ fn from(value: BoxedVNodeProducer<COMP>) -> VNode {`
	`42`	`+ value.build()`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ impl<T> Default for CallbackFuture<T> {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-impl<T: 'static> Into<Callback<T>> for CallbackFuture<T> {`
`39`		`- fn into(self) -> Callback<T> {`
`40`		`- Callback::from(move \|r\| self.finish(r))`
	`38`	`+impl<T: 'static> From<CallbackFuture<T>> for Callback<T> {`
	`39`	`+ fn from(f: CallbackFuture<T>) -> Self {`
	`40`	`+ Callback::from(move \|r\| f.finish(r))`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -74,39 +74,39 @@ pub struct FetchOptions {`
`74`	`74`	`pub integrity: Option<String>,`
`75`	`75`	`}`
`76`	`76`
`77`		`-impl Into<RequestInit> for FetchOptions {`
`78`		`- fn into(self) -> RequestInit {`
	`77`	`+impl From<FetchOptions> for RequestInit {`
	`78`	`+ fn from(fetch_options: FetchOptions) -> RequestInit {`
`79`	`79`	`let mut init = RequestInit::new();`
`80`	`80`
`81`		`- if let Some(cache) = self.cache {`
	`81`	`+ if let Some(cache) = fetch_options.cache {`
`82`	`82`	`init.cache(cache);`
`83`	`83`	`}`
`84`	`84`
`85`		`- if let Some(credentials) = self.credentials {`
	`85`	`+ if let Some(credentials) = fetch_options.credentials {`
`86`	`86`	`init.credentials(credentials);`
`87`	`87`	`}`
`88`	`88`
`89`		`- if let Some(redirect) = self.redirect {`
	`89`	`+ if let Some(redirect) = fetch_options.redirect {`
`90`	`90`	`init.redirect(redirect);`
`91`	`91`	`}`
`92`	`92`
`93`		`- if let Some(mode) = self.mode {`
	`93`	`+ if let Some(mode) = fetch_options.mode {`
`94`	`94`	`init.mode(mode);`
`95`	`95`	`}`
`96`	`96`
`97`		`- if let Some(referrer) = self.referrer {`
	`97`	`+ if let Some(referrer) = fetch_options.referrer {`
`98`	`98`	`match referrer {`
`99`	`99`	`Referrer::SameOriginUrl(referrer) => init.referrer(&referrer),`
`100`	`100`	`Referrer::AboutClient => init.referrer("about:client"),`
`101`	`101`	`Referrer::Empty => init.referrer(""),`
`102`	`102`	`};`
`103`	`103`	`}`
`104`	`104`
`105`		`- if let Some(referrer_policy) = self.referrer_policy {`
	`105`	`+ if let Some(referrer_policy) = fetch_options.referrer_policy {`
`106`	`106`	`init.referrer_policy(referrer_policy);`
`107`	`107`	`}`
`108`	`108`
`109`		`- if let Some(integrity) = self.integrity {`
	`109`	`+ if let Some(integrity) = fetch_options.integrity {`
`110`	`110`	`init.integrity(&integrity);`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@`
`20`	`20`	`#[macro_export]`
`21`	`21`	`macro_rules! text_format {`
`22`	`22`	`($type:ident based on $format:ident) => {`
`23`		`- impl<'a, T> Into<$crate::format::Text> for $type<&'a T>`
	`23`	`+ impl<'a, T> From<$type<&'a T>> for $crate::format::Text`
`24`	`24`	`where`
`25`	`25`	`T: ::serde::Serialize,`
`26`	`26`	`{`
`27`		`- fn into(self) -> $crate::format::Text {`
`28`		`- $format::to_string(&self.0).map_err(::anyhow::Error::from)`
	`27`	`+ fn from(value: $type<&'a T>) -> $crate::format::Text {`
	`28`	`+ $format::to_string(&value.0).map_err(::anyhow::Error::from)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -108,12 +108,12 @@ macro_rules! binary_format {`
`108`	`108`	`binary_format!($type, $format::to_vec, $format::from_slice);`
`109`	`109`	`};`
`110`	`110`	`($type:ident, $into:path, $from:path) => {`
`111`		`- impl<'a, T> Into<$crate::format::Binary> for $type<&'a T>`
	`111`	`+ impl<'a, T> From<$type<&'a T>> for $crate::format::Binary`
`112`	`112`	`where`
`113`	`113`	`T: ::serde::Serialize,`
`114`	`114`	`{`
`115`		`- fn into(self) -> $crate::format::Binary {`
`116`		`- $into(&self.0).map_err(::anyhow::Error::from)`
	`115`	`+ fn from(value: $type<&'a T>) -> $crate::format::Binary {`
	`116`	`+ $into(&value.0).map_err(::anyhow::Error::from)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ use anyhow::bail;`
`7`	`7`	`#[derive(Debug)]`
`8`	`8`	`pub struct Nothing;`
`9`	`9`
	`10`	`+#[allow(clippy::from_over_into)]`
`10`	`11`	`impl Into<Text> for Nothing {`
`11`	`12`	`fn into(self) -> Text {`
`12`	`13`	`bail!("nothing")`
`@@ -19,6 +20,7 @@ impl From<Text> for Nothing {`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
	`23`	`+#[allow(clippy::from_over_into)]`
`22`	`24`	`impl Into<Binary> for Nothing {`
`23`	`25`	`fn into(self) -> Binary {`
`24`	`26`	`bail!("nothing")`