Loose lifetime bounds in pure::Widget implementations

This commit is contained in:
Héctor Ramón Jiménez 2022-03-29 18:24:17 +07:00
parent 323a0b9e61
commit d9d6dff550
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
10 changed files with 22 additions and 22 deletions

View file

@ -75,8 +75,8 @@ impl<'a, Message, Renderer> Button<'a, Message, Renderer> {
impl<'a, Message, Renderer> Widget<Message, Renderer>
for Button<'a, Message, Renderer>
where
Message: 'static + Clone,
Renderer: 'static + iced_native::Renderer,
Message: 'a + Clone,
Renderer: 'a + iced_native::Renderer,
{
fn tag(&self) -> tree::Tag {
tree::Tag::of::<State>()
@ -216,8 +216,8 @@ where
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
for Button<'a, Message, Renderer>
where
Message: Clone + 'static,
Renderer: iced_native::Renderer + 'static,
Message: Clone + 'a,
Renderer: iced_native::Renderer + 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)

View file

@ -216,8 +216,8 @@ where
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
for Column<'a, Message, Renderer>
where
Message: 'static,
Renderer: iced_native::Renderer + 'static,
Message: 'a,
Renderer: iced_native::Renderer + 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)

View file

@ -109,7 +109,7 @@ impl<'a, T: 'a, Message, Renderer> Widget<Message, Renderer>
where
T: Clone + ToString + Eq + 'static,
[T]: ToOwned<Owned = Vec<T>>,
Message: 'static,
Message: 'a,
Renderer: text::Renderer + 'a,
{
fn tag(&self) -> tree::Tag {
@ -226,7 +226,7 @@ where
T: Clone + ToString + Eq + 'static,
[T]: ToOwned<Owned = Vec<T>>,
Renderer: text::Renderer + 'a,
Message: 'static,
Message: 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)

View file

@ -203,8 +203,8 @@ where
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
for Row<'a, Message, Renderer>
where
Message: 'static,
Renderer: iced_native::Renderer + 'static,
Message: 'a,
Renderer: iced_native::Renderer + 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)

View file

@ -19,7 +19,7 @@ pub struct Scrollable<'a, Message, Renderer> {
scrollbar_width: u16,
scrollbar_margin: u16,
scroller_width: u16,
on_scroll: Option<Box<dyn Fn(f32) -> Message>>,
on_scroll: Option<Box<dyn Fn(f32) -> Message + 'a>>,
style_sheet: Box<dyn StyleSheet + 'a>,
content: Element<'a, Message, Renderer>,
}
@ -71,7 +71,7 @@ impl<'a, Message, Renderer: iced_native::Renderer>
///
/// The function takes the new relative offset of the [`Scrollable`]
/// (e.g. `0` means top, while `1` means bottom).
pub fn on_scroll(mut self, f: impl Fn(f32) -> Message + 'static) -> Self {
pub fn on_scroll(mut self, f: impl Fn(f32) -> Message + 'a) -> Self {
self.on_scroll = Some(Box::new(f));
self
}

View file

@ -53,7 +53,7 @@ where
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
for Text<Renderer>
where
Renderer: text::Renderer + 'static,
Renderer: text::Renderer + 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)
@ -62,7 +62,7 @@ where
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for &'a str
where
Renderer: text::Renderer + 'static,
Renderer: text::Renderer + 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Text::new(self).into()