From c512d50e1987c0e098b64e0de9d1c6e7aa2eb0a9 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 27 Jul 2022 06:59:54 +0200 Subject: Fix `clippy` lints --- examples/pokedex/src/main.rs | 2 +- examples/scrollable/src/main.rs | 2 +- native/src/overlay/menu.rs | 6 +++--- native/src/widget/helpers.rs | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/pokedex/src/main.rs b/examples/pokedex/src/main.rs index 0744d991..4fe2d07c 100644 --- a/examples/pokedex/src/main.rs +++ b/examples/pokedex/src/main.rs @@ -217,6 +217,6 @@ impl From for Error { } } -fn button<'a>(text: &'a str) -> widget::Button<'a, Message> { +fn button(text: &str) -> widget::Button<'_, Message> { widget::button(text).padding(10) } diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index 405c8daf..c9c1be7c 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -85,7 +85,7 @@ impl Sandbox for ScrollableDemo { .enumerate() .map(|(i, variant)| { let mut contents = column![ - variant.title.as_ref(), + variant.title, button("Scroll to bottom",) .width(Length::Fill) .padding(10) diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs index b4c77c25..fecf9f3c 100644 --- a/native/src/overlay/menu.rs +++ b/native/src/overlay/menu.rs @@ -252,7 +252,7 @@ where shell: &mut Shell<'_, Message>, ) -> event::Status { self.container.on_event( - &mut self.state, + self.state, event, layout, cursor_position, @@ -270,7 +270,7 @@ where renderer: &Renderer, ) -> mouse::Interaction { self.container.mouse_interaction( - &self.state, + self.state, layout, cursor_position, viewport, @@ -303,7 +303,7 @@ where ); self.container.draw( - &self.state, + self.state, renderer, theme, style, diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs index a0d39943..518ac23b 100644 --- a/native/src/widget/helpers.rs +++ b/native/src/widget/helpers.rs @@ -47,18 +47,18 @@ where /// Creates a new [`Column`] with the given children. /// /// [`Column`]: widget::Column -pub fn column<'a, Message, Renderer>( - children: Vec>, -) -> widget::Row<'a, Message, Renderer> { +pub fn column( + children: Vec>, +) -> widget::Row<'_, Message, Renderer> { widget::Row::with_children(children) } /// Creates a new [`Row`] with the given children. /// /// [`Row`]: widget::Row -pub fn row<'a, Message, Renderer>( - children: Vec>, -) -> widget::Row<'a, Message, Renderer> { +pub fn row( + children: Vec>, +) -> widget::Row<'_, Message, Renderer> { widget::Row::with_children(children) } -- cgit