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

refactor: remove not mandatory static lifetime

Browse source
This commit is contained in:
Théo Gaillard 2020-03-30 06:30:22 +08:00
parent 5b2c71a708
commit 0539cd1b85
No known key found for this signature in database
GPG key ID: 9C6AAAF893B070FC
13 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
native/src/widget/pane_grid.rs
View file

@ -187,10 +187,10 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
/// Panes can be dragged using `Modifier keys + Left click`.
///
/// [`PaneGrid`]: struct.PaneGrid.html
pub fn on_drag(
mut self,
f: impl Fn(DragEvent) -> Message + 'static,
) -> Self {
pub fn on_drag<F>(mut self, f: F) -> Self
where
F: 'static + Fn(DragEvent) -> Message,
{
self.on_drag = Some(Box::new(f));
self
}
@ -201,10 +201,10 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
/// Panes can be resized using `Modifier keys + Right click`.
///
/// [`PaneGrid`]: struct.PaneGrid.html
pub fn on_resize(
mut self,
f: impl Fn(ResizeEvent) -> Message + 'static,
) -> Self {
pub fn on_resize<F>(mut self, f: F) -> Self
where
F: 'static + Fn(ResizeEvent) -> Message,
{
self.on_resize = Some(Box::new(f));
self
}
@ -226,10 +226,10 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
///
/// [`PaneGrid`]: struct.PaneGrid.html
/// [`Pane`]: struct.Pane.html
pub fn on_key_press(
mut self,
f: impl Fn(KeyPressEvent) -> Option<Message> + 'static,
) -> Self {
pub fn on_key_press<F>(mut self, f: F) -> Self
where
F: 'static + Fn(KeyPressEvent) -> Option<Message>,
{
self.on_key_press = Some(Box::new(f));
self
}
@ -348,7 +348,7 @@ pub struct KeyPressEvent {
impl<'a, Message, Renderer> Widget<Message, Renderer>
for PaneGrid<'a, Message, Renderer>
where
Renderer: self::Renderer + 'static,
Renderer: 'static + self::Renderer,
Message: 'static,
{
fn width(&self) -> Length {
@ -636,7 +636,7 @@ pub trait Renderer: crate::Renderer + Sized {
impl<'a, Message, Renderer> From<PaneGrid<'a, Message, Renderer>>
for Element<'a, Message, Renderer>
where
Renderer: self::Renderer + 'static,
Renderer: 'static + self::Renderer,
Message: 'static,
{
fn from(