From f7d7ab1ba9a037be6bf2a32f7b2662e5314ae3a5 Mon Sep 17 00:00:00 2001
From: Olivier Pinon <oliv.pinon@gmail.com>
Date: Sun, 12 Apr 2020 00:40:51 +0200
Subject: Remove unnecessary 'static lifetime on Renderer

---
 native/src/widget/column.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'native/src/widget/column.rs')

diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index 77b8496b..ee02244d 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -124,7 +124,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Column<'a, Message, Renderer>
 where
-    Renderer: 'static + self::Renderer,
+    Renderer: self::Renderer,
 {
     fn width(&self) -> Length {
         self.width
@@ -190,7 +190,8 @@ where
     }
 
     fn hash_layout(&self, state: &mut Hasher) {
-        std::any::TypeId::of::<Column<'_, (), Renderer>>().hash(state);
+        struct ColumnWidget;
+        std::any::TypeId::of::<ColumnWidget>().hash(state);
 
         self.width.hash(state);
         self.height.hash(state);
@@ -234,7 +235,7 @@ pub trait Renderer: crate::Renderer + Sized {
 impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
-    Renderer: 'static + self::Renderer,
+    Renderer: 'a + self::Renderer,
     Message: 'a,
 {
     fn from(
-- 
cgit 


From 41f6a325e9b6c9df18ab2c3bcf386be988f4b4ef Mon Sep 17 00:00:00 2001
From: Olivier Pinon <oliv.pinon@gmail.com>
Date: Sun, 12 Apr 2020 01:20:40 +0200
Subject: #288 Renamed XXXWidget to Marker

---
 native/src/widget/column.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'native/src/widget/column.rs')

diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index ee02244d..259a7e6e 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -190,8 +190,8 @@ where
     }
 
     fn hash_layout(&self, state: &mut Hasher) {
-        struct ColumnWidget;
-        std::any::TypeId::of::<ColumnWidget>().hash(state);
+        struct Marker;
+        std::any::TypeId::of::<Marker>().hash(state);
 
         self.width.hash(state);
         self.height.hash(state);
-- 
cgit