From b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 19 Sep 2019 18:47:01 +0200
Subject: Remove generic `Color` in widgets

---
 examples/tour/src/iced_ggez/renderer/debugger.rs | 2 --
 examples/tour/src/iced_ggez/renderer/text.rs     | 2 +-
 examples/tour/src/iced_ggez/widget.rs            | 7 +++----
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'examples/tour/src/iced_ggez')

diff --git a/examples/tour/src/iced_ggez/renderer/debugger.rs b/examples/tour/src/iced_ggez/renderer/debugger.rs
index c6727881..eba03ebf 100644
--- a/examples/tour/src/iced_ggez/renderer/debugger.rs
+++ b/examples/tour/src/iced_ggez/renderer/debugger.rs
@@ -2,8 +2,6 @@ use super::{into_color, Renderer};
 use ggez::graphics::{DrawMode, MeshBuilder, Rect};
 
 impl iced::renderer::Debugger for Renderer<'_> {
-    type Color = iced::Color;
-
     fn explain(&mut self, layout: &iced::Layout<'_>, color: iced::Color) {
         let bounds = layout.bounds();
 
diff --git a/examples/tour/src/iced_ggez/renderer/text.rs b/examples/tour/src/iced_ggez/renderer/text.rs
index b5010639..450ca2cd 100644
--- a/examples/tour/src/iced_ggez/renderer/text.rs
+++ b/examples/tour/src/iced_ggez/renderer/text.rs
@@ -5,7 +5,7 @@ use iced::text;
 use std::cell::RefCell;
 use std::f32;
 
-impl text::Renderer<iced::Color> for Renderer<'_> {
+impl text::Renderer for Renderer<'_> {
     fn node(
         &self,
         style: iced::Style,
diff --git a/examples/tour/src/iced_ggez/widget.rs b/examples/tour/src/iced_ggez/widget.rs
index a365daca..c9f857f6 100644
--- a/examples/tour/src/iced_ggez/widget.rs
+++ b/examples/tour/src/iced_ggez/widget.rs
@@ -1,10 +1,9 @@
 use super::Renderer;
 
-pub use iced::{button, slider, text, Align, Button, Color, Slider};
+pub use iced::{
+    button, slider, text, Align, Button, Checkbox, Color, Radio, Slider, Text,
+};
 
-pub type Text = iced::Text<Color>;
-pub type Checkbox<Message> = iced::Checkbox<Color, Message>;
-pub type Radio<Message> = iced::Radio<Color, Message>;
 pub type Image<'a> = iced::Image<&'a str>;
 
 pub type Column<'a, Message> = iced::Column<'a, Message, Renderer<'a>>;
-- 
cgit