Fix Clippy warnings

Author: dsferruzza

src/backend.rs

@@ -92,7 +92,7 @@ impl<'a, 'b> DrawingBackend for ConrodBackend<'a, 'b> {
         style: &S,
     ) -> Result<(), DrawingErrorKind<Self::ErrorType>> {
         // Acquire absolute position generator (in parent container)
-        if let Some(position) = position::PositionParent::from(&self.ui, self.parent) {
+        if let Some(position) = position::PositionParent::from(self.ui, self.parent) {
             // Generate line style
             let line_style = conrod::widget::primitive::line::Style::solid()
                 .color(color::Color::from(&style.color()).into())
@@ -159,7 +159,7 @@ impl<'a, 'b> DrawingBackend for ConrodBackend<'a, 'b> {
         style: &S,
     ) -> Result<(), DrawingErrorKind<Self::ErrorType>> {
         // Acquire absolute position generator (in parent container)
-        if let Some(position) = position::PositionParent::from(&self.ui, self.parent) {
+        if let Some(position) = position::PositionParent::from(self.ui, self.parent) {
             // Generate line style
             let line_style = conrod::widget::primitive::line::Style::solid()
                 .color(color::Color::from(&style.color()).into())
@@ -221,7 +221,7 @@ impl<'a, 'b> DrawingBackend for ConrodBackend<'a, 'b> {
         style: &S,
     ) -> Result<(), DrawingErrorKind<Self::ErrorType>> {
         // Acquire absolute position generator (in parent container)
-        if let Some(position) = position::PositionParent::from(&self.ui, self.parent) {
+        if let Some(position) = position::PositionParent::from(self.ui, self.parent) {
             // Paint a simplified path, where empty areas are removed and un-necessary points are \
             //   cleared. This is required for triangulation to work properly, and it reduces \
             //   the number of triangles on screen to a strict minimum.
@@ -278,17 +278,17 @@ impl<'a, 'b> DrawingBackend for ConrodBackend<'a, 'b> {
         let (text_width_estimated, font_size_final) = convert::font_style(text, style.size());
 
         // Generate text style
-        let mut text_style = conrod::widget::primitive::text::Style::default();
-
-        text_style.color = Some(color::Color::from(&style.color()).into());
-        text_style.font_id = Some(Some(self.font));
-        text_style.font_size = Some(font_size_final);
-
-        text_style.justify = Some(match style.anchor().h_pos {
-            text_anchor::HPos::Left => conrod::text::Justify::Left,
-            text_anchor::HPos::Right => conrod::text::Justify::Right,
-            text_anchor::HPos::Center => conrod::text::Justify::Center,
-        });
+        let text_style = conrod::widget::primitive::text::Style {
+            font_size: Some(font_size_final),
+            font_id: Some(Some(self.font)),
+            color: Some(color::Color::from(&style.color()).into()),
+            justify: Some(match style.anchor().h_pos {
+                text_anchor::HPos::Left => conrod::text::Justify::Left,
+                text_anchor::HPos::Right => conrod::text::Justify::Right,
+                text_anchor::HPos::Center => conrod::text::Justify::Center,
+            }),
+            ..std::default::Default::default()
+        };
 
         // Render text widget
         conrod::widget::Text::new(text)

src/triangulate/mod.rs

@@ -41,15 +41,15 @@ pub(crate) struct Polygon {
     ll: *mut c_void,
 }
 
-pub(crate) struct CDT {
+pub(crate) struct Cdt {
     ll: *mut c_void,
 }
 
 pub(crate) struct TriangleVec {
     ll: *mut c_void,
 
     #[allow(dead_code)]
-    cdt: CDT,
+    cdt: Cdt,
 }
 
 #[derive(Copy, Clone, PartialEq)]
@@ -94,10 +94,10 @@ impl Drop for Polygon {
     }
 }
 
-impl CDT {
-    pub(crate) fn new(polygon: Polygon) -> CDT {
+impl Cdt {
+    pub(crate) fn new(polygon: Polygon) -> Cdt {
         unsafe {
-            let rv = CDT {
+            let rv = Cdt {
                 ll: p2t_cdt_new(polygon.ll),
             };
 
@@ -118,7 +118,7 @@ impl CDT {
     }
 }
 
-impl Drop for CDT {
+impl Drop for Cdt {
     fn drop(&mut self) {
         unsafe {
             p2t_cdt_free(self.ll);
@@ -164,5 +164,5 @@ pub(crate) fn triangulate_points<'a, I>(points: I) -> TriangleVec
 where
     I: Iterator<Item = &'a [Scalar; 2]>,
 {
-    CDT::new(Polygon::from_iterator(points)).triangulate()
+    Cdt::new(Polygon::from_iterator(points)).triangulate()
 }

src/utils/color.rs

@@ -30,10 +30,10 @@ impl From<&BackendColor> for Color {
     }
 }
 
-impl Into<conrod::color::Color> for Color {
+impl From<Color> for conrod::color::Color {
     #[inline(always)]
-    fn into(self) -> conrod::color::Color {
-        self.0
+    fn from(c: Color) -> Self {
+        c.0
     }
 }
 

src/utils/path.rs

@@ -38,12 +38,13 @@ impl<I: Iterator<Item = PathSimplifierPointInner>> Iterator for PathSimplifier<I
 
     fn next(&mut self) -> Option<Self::Item> {
         // Branch to source points iterator (exhaust next group)
-        while let Some(point) = self.source_points.next() {
+        for point in &mut self.source_points {
             // Backtrack in points
-            if let Some(point_before) = self.last_point {
-                // Retain current point as 'last point'
-                self.last_point = Some(point);
 
+            // Retain current point as 'last point'
+            self.last_point = Some(point);
+
+            if let Some(point_before) = self.last_point {
                 // De-duplicate points
                 if point_before != point {
                     let mut do_yield = false;
@@ -105,9 +106,6 @@ impl<I: Iterator<Item = PathSimplifierPointInner>> Iterator for PathSimplifier<I
                         ]);
                     }
                 }
-            } else {
-                // Retain first point as 'last point'
-                self.last_point = Some(point);
             }
         }
 

src/utils/position.rs

@@ -19,14 +19,10 @@ pub(crate) struct PositionParent {
 impl PositionParent {
     #[inline(always)]
     pub(crate) fn from(ui: &conrod::UiCell, parent: conrod::widget::Id) -> Option<Self> {
-        if let Some(parent_rect) = ui.rect_of(parent) {
-            Some(Self {
-                x_start: parent_rect.x.start as PositionScalar,
-                y_end: parent_rect.y.end as PositionScalar,
-            })
-        } else {
-            None
-        }
+        ui.rect_of(parent).map(|parent_rect| Self {
+            x_start: parent_rect.x.start as PositionScalar,
+            y_end: parent_rect.y.end as PositionScalar,
+        })
     }
 
     #[inline(always)]