From 1ccea995d75d6984dcc06a0d672e3736ab527be4 Mon Sep 17 00:00:00 2001 From: Rijnard van Tonder Date: Wed, 26 Dec 2018 15:08:08 -0500 Subject: [PATCH] refactor: use shorthand fields --- conrod_core/src/render.rs | 6 +++--- conrod_core/src/widget/list.rs | 2 +- conrod_core/src/widget/list_select.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conrod_core/src/render.rs b/conrod_core/src/render.rs index 6254cfa6a..5c354e095 100644 --- a/conrod_core/src/render.rs +++ b/conrod_core/src/render.rs @@ -344,7 +344,7 @@ impl<'a> Primitives<'a> { let color = style.get_color(theme); match *style { ShapeStyle::Fill(_) => { - let kind = PrimitiveKind::Rectangle { color: color }; + let kind = PrimitiveKind::Rectangle { color }; return Some(new_primitive(id, kind, scizzor, rect)); }, ShapeStyle::Outline(ref line_style) => { @@ -652,7 +652,7 @@ impl<'a> Primitives<'a> { match kind { PrimitiveKind::Rectangle { color } => { - let kind = OwnedPrimitiveKind::Rectangle { color: color }; + let kind = OwnedPrimitiveKind::Rectangle { color }; primitives.push(new(kind)); }, @@ -801,7 +801,7 @@ impl<'a> WalkOwnedPrimitives<'a> { match *kind { OwnedPrimitiveKind::Rectangle { color } => { - let kind = PrimitiveKind::Rectangle { color: color }; + let kind = PrimitiveKind::Rectangle { color }; new(kind) }, diff --git a/conrod_core/src/widget/list.rs b/conrod_core/src/widget/list.rs index 1b19db1a6..088067657 100644 --- a/conrod_core/src/widget/list.rs +++ b/conrod_core/src/widget/list.rs @@ -266,7 +266,7 @@ impl List style: style, num_items: num_items, item_instantiation: ItemInstantiation::OnlyVisible, - item_size: Fixed { length: length }, + item_size: Fixed { length }, direction: std::marker::PhantomData, } } diff --git a/conrod_core/src/widget/list_select.rs b/conrod_core/src/widget/list_select.rs index 794aa4658..c11f884ee 100644 --- a/conrod_core/src/widget/list_select.rs +++ b/conrod_core/src/widget/list_select.rs @@ -258,7 +258,7 @@ impl ListSelect num_items: num_items, mode: mode, direction: direction, - item_size: widget::list::Fixed { length: length }, + item_size: widget::list::Fixed { length }, style: style, item_instantiation: widget::list::ItemInstantiation::OnlyVisible, }