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

Remove superfluous generic type in iced_lazy::Cache

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-01-11 14:55:48 +07:00
parent 2e255b7b91
commit 5a03cac7e7
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lazy/src/component.rs
View file

@ -24,11 +24,11 @@ where
state: RefCell::new(Some( state: RefCell::new(Some(
StateBuilder { StateBuilder {
component: Box::new(component), component: Box::new(component),
message: PhantomData,
cache_builder: |state| { cache_builder: |state| {
Some( Some(
CacheBuilder { CacheBuilder {
element: state.view(), element: state.view(),
message: PhantomData,
overlay_builder: |_| None, overlay_builder: |_| None,
} }
.build(), .build(),
@ -55,20 +55,20 @@ struct Instance<'a, Message, Renderer, Event> {
#[self_referencing] #[self_referencing]
struct State<'a, Message: 'a, Renderer: 'a, Event: 'a> { struct State<'a, Message: 'a, Renderer: 'a, Event: 'a> {
component: Box<dyn Component<Message, Renderer, Event = Event> + 'a>, component: Box<dyn Component<Message, Renderer, Event = Event> + 'a>,
message: PhantomData<Message>,
#[borrows(mut component)] #[borrows(mut component)]
#[covariant] #[covariant]
cache: Option<Cache<'this, Message, Renderer, Event>>, cache: Option<Cache<'this, Event, Renderer>>,
} }
#[self_referencing] #[self_referencing]
struct Cache<'a, Message, Renderer: 'a, Event: 'a> { struct Cache<'a, Message: 'a, Renderer: 'a> {
element: Element<'a, Event, Renderer>, element: Element<'a, Message, Renderer>,
message: PhantomData<Message>,
#[borrows(mut element)] #[borrows(mut element)]
#[covariant] #[covariant]
overlay: Option<overlay::Element<'this, Event, Renderer>>, overlay: Option<overlay::Element<'this, Message, Renderer>>,
} }
impl<'a, Message, Renderer, Event> Instance<'a, Message, Renderer, Event> { impl<'a, Message, Renderer, Event> Instance<'a, Message, Renderer, Event> {
@ -94,7 +94,6 @@ impl<'a, Message, Renderer, Event> Instance<'a, Message, Renderer, Event> {
*cache = Some( *cache = Some(
CacheBuilder { CacheBuilder {
element, element,
message: PhantomData,
overlay_builder: |_| None, overlay_builder: |_| None,
} }
.build(), .build(),
@ -170,11 +169,11 @@ where
*self.state.borrow_mut() = Some( *self.state.borrow_mut() = Some(
StateBuilder { StateBuilder {
component, component,
message: PhantomData,
cache_builder: |state| { cache_builder: |state| {
Some( Some(
CacheBuilder { CacheBuilder {
element: state.view(), element: state.view(),
message: PhantomData,
overlay_builder: |_| None, overlay_builder: |_| None,
} }
.build(), .build(),
@ -242,7 +241,6 @@ where
*cache = Some( *cache = Some(
CacheBuilder { CacheBuilder {
element, element,
message: PhantomData,
overlay_builder: |element| { overlay_builder: |element| {
element.overlay(layout, renderer) element.overlay(layout, renderer)
}, },
@ -406,11 +404,11 @@ where
self.instance.state = RefCell::new(Some( self.instance.state = RefCell::new(Some(
StateBuilder { StateBuilder {
component, component,
message: PhantomData,
cache_builder: |state| { cache_builder: |state| {
Some( Some(
CacheBuilder { CacheBuilder {
element: state.view(), element: state.view(),
message: PhantomData,
overlay_builder: |element| { overlay_builder: |element| {
element.overlay(layout, renderer) element.overlay(layout, renderer)
}, },