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 --- .cargo/config.toml | 1 + 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 ++-- examples/bezier_tool/src/main.rs | 2 +- examples/custom_quad/src/main.rs | 2 +- examples/custom_widget/src/main.rs | 4 ++-- examples/geometry/src/main.rs | 2 +- examples/loading_spinners/src/circular.rs | 2 +- examples/loading_spinners/src/linear.rs | 2 +- examples/loupe/src/main.rs | 2 +- examples/toast/src/main.rs | 6 +++--- graphics/src/geometry/stroke.rs | 4 ++-- widget/src/button.rs | 2 +- widget/src/checkbox.rs | 4 ++-- widget/src/column.rs | 6 +++--- widget/src/combo_box.rs | 4 ++-- widget/src/container.rs | 6 +++--- widget/src/helpers.rs | 8 ++++---- widget/src/keyed/column.rs | 6 +++--- widget/src/lazy.rs | 10 +++++----- widget/src/lazy/component.rs | 20 ++++++++++---------- widget/src/lazy/responsive.rs | 12 ++++++------ widget/src/mouse_area.rs | 4 ++-- widget/src/overlay/menu.rs | 8 ++++---- widget/src/pane_grid.rs | 4 ++-- widget/src/pane_grid/content.rs | 6 +++--- widget/src/pane_grid/title_bar.rs | 2 +- widget/src/pin.rs | 4 ++-- widget/src/progress_bar.rs | 4 ++-- widget/src/qr_code.rs | 2 +- widget/src/radio.rs | 4 ++-- widget/src/row.rs | 10 +++++----- widget/src/rule.rs | 4 ++-- widget/src/scrollable.rs | 4 ++-- widget/src/slider.rs | 4 ++-- widget/src/stack.rs | 2 +- widget/src/svg.rs | 6 +++--- widget/src/text/rich.rs | 4 ++-- widget/src/text_editor.rs | 4 ++-- widget/src/text_input.rs | 4 ++-- widget/src/themer.rs | 8 ++++---- widget/src/toggler.rs | 4 ++-- widget/src/tooltip.rs | 8 ++++---- widget/src/vertical_slider.rs | 4 ++-- 48 files changed, 123 insertions(+), 122 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 49ca3252..df979396 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,3 @@ [alias] lint = "clippy --workspace --benches --all-features --no-deps -- -D warnings" +lint-fix = "clippy --fix --allow-dirty --workspace --benches --all-features --no-deps -- -D warnings" 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, diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs index 5e4da0c2..e8f0efc9 100644 --- a/examples/bezier_tool/src/main.rs +++ b/examples/bezier_tool/src/main.rs @@ -88,7 +88,7 @@ mod bezier { curves: &'a [Curve], } - impl<'a> canvas::Program for Bezier<'a> { + impl canvas::Program for Bezier<'_> { type State = Option; fn update( diff --git a/examples/custom_quad/src/main.rs b/examples/custom_quad/src/main.rs index dc425cc6..f9c07da9 100644 --- a/examples/custom_quad/src/main.rs +++ b/examples/custom_quad/src/main.rs @@ -75,7 +75,7 @@ mod quad { } } - impl<'a, Message> From for Element<'a, Message> { + impl From for Element<'_, Message> { fn from(circle: CustomQuad) -> Self { Self::new(circle) } diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs index 58f3c54a..d561c2e0 100644 --- a/examples/custom_widget/src/main.rs +++ b/examples/custom_widget/src/main.rs @@ -62,8 +62,8 @@ mod circle { } } - impl<'a, Message, Theme, Renderer> From - for Element<'a, Message, Theme, Renderer> + impl From + for Element<'_, Message, Theme, Renderer> where Renderer: renderer::Renderer, { diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs index 3c7969c5..d53ae6a5 100644 --- a/examples/geometry/src/main.rs +++ b/examples/geometry/src/main.rs @@ -145,7 +145,7 @@ mod rainbow { } } - impl<'a, Message> From for Element<'a, Message> { + impl From for Element<'_, Message> { fn from(rainbow: Rainbow) -> Self { Self::new(rainbow) } diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs index a10d5cec..33232fac 100644 --- a/examples/loading_spinners/src/circular.rs +++ b/examples/loading_spinners/src/circular.rs @@ -88,7 +88,7 @@ where } } -impl<'a, Theme> Default for Circular<'a, Theme> +impl Default for Circular<'_, Theme> where Theme: StyleSheet, { diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs index 91c8d523..a10b64f0 100644 --- a/examples/loading_spinners/src/linear.rs +++ b/examples/loading_spinners/src/linear.rs @@ -70,7 +70,7 @@ where } } -impl<'a, Theme> Default for Linear<'a, Theme> +impl Default for Linear<'_, Theme> where Theme: StyleSheet, { diff --git a/examples/loupe/src/main.rs b/examples/loupe/src/main.rs index 1c748d42..6b7d053a 100644 --- a/examples/loupe/src/main.rs +++ b/examples/loupe/src/main.rs @@ -74,7 +74,7 @@ mod loupe { content: Element<'a, Message>, } - impl<'a, Message> Widget for Loupe<'a, Message> { + impl Widget for Loupe<'_, Message> { fn tag(&self) -> widget::tree::Tag { self.content.as_widget().tag() } diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs index 8d1e3924..a1b5886f 100644 --- a/examples/toast/src/main.rs +++ b/examples/toast/src/main.rs @@ -281,7 +281,7 @@ mod toast { } } - impl<'a, Message> Widget for Manager<'a, Message> { + impl Widget for Manager<'_, Message> { fn size(&self) -> Size { self.content.as_widget().size() } @@ -464,8 +464,8 @@ mod toast { timeout_secs: u64, } - impl<'a, 'b, Message> overlay::Overlay - for Overlay<'a, 'b, Message> + impl overlay::Overlay + for Overlay<'_, '_, Message> { fn layout( &mut self, diff --git a/graphics/src/geometry/stroke.rs b/graphics/src/geometry/stroke.rs index b8f4515e..88a5fd7b 100644 --- a/graphics/src/geometry/stroke.rs +++ b/graphics/src/geometry/stroke.rs @@ -23,7 +23,7 @@ pub struct Stroke<'a> { pub line_dash: LineDash<'a>, } -impl<'a> Stroke<'a> { +impl Stroke<'_> { /// Sets the color of the [`Stroke`]. pub fn with_color(self, color: Color) -> Self { Stroke { @@ -48,7 +48,7 @@ impl<'a> Stroke<'a> { } } -impl<'a> Default for Stroke<'a> { +impl Default for Stroke<'_> { fn default() -> Self { Stroke { style: Style::Solid(Color::BLACK), diff --git a/widget/src/button.rs b/widget/src/button.rs index 9eac2e4c..d1fa9302 100644 --- a/widget/src/button.rs +++ b/widget/src/button.rs @@ -89,7 +89,7 @@ enum OnPress<'a, Message> { Closure(Box Message + 'a>), } -impl<'a, Message: Clone> OnPress<'a, Message> { +impl OnPress<'_, Message> { fn get(&self) -> Message { match self { OnPress::Direct(message) => message.clone(), diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs index 625dee7c..3686d34c 100644 --- a/widget/src/checkbox.rs +++ b/widget/src/checkbox.rs @@ -247,8 +247,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget - for Checkbox<'a, Message, Theme, Renderer> +impl Widget + for Checkbox<'_, Message, Theme, Renderer> where Renderer: text::Renderer, Theme: Catalog, diff --git a/widget/src/column.rs b/widget/src/column.rs index a3efab94..c729cbdb 100644 --- a/widget/src/column.rs +++ b/widget/src/column.rs @@ -173,7 +173,7 @@ where } } -impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> +impl Default for Column<'_, Message, Renderer> where Renderer: crate::core::Renderer, { @@ -195,8 +195,8 @@ impl<'a, Message, Theme, Renderer: crate::core::Renderer> } } -impl<'a, Message, Theme, Renderer> Widget - for Column<'a, Message, Theme, Renderer> +impl Widget + for Column<'_, Message, Theme, Renderer> where Renderer: crate::core::Renderer, { diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs index 8b8e895d..500d2bec 100644 --- a/widget/src/combo_box.rs +++ b/widget/src/combo_box.rs @@ -459,8 +459,8 @@ enum TextInputEvent { TextChanged(String), } -impl<'a, T, Message, Theme, Renderer> Widget - for ComboBox<'a, T, Message, Theme, Renderer> +impl Widget + for ComboBox<'_, T, Message, Theme, Renderer> where T: Display + Clone + 'static, Message: Clone, diff --git a/widget/src/container.rs b/widget/src/container.rs index b7b2b39e..d9740f72 100644 --- a/widget/src/container.rs +++ b/widget/src/container.rs @@ -228,8 +228,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget - for Container<'a, Message, Theme, Renderer> +impl Widget + for Container<'_, Message, Theme, Renderer> where Theme: Catalog, Renderer: core::Renderer, @@ -650,7 +650,7 @@ pub trait Catalog { /// A styling function for a [`Container`]. pub type StyleFn<'a, Theme> = Box Style + 'a>; -impl<'a, Theme> From