From 32fd8dadda6636b11d4a1d9f59b467e57b3706a8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 18 Mar 2022 22:13:52 +0700
Subject: Reintroduce generic `Message` type for `canvas::Program`

As it is useful to make the `Message` completely free in many
implementations.
---
 examples/bezier_tool/src/main.rs       | 4 +---
 examples/clock/src/main.rs             | 4 +---
 examples/color_palette/src/main.rs     | 4 +---
 examples/game_of_life/src/main.rs      | 4 +---
 examples/pure/game_of_life/src/main.rs | 3 +--
 examples/solar_system/src/main.rs      | 4 +---
 6 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'examples')

diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index fc7ef0c9..35b5182c 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -104,9 +104,7 @@ mod bezier {
         curves: &'a [Curve],
     }
 
-    impl<'a> canvas::Program for Bezier<'a> {
-        type Message = Curve;
-
+    impl<'a> canvas::Program<Curve> for Bezier<'a> {
         fn update(
             &mut self,
             event: Event,
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
index 41d160c1..3b8a1d6a 100644
--- a/examples/clock/src/main.rs
+++ b/examples/clock/src/main.rs
@@ -76,9 +76,7 @@ impl Application for Clock {
     }
 }
 
-impl canvas::Program for Clock {
-    type Message = Message;
-
+impl<Message> canvas::Program<Message> for Clock {
     fn draw(&self, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry> {
         let clock = self.clock.draw(bounds.size(), |frame| {
             let center = frame.center();
diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index c9c0637e..5dbbd8f3 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -235,9 +235,7 @@ impl Theme {
     }
 }
 
-impl canvas::Program for Theme {
-    type Message = Message;
-
+impl<Message> canvas::Program<Message> for Theme {
     fn draw(&self, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry> {
         let theme = self.canvas_cache.draw(bounds.size(), |frame| {
             self.draw(frame);
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index 43ef8ffd..ab8b80e4 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -328,9 +328,7 @@ mod grid {
         }
     }
 
-    impl<'a> canvas::Program for Grid {
-        type Message = Message;
-
+    impl<'a> canvas::Program<Message> for Grid {
         fn update(
             &mut self,
             event: Event,
diff --git a/examples/pure/game_of_life/src/main.rs b/examples/pure/game_of_life/src/main.rs
index f63ef41b..a3164701 100644
--- a/examples/pure/game_of_life/src/main.rs
+++ b/examples/pure/game_of_life/src/main.rs
@@ -394,8 +394,7 @@ mod grid {
         }
     }
 
-    impl canvas::Program for Grid {
-        type Message = Message;
+    impl canvas::Program<Message> for Grid {
         type State = Interaction;
 
         fn update(
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index bf96fee0..12184dd1 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -128,9 +128,7 @@ impl State {
     }
 }
 
-impl canvas::Program for State {
-    type Message = Message;
-
+impl<Message> canvas::Program<Message> for State {
     fn draw(
         &self,
         bounds: Rectangle,
-- 
cgit