diff options
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<Message, Theme, Renderer> - for Explain<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + 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<B, Theme, Renderer> - for Map<'a, A, B, Theme, Renderer> +impl<A, B, Theme, Renderer> Overlay<B, Theme, Renderer> + 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<Element<'b, B, Theme, Renderer>> { + ) -> Option<Element<'a, B, Theme, Renderer>> { 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<Message, Theme, Renderer> - for Group<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Overlay<Message, Theme, Renderer> + 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<overlay::Element<'b, Message, Theme, Renderer>> { + ) -> Option<overlay::Element<'a, Message, Theme, Renderer>> { 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<Link, Font: PartialEq> 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<T>, } - impl<'a, T, O> Operation<O> for BlackBox<'a, T> { + impl<T, O> Operation<O> for BlackBox<'_, T> { fn container( &mut self, id: Option<&Id>, @@ -218,7 +218,7 @@ where operation: &'a mut dyn Operation<A>, } - impl<'a, A, B> Operation<B> for MapRef<'a, A> { + impl<A, B> Operation<B> 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<P: Paragraph>(pub paragraph::Plain<P>); -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Text<'a, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + 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<Curve> for Bezier<'a> { + impl canvas::Program<Curve> for Bezier<'_> { type State = Option<Pending>; 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<CustomQuad> for Element<'a, Message> { + impl<Message> From<CustomQuad> 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<Circle> - for Element<'a, Message, Theme, Renderer> + impl<Message, Theme, Renderer> From<Circle> + 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<Rainbow> for Element<'a, Message> { + impl<Message> From<Rainbow> 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<Theme> 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<Theme> 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<Message, Theme, Renderer> for Loupe<'a, Message> { + impl<Message> Widget<Message, Theme, Renderer> 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<Message, Theme, Renderer> for Manager<'a, Message> { + impl<Message> Widget<Message, Theme, Renderer> for Manager<'_, Message> { fn size(&self) -> Size<Length> { self.content.as_widget().size() } @@ -464,8 +464,8 @@ mod toast { timeout_secs: u64, } - impl<'a, 'b, Message> overlay::Overlay<Message, Theme, Renderer> - for Overlay<'a, 'b, Message> + impl<Message> overlay::Overlay<Message, Theme, Renderer> + 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<dyn Fn() -> Message + 'a>), } -impl<'a, Message: Clone> OnPress<'a, Message> { +impl<Message: Clone> 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<Message, Theme, Renderer> - for Checkbox<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + 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<Message, Renderer> 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<Message, Theme, Renderer> - for Column<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + 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<Message, Theme, Renderer> - for ComboBox<'a, T, Message, Theme, Renderer> +impl<T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + 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<Message, Theme, Renderer> - for Container<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + 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<dyn Fn(&Theme) -> Style + 'a>; -impl<'a, Theme> From<Style> for StyleFn<'a, Theme> { +impl<Theme> From<Style> for StyleFn<'_, Theme> { fn from(style: Style) -> Self { Box::new(move |_theme| style) } diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs index 3d85ba70..cdfd2daf 100644 --- a/widget/src/helpers.rs +++ b/widget/src/helpers.rs @@ -405,8 +405,8 @@ where content: Element<'a, Message, Theme, Renderer>, } - impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Opaque<'a, Message, Theme, Renderer> + impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Opaque<'_, Message, Theme, Renderer> where Renderer: core::Renderer, { @@ -569,8 +569,8 @@ where is_hovered: bool, } - impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Hover<'a, Message, Theme, Renderer> + impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Hover<'_, Message, Theme, Renderer> where Renderer: core::Renderer, { diff --git a/widget/src/keyed/column.rs b/widget/src/keyed/column.rs index 055e2ea1..ab0b0bde 100644 --- a/widget/src/keyed/column.rs +++ b/widget/src/keyed/column.rs @@ -185,7 +185,7 @@ where } } -impl<'a, Key, Message, Renderer> Default for Column<'a, Key, Message, Renderer> +impl<Key, Message, Renderer> Default for Column<'_, Key, Message, Renderer> where Key: Copy + PartialEq, Renderer: crate::core::Renderer, @@ -202,8 +202,8 @@ where keys: Vec<Key>, } -impl<'a, Key, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Column<'a, Key, Message, Theme, Renderer> +impl<Key, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Column<'_, Key, Message, Theme, Renderer> where Renderer: crate::core::Renderer, Key: Copy + PartialEq + 'static, diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs index 07b90c93..1eee26e1 100644 --- a/widget/src/lazy.rs +++ b/widget/src/lazy.rs @@ -321,8 +321,8 @@ struct Overlay<'a, Message, Theme, Renderer>( Option<Inner<'a, Message, Theme, Renderer>>, ); -impl<'a, Message, Theme, Renderer> Drop - for Overlay<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Drop + for Overlay<'_, Message, Theme, Renderer> { fn drop(&mut self) { let heads = self.0.take().unwrap().into_heads(); @@ -330,7 +330,7 @@ impl<'a, Message, Theme, Renderer> Drop } } -impl<'a, Message, Theme, Renderer> Overlay<'a, Message, Theme, Renderer> { +impl<Message, Theme, Renderer> Overlay<'_, Message, Theme, Renderer> { fn with_overlay_maybe<T>( &self, f: impl FnOnce(&mut Nested<'_, Message, Theme, Renderer>) -> T, @@ -350,8 +350,8 @@ impl<'a, Message, Theme, Renderer> Overlay<'a, Message, Theme, Renderer> { } } -impl<'a, Message, Theme, Renderer> overlay::Overlay<Message, Theme, Renderer> - for Overlay<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> overlay::Overlay<Message, Theme, Renderer> + for Overlay<'_, Message, Theme, Renderer> where Renderer: core::Renderer, { diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs index 1758b963..15b8b62e 100644 --- a/widget/src/lazy/component.rs +++ b/widget/src/lazy/component.rs @@ -141,8 +141,8 @@ struct State<'a, Message: 'a, Theme: 'a, Renderer: 'a, Event: 'a, S: 'a> { element: Option<Element<'this, Event, Theme, Renderer>>, } -impl<'a, Message, Theme, Renderer, Event, S> - Instance<'a, Message, Theme, Renderer, Event, S> +impl<Message, Theme, Renderer, Event, S> + Instance<'_, Message, Theme, Renderer, Event, S> where S: Default + 'static, Renderer: renderer::Renderer, @@ -251,8 +251,8 @@ where } } -impl<'a, Message, Theme, Renderer, Event, S> Widget<Message, Theme, Renderer> - for Instance<'a, Message, Theme, Renderer, Event, S> +impl<Message, Theme, Renderer, Event, S> Widget<Message, Theme, Renderer> + for Instance<'_, Message, Theme, Renderer, Event, S> where S: 'static + Default, Renderer: core::Renderer, @@ -504,8 +504,8 @@ struct Overlay<'a, 'b, Message, Theme, Renderer, Event, S>( Option<Inner<'a, 'b, Message, Theme, Renderer, Event, S>>, ); -impl<'a, 'b, Message, Theme, Renderer, Event, S> Drop - for Overlay<'a, 'b, Message, Theme, Renderer, Event, S> +impl<Message, Theme, Renderer, Event, S> Drop + for Overlay<'_, '_, Message, Theme, Renderer, Event, S> { fn drop(&mut self) { if let Some(heads) = self.0.take().map(Inner::into_heads) { @@ -529,8 +529,8 @@ struct OverlayInstance<'a, 'b, Message, Theme, Renderer, Event, S> { overlay: Option<Overlay<'a, 'b, Message, Theme, Renderer, Event, S>>, } -impl<'a, 'b, Message, Theme, Renderer, Event, S> - OverlayInstance<'a, 'b, Message, Theme, Renderer, Event, S> +impl<Message, Theme, Renderer, Event, S> + OverlayInstance<'_, '_, Message, Theme, Renderer, Event, S> { fn with_overlay_maybe<T>( &self, @@ -563,9 +563,9 @@ impl<'a, 'b, Message, Theme, Renderer, Event, S> } } -impl<'a, 'b, Message, Theme, Renderer, Event, S> +impl<Message, Theme, Renderer, Event, S> overlay::Overlay<Message, Theme, Renderer> - for OverlayInstance<'a, 'b, Message, Theme, Renderer, Event, S> + for OverlayInstance<'_, '_, Message, Theme, Renderer, Event, S> where Renderer: core::Renderer, S: 'static + Default, diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs index 2aef1fa3..feb66836 100644 --- a/widget/src/lazy/responsive.rs +++ b/widget/src/lazy/responsive.rs @@ -131,8 +131,8 @@ struct State { tree: RefCell<Tree>, } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Responsive<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Responsive<'_, Message, Theme, Renderer> where Renderer: core::Renderer, { @@ -358,8 +358,8 @@ struct Overlay<'a, 'b, Message, Theme, Renderer> { ), } -impl<'a, 'b, Message, Theme, Renderer> - Overlay<'a, 'b, Message, Theme, Renderer> +impl<Message, Theme, Renderer> + Overlay<'_, '_, Message, Theme, Renderer> { fn with_overlay_maybe<T>( &self, @@ -380,9 +380,9 @@ impl<'a, 'b, Message, Theme, Renderer> } } -impl<'a, 'b, Message, Theme, Renderer> +impl<Message, Theme, Renderer> overlay::Overlay<Message, Theme, Renderer> - for Overlay<'a, 'b, Message, Theme, Renderer> + for Overlay<'_, '_, Message, Theme, Renderer> where Renderer: core::Renderer, { diff --git a/widget/src/mouse_area.rs b/widget/src/mouse_area.rs index d9215a7b..bdc81bdf 100644 --- a/widget/src/mouse_area.rs +++ b/widget/src/mouse_area.rs @@ -163,8 +163,8 @@ impl<'a, Message, Theme, Renderer> MouseArea<'a, Message, Theme, Renderer> { } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for MouseArea<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for MouseArea<'_, Message, Theme, Renderer> where Renderer: renderer::Renderer, Message: Clone, diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs index 7907ef01..358c3526 100644 --- a/widget/src/overlay/menu.rs +++ b/widget/src/overlay/menu.rs @@ -227,9 +227,9 @@ where } } -impl<'a, 'b, Message, Theme, Renderer> +impl<Message, Theme, Renderer> crate::core::Overlay<Message, Theme, Renderer> - for Overlay<'a, 'b, Message, Theme, Renderer> + for Overlay<'_, '_, Message, Theme, Renderer> where Theme: Catalog, Renderer: text::Renderer, @@ -338,8 +338,8 @@ struct ListState { is_hovered: Option<bool>, } -impl<'a, 'b, T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for List<'a, 'b, T, Message, Theme, Renderer> +impl<T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for List<'_, '_, T, Message, Theme, Renderer> where T: Clone + ToString, Theme: Catalog, diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs index 7b2956f3..90a3fb1d 100644 --- a/widget/src/pane_grid.rs +++ b/widget/src/pane_grid.rs @@ -349,8 +349,8 @@ struct Memory { order: Vec<Pane>, } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for PaneGrid<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for PaneGrid<'_, Message, Theme, Renderer> where Theme: Catalog, Renderer: core::Renderer, diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs index fa9f7a9f..be5e5066 100644 --- a/widget/src/pane_grid/content.rs +++ b/widget/src/pane_grid/content.rs @@ -73,7 +73,7 @@ where } } -impl<'a, Message, Theme, Renderer> Content<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Content<'_, Message, Theme, Renderer> where Theme: container::Catalog, Renderer: core::Renderer, @@ -401,8 +401,8 @@ where } } -impl<'a, Message, Theme, Renderer> Draggable - for &Content<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Draggable + for &Content<'_, Message, Theme, Renderer> where Theme: container::Catalog, Renderer: core::Renderer, diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs index 3f4a651e..4bd2c2f6 100644 --- a/widget/src/pane_grid/title_bar.rs +++ b/widget/src/pane_grid/title_bar.rs @@ -98,7 +98,7 @@ where } } -impl<'a, Message, Theme, Renderer> TitleBar<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> TitleBar<'_, Message, Theme, Renderer> where Theme: container::Catalog, Renderer: core::Renderer, diff --git a/widget/src/pin.rs b/widget/src/pin.rs index 1f167716..7c1aca61 100644 --- a/widget/src/pin.rs +++ b/widget/src/pin.rs @@ -110,8 +110,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Pin<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Pin<'_, Message, Theme, Renderer> where Renderer: core::Renderer, { diff --git a/widget/src/progress_bar.rs b/widget/src/progress_bar.rs index 9d2b30f4..8f85dcf3 100644 --- a/widget/src/progress_bar.rs +++ b/widget/src/progress_bar.rs @@ -117,8 +117,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for ProgressBar<'a, Theme> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for ProgressBar<'_, Theme> where Theme: Catalog, Renderer: core::Renderer, diff --git a/widget/src/qr_code.rs b/widget/src/qr_code.rs index d1834465..458f3588 100644 --- a/widget/src/qr_code.rs +++ b/widget/src/qr_code.rs @@ -116,7 +116,7 @@ where } } -impl<'a, Message, Theme> Widget<Message, Theme, Renderer> for QRCode<'a, Theme> +impl<Message, Theme> Widget<Message, Theme, Renderer> for QRCode<'_, Theme> where Theme: Catalog, { diff --git a/widget/src/radio.rs b/widget/src/radio.rs index b38ae6b4..15c983df 100644 --- a/widget/src/radio.rs +++ b/widget/src/radio.rs @@ -267,8 +267,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Radio<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Radio<'_, Message, Theme, Renderer> where Message: Clone, Theme: Catalog, diff --git a/widget/src/row.rs b/widget/src/row.rs index 96a4ab92..3b605f07 100644 --- a/widget/src/row.rs +++ b/widget/src/row.rs @@ -171,7 +171,7 @@ where } } -impl<'a, Message, Renderer> Default for Row<'a, Message, Renderer> +impl<Message, Renderer> Default for Row<'_, Message, Renderer> where Renderer: crate::core::Renderer, { @@ -193,8 +193,8 @@ impl<'a, Message, Theme, Renderer: crate::core::Renderer> } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Row<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Row<'_, Message, Theme, Renderer> where Renderer: crate::core::Renderer, { @@ -380,8 +380,8 @@ pub struct Wrapping< row: Row<'a, Message, Theme, Renderer>, } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Wrapping<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Wrapping<'_, Message, Theme, Renderer> where Renderer: crate::core::Renderer, { diff --git a/widget/src/rule.rs b/widget/src/rule.rs index 24577683..65c0a6dc 100644 --- a/widget/src/rule.rs +++ b/widget/src/rule.rs @@ -98,8 +98,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Rule<'a, Theme> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Rule<'_, Theme> where Renderer: core::Renderer, Theme: Catalog, diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs index 716a7c8a..41bb15f9 100644 --- a/widget/src/scrollable.rs +++ b/widget/src/scrollable.rs @@ -385,8 +385,8 @@ pub enum Anchor { End, } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Scrollable<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Scrollable<'_, Message, Theme, Renderer> where Theme: Catalog, Renderer: core::Renderer, diff --git a/widget/src/slider.rs b/widget/src/slider.rs index 84630f9e..52500854 100644 --- a/widget/src/slider.rs +++ b/widget/src/slider.rs @@ -210,8 +210,8 @@ where } } -impl<'a, T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Slider<'a, T, Message, Theme> +impl<T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Slider<'_, T, Message, Theme> where T: Copy + Into<f64> + num_traits::FromPrimitive, Message: Clone, diff --git a/widget/src/stack.rs b/widget/src/stack.rs index 52fd5031..d2828c56 100644 --- a/widget/src/stack.rs +++ b/widget/src/stack.rs @@ -116,7 +116,7 @@ where } } -impl<'a, Message, Renderer> Default for Stack<'a, Message, Renderer> +impl<Message, Renderer> Default for Stack<'_, Message, Renderer> where Renderer: crate::core::Renderer, { diff --git a/widget/src/svg.rs b/widget/src/svg.rs index 8d57265a..72ead4f9 100644 --- a/widget/src/svg.rs +++ b/widget/src/svg.rs @@ -148,8 +148,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Svg<'a, Theme> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Svg<'_, Theme> where Renderer: svg::Renderer, Theme: Catalog, @@ -323,7 +323,7 @@ impl Catalog for Theme { /// This is just a boxed closure: `Fn(&Theme, Status) -> Style`. pub type StyleFn<'a, Theme> = Box<dyn Fn(&Theme, Status) -> Style + 'a>; -impl<'a, Theme> From<Style> for StyleFn<'a, Theme> { +impl<Theme> From<Style> for StyleFn<'_, Theme> { fn from(style: Style) -> Self { Box::new(move |_theme, _status| style) } diff --git a/widget/src/text/rich.rs b/widget/src/text/rich.rs index 7ef2707b..a40f2b57 100644 --- a/widget/src/text/rich.rs +++ b/widget/src/text/rich.rs @@ -180,8 +180,8 @@ struct State<Link, P: Paragraph> { paragraph: P, } -impl<'a, Link, Theme, Renderer> Widget<Link, Theme, Renderer> - for Rich<'a, Link, Theme, Renderer> +impl<Link, Theme, Renderer> Widget<Link, Theme, Renderer> + for Rich<'_, Link, Theme, Renderer> where Link: Clone + 'static, Theme: Catalog, diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs index b6e291e4..ffd06b77 100644 --- a/widget/src/text_editor.rs +++ b/widget/src/text_editor.rs @@ -513,8 +513,8 @@ impl<Highlighter: text::Highlighter> operation::Focusable } } -impl<'a, Highlighter, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for TextEditor<'a, Highlighter, Message, Theme, Renderer> +impl<Highlighter, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for TextEditor<'_, Highlighter, Message, Theme, Renderer> where Highlighter: text::Highlighter, Theme: Catalog, diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index 51e61cc0..c3f0b25a 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -574,8 +574,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for TextInput<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for TextInput<'_, Message, Theme, Renderer> where Message: Clone, Theme: Catalog, diff --git a/widget/src/themer.rs b/widget/src/themer.rs index 82160f24..769cc4ca 100644 --- a/widget/src/themer.rs +++ b/widget/src/themer.rs @@ -63,8 +63,8 @@ where } } -impl<'a, Message, Theme, NewTheme, F, Renderer> Widget<Message, Theme, Renderer> - for Themer<'a, Message, Theme, NewTheme, F, Renderer> +impl<Message, Theme, NewTheme, F, Renderer> Widget<Message, Theme, Renderer> + for Themer<'_, Message, Theme, NewTheme, F, Renderer> where F: Fn(&Theme) -> NewTheme, Renderer: crate::core::Renderer, @@ -187,9 +187,9 @@ where content: overlay::Element<'a, Message, NewTheme, Renderer>, } - impl<'a, Message, Theme, NewTheme, Renderer> + impl<Message, Theme, NewTheme, Renderer> overlay::Overlay<Message, Theme, Renderer> - for Overlay<'a, Message, Theme, NewTheme, Renderer> + for Overlay<'_, Message, Theme, NewTheme, Renderer> where Renderer: crate::core::Renderer, { diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs index 5dfa0c0e..56c2be1f 100644 --- a/widget/src/toggler.rs +++ b/widget/src/toggler.rs @@ -245,8 +245,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Toggler<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Toggler<'_, Message, Theme, Renderer> where Theme: Catalog, Renderer: text::Renderer, diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs index e66f5e4a..7072835f 100644 --- a/widget/src/tooltip.rs +++ b/widget/src/tooltip.rs @@ -142,8 +142,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for Tooltip<'a, Message, Theme, Renderer> +impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for Tooltip<'_, Message, Theme, Renderer> where Theme: container::Catalog, Renderer: text::Renderer, @@ -369,9 +369,9 @@ where class: &'b Theme::Class<'a>, } -impl<'a, 'b, Message, Theme, Renderer> +impl<Message, Theme, Renderer> overlay::Overlay<Message, Theme, Renderer> - for Overlay<'a, 'b, Message, Theme, Renderer> + for Overlay<'_, '_, Message, Theme, Renderer> where Theme: container::Catalog, Renderer: text::Renderer, diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs index ec72a455..c1af142b 100644 --- a/widget/src/vertical_slider.rs +++ b/widget/src/vertical_slider.rs @@ -211,8 +211,8 @@ where } } -impl<'a, T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> - for VerticalSlider<'a, T, Message, Theme> +impl<T, Message, Theme, Renderer> Widget<Message, Theme, Renderer> + for VerticalSlider<'_, T, Message, Theme> where T: Copy + Into<f64> + num_traits::FromPrimitive, Message: Clone, |