me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove unnecessary 'static lifetime on Renderer

Browse source
This commit is contained in:
Olivier Pinon 2020-04-12 00:40:51 +02:00
parent e941eab4ab
commit f7d7ab1ba9
11 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
native/src/widget/scrollable.rs
View file

@ -115,7 +115,7 @@ impl<'a, Message, Renderer: self::Renderer> Scrollable<'a, Message, Renderer> {
impl<'a, Message, Renderer> Widget<Message, Renderer>
for Scrollable<'a, Message, Renderer>
where
Renderer: 'static + self::Renderer + column::Renderer,
Renderer: self::Renderer + column::Renderer,
{
fn width(&self) -> Length {
Widget::<Message, Renderer>::width(&self.content)
@ -311,7 +311,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
std::any::TypeId::of::<Scrollable<'_, (), Renderer>>().hash(state);
struct ScrollableWidget;
std::any::TypeId::of::<ScrollableWidget>().hash(state);
self.height.hash(state);
self.max_height.hash(state);
@ -505,7 +506,7 @@ pub trait Renderer: crate::Renderer + Sized {
impl<'a, Message, Renderer> From<Scrollable<'a, Message, Renderer>>
for Element<'a, Message, Renderer>
where
Renderer: 'static + self::Renderer + column::Renderer,
Renderer: 'a + self::Renderer + column::Renderer,
Message: 'a,
{
fn from(