From db0c54b7811d0825ed6fc9a168365392a85c64b2 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 6 Mar 2021 20:15:23 +0100 Subject: [PATCH] PropsBuilder: use from trait --- src/ui/layout/components/file_list.rs | 2 +- src/ui/layout/components/input.rs | 2 +- src/ui/layout/components/radio_group.rs | 2 +- src/ui/layout/props.rs | 17 +++++++---------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/ui/layout/components/file_list.rs b/src/ui/layout/components/file_list.rs index 68ec3e3..d270726 100644 --- a/src/ui/layout/components/file_list.rs +++ b/src/ui/layout/components/file_list.rs @@ -201,7 +201,7 @@ impl Component for FileList { /// This returns a prop builder in order to make easier to create /// new properties for the element. fn get_props(&self) -> PropsBuilder { - PropsBuilder::from_props(&self.props) + PropsBuilder::from(self.props.clone()) } /// ### on diff --git a/src/ui/layout/components/input.rs b/src/ui/layout/components/input.rs index 503a6ae..823815c 100644 --- a/src/ui/layout/components/input.rs +++ b/src/ui/layout/components/input.rs @@ -214,7 +214,7 @@ impl Component for Input { /// This returns a prop builder in order to make easier to create /// new properties for the element. fn get_props(&self) -> PropsBuilder { - PropsBuilder::from_props(&self.props) + PropsBuilder::from(self.props.clone()) } /// ### on diff --git a/src/ui/layout/components/radio_group.rs b/src/ui/layout/components/radio_group.rs index 0f379b1..e53caae 100644 --- a/src/ui/layout/components/radio_group.rs +++ b/src/ui/layout/components/radio_group.rs @@ -180,7 +180,7 @@ impl Component for RadioGroup { /// This returns a prop builder in order to make easier to create /// new properties for the element. fn get_props(&self) -> PropsBuilder { - PropsBuilder::from_props(&self.props) + PropsBuilder::from(self.props.clone()) } /// ### on diff --git a/src/ui/layout/props.rs b/src/ui/layout/props.rs index b7662ac..6c506af 100644 --- a/src/ui/layout/props.rs +++ b/src/ui/layout/props.rs @@ -95,15 +95,6 @@ pub struct PropsBuilder { } impl PropsBuilder { - /// ### from_props - /// - /// Create a props builder from existing properties - pub fn from_props(props: &Props) -> Self { - PropsBuilder { - props: Some(props.clone()), - } - } - /// ### build /// /// Build Props from builder @@ -222,6 +213,12 @@ impl PropsBuilder { } } +impl From for PropsBuilder { + fn from(props: Props) -> Self { + PropsBuilder { props: Some(props) } + } +} + impl Default for PropsBuilder { fn default() -> Self { PropsBuilder { @@ -413,7 +410,7 @@ mod tests { )) .build(); // Ok, now make a builder from properties - let builder: PropsBuilder = PropsBuilder::from_props(&props); + let builder: PropsBuilder = PropsBuilder::from(props); assert!(builder.props.is_some()); }