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/scrollable.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index ec9746d4..cd4a9dfa 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -506,7 +506,7 @@ impl<'a, Message, Renderer> From<Scrollable<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Renderer: 'static + self::Renderer + column::Renderer,
-    Message: 'static,
+    Message: 'a,
 {
     fn from(
         scrollable: Scrollable<'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/scrollable.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index cd4a9dfa..ba39edb1 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -311,7 +311,7 @@ where
     }
 
     fn hash_layout(&self, state: &mut Hasher) {
-        std::any::TypeId::of::<Scrollable<'static, (), Renderer>>().hash(state);
+        std::any::TypeId::of::<Scrollable<'_, (), Renderer>>().hash(state);
 
         self.height.hash(state);
         self.max_height.hash(state);
-- 
cgit