From 602661372c921ef5079283ccd5f477c63977239f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 2 Dec 2024 19:53:16 +0100 Subject: Fix new `clippy` lints --- core/src/element.rs | 4 ++-- core/src/overlay/element.rs | 10 +++++----- core/src/overlay/group.rs | 10 +++++----- core/src/text.rs | 4 ++-- core/src/widget/operation.rs | 4 ++-- core/src/widget/text.rs | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'core/src') diff --git a/core/src/element.rs b/core/src/element.rs index 03e56b43..82ba753b 100644 --- a/core/src/element.rs +++ b/core/src/element.rs @@ -394,8 +394,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget - for Explain<'a, Message, Theme, Renderer> +impl Widget + for Explain<'_, Message, Theme, Renderer> where Renderer: crate::Renderer, { diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs index ed870feb..7a179663 100644 --- a/core/src/overlay/element.rs +++ b/core/src/overlay/element.rs @@ -130,8 +130,8 @@ impl<'a, A, B, Theme, Renderer> Map<'a, A, B, Theme, Renderer> { } } -impl<'a, A, B, Theme, Renderer> Overlay - for Map<'a, A, B, Theme, Renderer> +impl Overlay + for Map<'_, A, B, Theme, Renderer> where Renderer: crate::Renderer, { @@ -203,11 +203,11 @@ where self.content.is_over(layout, renderer, cursor_position) } - fn overlay<'b>( - &'b mut self, + fn overlay<'a>( + &'a mut self, layout: Layout<'_>, renderer: &Renderer, - ) -> Option> { + ) -> Option> { self.content .overlay(layout, renderer) .map(|overlay| overlay.map(self.mapper)) diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs index 2b374252..e07744e3 100644 --- a/core/src/overlay/group.rs +++ b/core/src/overlay/group.rs @@ -57,8 +57,8 @@ where } } -impl<'a, Message, Theme, Renderer> Overlay - for Group<'a, Message, Theme, Renderer> +impl Overlay + for Group<'_, Message, Theme, Renderer> where Renderer: crate::Renderer, { @@ -152,11 +152,11 @@ where }) } - fn overlay<'b>( - &'b mut self, + fn overlay<'a>( + &'a mut self, layout: Layout<'_>, renderer: &Renderer, - ) -> Option> { + ) -> Option> { let children = self .children .iter_mut() diff --git a/core/src/text.rs b/core/src/text.rs index a9e3dce5..c144fd24 100644 --- a/core/src/text.rs +++ b/core/src/text.rs @@ -446,7 +446,7 @@ impl<'a, Link, Font> From<&'a str> for Span<'a, Link, Font> { } } -impl<'a, Link, Font: PartialEq> PartialEq for Span<'a, Link, Font> { +impl PartialEq for Span<'_, Link, Font> { fn eq(&self, other: &Self) -> bool { self.text == other.text && self.size == other.size @@ -474,7 +474,7 @@ impl<'a> IntoFragment<'a> for Fragment<'a> { } } -impl<'a, 'b> IntoFragment<'a> for &'a Fragment<'b> { +impl<'a> IntoFragment<'a> for &'a Fragment<'_> { fn into_fragment(self) -> Fragment<'a> { Fragment::Borrowed(self) } diff --git a/core/src/widget/operation.rs b/core/src/widget/operation.rs index 097c3601..6bdb27f6 100644 --- a/core/src/widget/operation.rs +++ b/core/src/widget/operation.rs @@ -138,7 +138,7 @@ where operation: &'a mut dyn Operation, } - impl<'a, T, O> Operation for BlackBox<'a, T> { + impl Operation for BlackBox<'_, T> { fn container( &mut self, id: Option<&Id>, @@ -218,7 +218,7 @@ where operation: &'a mut dyn Operation, } - impl<'a, A, B> Operation for MapRef<'a, A> { + impl Operation for MapRef<'_, A> { fn container( &mut self, id: Option<&Id>, diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs index b34c5632..d3d1cffd 100644 --- a/core/src/widget/text.rs +++ b/core/src/widget/text.rs @@ -206,8 +206,8 @@ where #[derive(Debug, Default)] pub struct State(pub paragraph::Plain

); -impl<'a, Message, Theme, Renderer> Widget - for Text<'a, Theme, Renderer> +impl Widget + for Text<'_, Theme, Renderer> where Theme: Catalog, Renderer: text::Renderer, -- cgit