summaryrefslogtreecommitdiffstats
path: root/native/src/widget/container.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2020-03-30 17:39:54 +0200
committerLibravatar GitHub <noreply@github.com>2020-03-30 17:39:54 +0200
commit6e9ab1cd6f5358d323040379e3aadbed2cc4f7f8 (patch)
tree7337c03004fd8addb891385f67ef60f11d3ceee2 /native/src/widget/container.rs
parent5b2c71a708f907f2b3c73bcdf56fbca5cd80adde (diff)
parentd07304fb85c4ea7293b61c5d0a366ffbbc511de2 (diff)
downloadiced-6e9ab1cd6f5358d323040379e3aadbed2cc4f7f8.tar.gz
iced-6e9ab1cd6f5358d323040379e3aadbed2cc4f7f8.tar.bz2
iced-6e9ab1cd6f5358d323040379e3aadbed2cc4f7f8.zip
Merge pull request #245 from tirz/refactor-bound_lifetime
refactor: remove not mandatories 'static lifetimes
Diffstat (limited to 'native/src/widget/container.rs')
-rw-r--r--native/src/widget/container.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index d1cbb32e..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,8 +228,8 @@ pub trait Renderer: crate::Renderer {
impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>>
for Element<'a, Message, Renderer>
where
- Renderer: 'a + self::Renderer,
- Message: 'static,
+ Renderer: 'static + self::Renderer,
+ Message: 'a,
{
fn from(
column: Container<'a, Message, Renderer>,