From 0539cd1b85d00a2accca200184a5980527851539 Mon Sep 17 00:00:00 2001
From: Théo Gaillard <theo.gaillard@protonmail.com>
Date: Mon, 30 Mar 2020 06:30:22 +0800
Subject: refactor: remove not mandatory static lifetime

---
 native/src/widget/container.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index d1cbb32e..db266d4f 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -228,7 +228,7 @@ impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Renderer: 'a + self::Renderer,
-    Message: 'static,
+    Message: 'a,
 {
     fn from(
         column: Container<'a, Message, Renderer>,
-- 
cgit 


From d07304fb85c4ea7293b61c5d0a366ffbbc511de2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 30 Mar 2020 17:28:55 +0200
Subject: Hash type ids in `Widget::hash_layout` impls

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

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

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index db266d4f..11ef23a9 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -122,7 +122,7 @@ where
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Container<'a, Message, Renderer>
 where
-    Renderer: self::Renderer,
+    Renderer: 'static + self::Renderer,
 {
     fn width(&self) -> Length {
         self.width
@@ -189,7 +189,8 @@ where
     }
 
     fn hash_layout(&self, state: &mut Hasher) {
-        0.hash(state);
+        std::any::TypeId::of::<Container<'_, (), Renderer>>().hash(state);
+
         self.width.hash(state);
         self.height.hash(state);
         self.max_width.hash(state);
@@ -227,7 +228,7 @@ pub trait Renderer: crate::Renderer {
 impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
-    Renderer: 'a + self::Renderer,
+    Renderer: 'static + self::Renderer,
     Message: 'a,
 {
     fn from(
-- 
cgit