From 6fbba6f4eec1f2e7150f02e4c171f8ee60a46236 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 31 Aug 2019 06:20:56 +0200
Subject: Make `clippy` happy
---
src/widget/column.rs | 3 ++-
src/widget/row.rs | 3 ++-
src/widget/text.rs | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'src/widget')
diff --git a/src/widget/column.rs b/src/widget/column.rs
index 83dd2f98..903de897 100644
--- a/src/widget/column.rs
+++ b/src/widget/column.rs
@@ -10,6 +10,7 @@ use crate::{
/// A [`Column`] will try to fill the horizontal space of its container.
///
/// [`Column`]: struct.Column.html
+#[derive(Default)]
pub struct Column<'a, Message, Renderer> {
style: Style,
spacing: u16,
@@ -144,7 +145,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
let mut style = node.0.style();
style.margin.bottom =
- stretch::style::Dimension::Points(self.spacing as f32);
+ stretch::style::Dimension::Points(f32::from(self.spacing));
node.0.set_style(style);
node
diff --git a/src/widget/row.rs b/src/widget/row.rs
index a4d1be2c..7b7033a1 100644
--- a/src/widget/row.rs
+++ b/src/widget/row.rs
@@ -10,6 +10,7 @@ use crate::{
/// A [`Row`] will try to fill the horizontal space of its container.
///
/// [`Row`]: struct.Row.html
+#[derive(Default)]
pub struct Row<'a, Message, Renderer> {
style: Style,
spacing: u16,
@@ -141,7 +142,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
let mut style = node.0.style();
style.margin.end =
- stretch::style::Dimension::Points(self.spacing as f32);
+ stretch::style::Dimension::Points(f32::from(self.spacing));
node.0.set_style(style);
node
diff --git a/src/widget/text.rs b/src/widget/text.rs
index c4b7eabb..7b62e5cb 100644
--- a/src/widget/text.rs
+++ b/src/widget/text.rs
@@ -112,7 +112,7 @@ where
Renderer: self::Renderer<Color>,
{
fn node(&self, renderer: &Renderer) -> Node {
- renderer.node(self.style, &self.content, self.size as f32)
+ renderer.node(self.style, &self.content, f32::from(self.size))
}
fn draw(
@@ -124,7 +124,7 @@ where
renderer.draw(
layout.bounds(),
&self.content,
- self.size as f32,
+ f32::from(self.size),
self.color,
self.horizontal_alignment,
self.vertical_alignment,
--
cgit