From 0539cd1b85d00a2accca200184a5980527851539 Mon Sep 17 00:00:00 2001 From: Théo Gaillard Date: Mon, 30 Mar 2020 06:30:22 +0800 Subject: refactor: remove not mandatory static lifetime --- native/src/widget/row.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'native/src/widget/row.rs') diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index c8812ea2..7689abbf 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -236,7 +236,7 @@ impl<'a, Message, Renderer> From> for Element<'a, Message, Renderer> where Renderer: 'a + self::Renderer, - Message: 'static, + Message: 'a, { fn from(row: Row<'a, Message, Renderer>) -> Element<'a, Message, Renderer> { Element::new(row) -- cgit From d07304fb85c4ea7293b61c5d0a366ffbbc511de2 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 30 Mar 2020 17:28:55 +0200 Subject: Hash type ids in `Widget::hash_layout` impls --- native/src/widget/row.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'native/src/widget/row.rs') diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index 7689abbf..5f139f66 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -125,7 +125,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> { impl<'a, Message, Renderer> Widget for Row<'a, Message, Renderer> where - Renderer: self::Renderer, + Renderer: 'static + self::Renderer, { fn width(&self) -> Length { self.width @@ -191,7 +191,8 @@ where } fn hash_layout(&self, state: &mut Hasher) { - 1.hash(state); + std::any::TypeId::of::>().hash(state); + self.width.hash(state); self.height.hash(state); self.max_width.hash(state); @@ -235,7 +236,7 @@ pub trait Renderer: crate::Renderer + Sized { impl<'a, Message, Renderer> From> for Element<'a, Message, Renderer> where - Renderer: 'a + self::Renderer, + Renderer: 'static + self::Renderer, Message: 'a, { fn from(row: Row<'a, Message, Renderer>) -> Element<'a, Message, Renderer> { -- cgit