From 76930d86242dc4a44bb0854b0f8c15e8b72ca9df Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 28 Feb 2025 12:06:24 -0500 Subject: [PATCH] clippy --- src/app/context_drawer.rs | 6 ++--- src/app/core.rs | 27 +++++++++------------ src/app/mod.rs | 11 ++++----- src/applet/mod.rs | 18 ++++++-------- src/config/mod.rs | 5 ++-- src/desktop.rs | 5 +--- src/ext.rs | 2 +- src/process.rs | 1 - src/task/mod.rs | 1 - src/theme/style/iced.rs | 10 ++++---- src/theme/style/tooltip.rs | 2 +- src/widget/about.rs | 2 +- src/widget/aspect_ratio.rs | 7 +++--- src/widget/autosize.rs | 5 ++-- src/widget/button/icon.rs | 2 +- src/widget/button/image.rs | 2 +- src/widget/button/mod.rs | 2 +- src/widget/button/text.rs | 10 ++++++-- src/widget/button/widget.rs | 2 +- src/widget/calendar.rs | 14 +++++------ src/widget/color_picker/mod.rs | 4 +-- src/widget/context_drawer/overlay.rs | 4 +-- src/widget/context_drawer/widget.rs | 2 +- src/widget/context_menu.rs | 4 +-- src/widget/dialog.rs | 6 +++++ src/widget/dnd_destination.rs | 4 +-- src/widget/dnd_source.rs | 5 ++-- src/widget/dropdown/menu/mod.rs | 7 +++--- src/widget/dropdown/mod.rs | 5 ++-- src/widget/dropdown/multi/menu.rs | 8 +++--- src/widget/dropdown/multi/widget.rs | 6 ++--- src/widget/dropdown/widget.rs | 10 ++++---- src/widget/flex_row/widget.rs | 4 +-- src/widget/grid/widget.rs | 14 ++++++++++- src/widget/header_bar.rs | 4 +-- src/widget/icon/mod.rs | 4 +-- src/widget/icon/named.rs | 2 +- src/widget/id_container.rs | 4 +-- src/widget/layer_container.rs | 4 +-- src/widget/list/column.rs | 2 +- src/widget/menu/key_bind.rs | 2 +- src/widget/menu/menu_bar.rs | 12 ++++----- src/widget/menu/menu_inner.rs | 6 ++--- src/widget/mod.rs | 2 +- src/widget/nav_bar_toggle.rs | 2 +- src/widget/popover.rs | 10 ++++---- src/widget/radio.rs | 2 +- src/widget/responsive_container.rs | 4 +-- src/widget/segmented_button/horizontal.rs | 4 +-- src/widget/segmented_button/model/entity.rs | 2 +- src/widget/segmented_button/vertical.rs | 4 +-- src/widget/segmented_button/widget.rs | 8 +++--- src/widget/settings/section.rs | 6 ++--- src/widget/spin_button.rs | 14 +++++------ src/widget/text_input/input.rs | 24 ++++++------------ src/widget/toaster/mod.rs | 2 +- src/widget/toaster/widget.rs | 8 +++--- src/widget/wayland/tooltip/widget.rs | 7 ++---- 58 files changed, 173 insertions(+), 183 deletions(-) diff --git a/src/app/context_drawer.rs b/src/app/context_drawer.rs index af937168..34aa35cb 100644 --- a/src/app/context_drawer.rs +++ b/src/app/context_drawer.rs @@ -12,11 +12,11 @@ pub struct ContextDrawer<'a, Message: Clone + 'static> { } #[cfg(feature = "about")] -pub fn about<'a, Message: Clone + 'static>( - about: &'a crate::widget::about::About, +pub fn about( + about: &crate::widget::about::About, on_url_press: impl Fn(String) -> Message, on_close: Message, -) -> ContextDrawer<'a, Message> { +) -> ContextDrawer<'_, Message> { context_drawer(crate::widget::about(about, on_url_press), on_close) } diff --git a/src/app/core.rs b/src/app/core.rs index 7ef7c684..c58763f8 100644 --- a/src/app/core.rs +++ b/src/app/core.rs @@ -1,17 +1,13 @@ // Copyright 2023 System76 // SPDX-License-Identifier: MPL-2.0 -use std::{cell::OnceCell, collections::HashMap}; +use std::collections::HashMap; -use crate::{ - surface_message::SurfaceMessage, - theme::menu_bar, - widget::{ +use crate::widget::{ button, icon, - menu::{self, Tree}, + menu::{self}, nav_bar, responsive_container, - }, -}; + }; use cosmic_config::CosmicConfigEntry; use cosmic_theme::ThemeMode; use iced::{window, Limits, Size}; @@ -21,7 +17,6 @@ use slotmap::Key; use crate::Theme; -use super::{Renderer, Task}; /// Status of the nav bar and its panels. #[derive(Clone)] @@ -218,7 +213,7 @@ impl Core { // Context drawer min width (344px) + padding (8px) breakpoint += 344.0 + 8.0; }; - self.is_condensed = (breakpoint * self.scale_factor) > self.window.width as f32; + self.is_condensed = (breakpoint * self.scale_factor) > self.window.width; self.nav_bar_update(); } @@ -231,7 +226,7 @@ impl Core { } pub(crate) fn context_width(&self, has_nav: bool) -> f32 { - let window_width = (self.window.width as f32) / self.scale_factor; + let window_width = self.window.width / self.scale_factor; // Content width (360px) + padding (8px) let mut reserved_width = 360.0 + 8.0; @@ -366,7 +361,7 @@ impl Core { /// Get the current focused window if it exists #[must_use] pub fn focused_window(&self) -> Option { - self.focused_window.clone() + self.focused_window } /// Whether the application should use a dark theme, according to the system @@ -408,9 +403,9 @@ impl Core { Vec>>, )>, ) -> crate::Element<'a, Message> { - use std::borrow::Cow; + - use iced::Length; + use crate::widget::id_container; @@ -428,7 +423,7 @@ impl Core { .map(|mt| { menu::Tree::<_>::with_children( menu::root(mt.0), - menu::items(&key_binds, mt.1), + menu::items(key_binds, mt.1), ) }) .collect(), @@ -448,7 +443,7 @@ impl Core { .class(crate::theme::Button::MenuRoot), ), menu::items( - &key_binds, + key_binds, trees .into_iter() .map(|mt| menu::Item::Folder(mt.0, mt.1)) diff --git a/src/app/mod.rs b/src/app/mod.rs index 8c8a89ba..dcaabf31 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -6,7 +6,6 @@ //! Check out our [application](https://github.com/pop-os/libcosmic/tree/master/examples/application) //! example in our repository. -use crate::surface_message::{MessageWrapper, SurfaceMessage}; pub mod command; pub mod context_drawer; @@ -17,9 +16,9 @@ pub(crate) mod multi_window; pub mod settings; pub mod message { - use crate::surface_message::{MessageWrapper, SurfaceMessage}; + use crate::surface_message::SurfaceMessage; - use iced::{Limits, Size}; + #[derive(Clone, Debug)] #[must_use] @@ -536,7 +535,7 @@ where .and_then(|b| b.destination(App::APP_ID).ok()) .and_then(|b| b.build().ok()) .is_some_and(|mut p| { - match { + let res = { let mut platform_data = HashMap::new(); if let Some(activation_token) = activation_token { platform_data.insert("activation-token", activation_token.into()); @@ -550,7 +549,7 @@ where } else { p.activate(platform_data) } - } { + }; match res { Ok(()) => { tracing::info!("Successfully activated another instance"); true @@ -1221,6 +1220,6 @@ fn preload_fonts() { .unwrap(); EMBEDDED_FONTS - .into_iter() + .iter() .for_each(move |font| font_system.load_font(Cow::Borrowed(font))); } diff --git a/src/applet/mod.rs b/src/applet/mod.rs index d267ec53..cbf9ae9a 100644 --- a/src/applet/mod.rs +++ b/src/applet/mod.rs @@ -22,8 +22,6 @@ use crate::{ }; pub use cosmic_panel_config; use cosmic_panel_config::{CosmicPanelBackground, PanelAnchor, PanelSize}; -use cosmic_theme::Theme; -use iced::Pixels; use iced_core::{Layout, Padding, Shadow}; use iced_widget::runtime::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}; use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity}; @@ -31,7 +29,7 @@ use std::{ borrow::Cow, num::NonZeroU32, rc::Rc, - sync::{Arc, LazyLock}, + sync::LazyLock, }; use tracing::info; @@ -41,7 +39,7 @@ static AUTOSIZE_ID: LazyLock = static AUTOSIZE_MAIN_ID: LazyLock = LazyLock::new(|| iced::id::Id::new("cosmic-applet-autosize-main")); static TOOLTIP_ID: LazyLock = LazyLock::new(|| iced::id::Id::new("subsurface")); -static TOOLTIP_WINDOW_ID: LazyLock = LazyLock::new(|| window::Id::unique()); +static TOOLTIP_WINDOW_ID: LazyLock = LazyLock::new(window::Id::unique); #[derive(Debug, Clone)] pub struct Context { @@ -170,8 +168,8 @@ impl Context { .size(iced_core::Size::new(width, height)) .size_limits( Limits::NONE - .min_height(height as f32) - .min_width(width as f32), + .min_height(height) + .min_width(width), ) .resizable(None) .default_text_size(14.0) @@ -326,7 +324,7 @@ impl Context { Container::::new( Container::::new(content).style(|theme| { let cosmic = theme.cosmic(); - let corners = cosmic.corner_radii.clone(); + let corners = cosmic.corner_radii; iced_widget::container::Style { text_color: Some(cosmic.background.on.into()), background: Some(Color::from(cosmic.background.base).into()), @@ -403,7 +401,7 @@ impl Context { &self, content: impl Into>, ) -> Autosize<'a, Message, crate::Theme, crate::Renderer> { - let force_configured = matches!(&self.panel_type, &PanelType::Other(ref n) if n.is_empty()); + let force_configured = matches!(&self.panel_type, PanelType::Other(n) if n.is_empty()); let w = autosize(content, AUTOSIZE_MAIN_ID.clone()); let mut limits = Limits::NONE; let suggested_window_size = self.suggested_window_size(); @@ -414,7 +412,7 @@ impl Context { .filter(|c| c.width as i32 > 0) .map(|c| c.width) { - limits = limits.width(width as f32); + limits = limits.width(width); } if let Some(height) = self .suggested_bounds @@ -422,7 +420,7 @@ impl Context { .filter(|c| c.height as i32 > 0) .map(|c| c.height) { - limits = limits.height(height as f32); + limits = limits.height(height); } w.limits(limits) diff --git a/src/config/mod.rs b/src/config/mod.rs index 4f1a5a16..a2cb66c4 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -17,7 +17,7 @@ const MONO_FAMILY_DEFAULT: &str = "Noto Sans Mono"; const SANS_FAMILY_DEFAULT: &str = "Open Sans"; /// Stores static strings of the family names for `iced::Font` compatibility. -pub static FAMILY_MAP: LazyLock>> = LazyLock::new(|| Mutex::default()); +pub static FAMILY_MAP: LazyLock>> = LazyLock::new(Mutex::default); pub static COSMIC_TK: LazyLock> = LazyLock::new(|| { RwLock::new( @@ -152,8 +152,7 @@ impl From for iced::Font { let mut family_map = FAMILY_MAP.lock().unwrap(); let name: &'static str = family_map - .get(font.family.as_str()) - .map(|&x| x) + .get(font.family.as_str()).copied() .unwrap_or_else(|| { let value = font.family.clone().leak(); family_map.insert(value); diff --git a/src/desktop.rs b/src/desktop.rs index c8a7ab9e..84cc7e59 100644 --- a/src/desktop.rs +++ b/src/desktop.rs @@ -74,10 +74,7 @@ pub fn load_applications<'a>( #[cfg(not(windows))] pub fn app_id_or_fallback_matches(app_id: &str, entry: &DesktopEntryData) -> bool { - let lowercase_wm_class = match entry.wm_class.as_ref() { - Some(s) => Some(s.to_lowercase()), - None => None, - }; + let lowercase_wm_class = entry.wm_class.as_ref().map(|s| s.to_lowercase()); app_id == entry.id || Some(app_id.to_lowercase()) == lowercase_wm_class diff --git a/src/ext.rs b/src/ext.rs index 215f7b7b..c85e6e86 100644 --- a/src/ext.rs +++ b/src/ext.rs @@ -9,7 +9,7 @@ pub trait ElementExt { fn debug(self, debug: bool) -> Self; } -impl<'a, Message: 'static> ElementExt for crate::Element<'a, Message> { +impl ElementExt for crate::Element<'_, Message> { fn debug(self, debug: bool) -> Self { if debug { self.explain(Color::WHITE) diff --git a/src/process.rs b/src/process.rs index d473ae66..6f1fcd40 100644 --- a/src/process.rs +++ b/src/process.rs @@ -1,6 +1,5 @@ #[cfg(all(feature = "smol", not(feature = "tokio")))] use smol::io::AsyncReadExt; -use std::fs::File; use std::io; use std::os::fd::OwnedFd; use std::process::{exit, Command, Stdio}; diff --git a/src/task/mod.rs b/src/task/mod.rs index 379ea19b..1efc33d6 100644 --- a/src/task/mod.rs +++ b/src/task/mod.rs @@ -6,7 +6,6 @@ use iced::window; use iced::Task; use iced_core::window::Mode; -use iced_runtime::{task, Action}; use std::future::Future; /// Yields a task which contains a batch of tasks. diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs index cba2e9a3..efac6b8b 100644 --- a/src/theme/style/iced.rs +++ b/src/theme/style/iced.rs @@ -754,7 +754,7 @@ impl menu::Catalog for Theme { type Class<'a> = (); fn default<'a>() -> ::Class<'a> { - () + } fn style(&self, class: &::Class<'_>) -> menu::Style { @@ -777,7 +777,7 @@ impl pick_list::Catalog for Theme { type Class<'a> = (); fn default<'a>() -> ::Class<'a> { - () + } fn style( @@ -822,7 +822,7 @@ impl radio::Catalog for Theme { type Class<'a> = (); fn default<'a>() -> Self::Class<'a> { - () + } fn style(&self, class: &Self::Class<'_>, status: radio::Status) -> radio::Style { @@ -876,7 +876,7 @@ impl toggler::Catalog for Theme { type Class<'a> = (); fn default<'a>() -> Self::Class<'a> { - () + } fn style(&self, class: &Self::Class<'_>, status: toggler::Status) -> toggler::Style { @@ -933,7 +933,7 @@ impl pane_grid::Catalog for Theme { type Class<'a> = (); fn default<'a>() -> ::Class<'a> { - () + } fn style(&self, class: &::Class<'_>) -> pane_grid::Style { diff --git a/src/theme/style/tooltip.rs b/src/theme/style/tooltip.rs index df9a8e2c..a0564e63 100644 --- a/src/theme/style/tooltip.rs +++ b/src/theme/style/tooltip.rs @@ -1,4 +1,4 @@ -use iced::{Background, Color}; +use iced::Color; use crate::widget::wayland::tooltip::Catalog; diff --git a/src/widget/about.rs b/src/widget/about.rs index 5026d410..acd13ac9 100644 --- a/src/widget/about.rs +++ b/src/widget/about.rs @@ -183,7 +183,7 @@ pub fn about<'a, Message: Clone + 'static>( .align_y(Alignment::Center), ) .class(crate::theme::Button::Text) - .on_press(on_url_press(url.unwrap_or(String::new()))) + .on_press(on_url_press(url.unwrap_or_default())) .width(Length::Fill), ) }); diff --git a/src/widget/aspect_ratio.rs b/src/widget/aspect_ratio.rs index ec8e2bed..39ac9c57 100644 --- a/src/widget/aspect_ratio.rs +++ b/src/widget/aspect_ratio.rs @@ -12,7 +12,6 @@ use iced_core::{ Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Vector, Widget, }; -use iced_widget::container; pub use iced_widget::container::{Catalog, Style}; pub fn aspect_ratio_container<'a, Message: 'static, T>( @@ -35,7 +34,7 @@ where container: Container<'a, Message, crate::Theme, Renderer>, } -impl<'a, Message, Renderer> AspectRatio<'a, Message, Renderer> +impl AspectRatio<'_, Message, Renderer> where Renderer: iced_core::Renderer, { @@ -146,8 +145,8 @@ where } } -impl<'a, Message, Renderer> Widget - for AspectRatio<'a, Message, Renderer> +impl Widget + for AspectRatio<'_, Message, Renderer> where Renderer: iced_core::Renderer, { diff --git a/src/widget/autosize.rs b/src/widget/autosize.rs index a792c6ca..6c15750d 100644 --- a/src/widget/autosize.rs +++ b/src/widget/autosize.rs @@ -1,6 +1,5 @@ //! Autosize Container, which will resize the window to its contents. -use cctk::sctk::shell::xdg::window; use iced_core::event::{self, Event}; use iced_core::layout; use iced_core::mouse; @@ -91,8 +90,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget - for Autosize<'a, Message, Theme, Renderer> +impl Widget + for Autosize<'_, Message, Theme, Renderer> where Renderer: iced_core::Renderer, { diff --git a/src/widget/button/icon.rs b/src/widget/button/icon.rs index 0322d58c..3b46d9d1 100644 --- a/src/widget/button/icon.rs +++ b/src/widget/button/icon.rs @@ -29,7 +29,7 @@ pub fn icon<'a, Message>(handle: impl Into) -> Button<'a, Message> { }) } -impl<'a, Message> Button<'a, Message> { +impl Button<'_, Message> { pub fn new(icon: Icon) -> Self { let guard = crate::theme::THEME.lock().unwrap(); let theme = guard.cosmic(); diff --git a/src/widget/button/image.rs b/src/widget/button/image.rs index a0508aaf..74e3b378 100644 --- a/src/widget/button/image.rs +++ b/src/widget/button/image.rs @@ -1,7 +1,7 @@ // Copyright 2023 System76 // SPDX-License-Identifier: MPL-2.0 -use super::{Builder, Style}; +use super::Builder; use crate::{ widget::{self, image::Handle}, Element, diff --git a/src/widget/button/mod.rs b/src/widget/button/mod.rs index 6bf6338a..9928628b 100644 --- a/src/widget/button/mod.rs +++ b/src/widget/button/mod.rs @@ -111,7 +111,7 @@ pub struct Builder<'a, Message, Variant> { variant: Variant, } -impl<'a, Message, Variant> Builder<'a, Message, Variant> { +impl Builder<'_, Message, Variant> { /// Set the value of [`on_press`] as either `Some` or `None`. pub fn on_press_maybe(mut self, on_press: Option) -> Self { self.on_press = on_press; diff --git a/src/widget/button/text.rs b/src/widget/button/text.rs index 2070fb16..1b682393 100644 --- a/src/widget/button/text.rs +++ b/src/widget/button/text.rs @@ -1,7 +1,7 @@ // Copyright 2023 System76 // SPDX-License-Identifier: MPL-2.0 -use super::{Builder, ButtonClass, Style}; +use super::{Builder, ButtonClass}; use crate::widget::{icon, row, tooltip}; use crate::{ext::CollectionWidget, Element}; use apply::Apply; @@ -42,6 +42,12 @@ pub struct Text { pub(super) trailing_icon: Option, } +impl Default for Text { + fn default() -> Self { + Self::new() + } +} + impl Text { pub const fn new() -> Self { Self { @@ -51,7 +57,7 @@ impl Text { } } -impl<'a, Message> Button<'a, Message> { +impl Button<'_, Message> { pub fn new(text: Text) -> Self { let guard = crate::theme::THEME.lock().unwrap(); let theme = guard.cosmic(); diff --git a/src/widget/button/widget.rs b/src/widget/button/widget.rs index 3f5efbc8..755c66df 100644 --- a/src/widget/button/widget.rs +++ b/src/widget/button/widget.rs @@ -596,7 +596,7 @@ impl<'a, Message: 'a + Clone> Widget node.set_described_by( id.iter() .cloned() - .map(|id| NodeId::from(id)) + .map(NodeId::from) .collect::>(), ); } diff --git a/src/widget/calendar.rs b/src/widget/calendar.rs index b1ee927f..ea96360e 100644 --- a/src/widget/calendar.rs +++ b/src/widget/calendar.rs @@ -53,7 +53,7 @@ impl CalendarModel { let now = Local::now(); let naive_now = NaiveDate::from(now.naive_local()); CalendarModel { - selected: naive_now.clone(), + selected: naive_now, visible: naive_now, } } @@ -65,36 +65,34 @@ impl CalendarModel { pub fn show_prev_month(&mut self) { let prev_month_date = self .visible - .clone() .checked_sub_months(Months::new(1)) .expect("valid naivedate"); - self.visible = prev_month_date.clone(); + self.visible = prev_month_date; } pub fn show_next_month(&mut self) { let next_month_date = self .visible - .clone() .checked_add_months(Months::new(1)) .expect("valid naivedate"); - self.visible = next_month_date.clone(); + self.visible = next_month_date; } pub fn set_prev_month(&mut self) { self.show_prev_month(); - self.selected = self.visible.clone(); + self.selected = self.visible; } pub fn set_next_month(&mut self) { self.show_next_month(); - self.selected = self.visible.clone(); + self.selected = self.visible; } pub fn set_selected_visible(&mut self, selected: NaiveDate) { self.selected = selected; - self.visible = self.selected.clone(); + self.visible = self.selected; } } diff --git a/src/widget/color_picker/mod.rs b/src/widget/color_picker/mod.rs index 99bc4799..65961114 100644 --- a/src/widget/color_picker/mod.rs +++ b/src/widget/color_picker/mod.rs @@ -611,7 +611,7 @@ pub struct ColorPicker<'a, Message> { must_clear_cache: Rc, } -impl<'a, Message> Widget for ColorPicker<'a, Message> +impl Widget for ColorPicker<'_, Message> where Message: Clone + 'static, { @@ -874,7 +874,7 @@ impl State { } } -impl<'a, Message> ColorPicker<'a, Message> where Message: Clone + 'static {} +impl ColorPicker<'_, Message> where Message: Clone + 'static {} // TODO convert active color to hex or rgba fn color_to_string(c: palette::Hsv, is_hex: bool) -> String { let srgb = palette::Srgb::from_color(c); diff --git a/src/widget/context_drawer/overlay.rs b/src/widget/context_drawer/overlay.rs index cc62b2db..0bb44929 100644 --- a/src/widget/context_drawer/overlay.rs +++ b/src/widget/context_drawer/overlay.rs @@ -17,8 +17,8 @@ pub(super) struct Overlay<'a, 'b, Message> { pub(super) width: f32, } -impl<'a, 'b, Message> overlay::Overlay - for Overlay<'a, 'b, Message> +impl overlay::Overlay + for Overlay<'_, '_, Message> where Message: Clone, { diff --git a/src/widget/context_drawer/widget.rs b/src/widget/context_drawer/widget.rs index fafa8a19..c59ae407 100644 --- a/src/widget/context_drawer/widget.rs +++ b/src/widget/context_drawer/widget.rs @@ -155,7 +155,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> { } } -impl<'a, Message: Clone> Widget for ContextDrawer<'a, Message> { +impl Widget for ContextDrawer<'_, Message> { fn children(&self) -> Vec { vec![Tree::new(&self.content), Tree::new(&self.drawer)] } diff --git a/src/widget/context_menu.rs b/src/widget/context_menu.rs index 338775b9..f7d50434 100644 --- a/src/widget/context_menu.rs +++ b/src/widget/context_menu.rs @@ -46,8 +46,8 @@ pub struct ContextMenu<'a, Message> { context_menu: Option>>, } -impl<'a, Message: Clone> Widget - for ContextMenu<'a, Message> +impl Widget + for ContextMenu<'_, Message> { fn tag(&self) -> tree::Tag { tree::Tag::of::() diff --git a/src/widget/dialog.rs b/src/widget/dialog.rs index 0c7907e4..3c8f181e 100644 --- a/src/widget/dialog.rs +++ b/src/widget/dialog.rs @@ -15,6 +15,12 @@ pub struct Dialog<'a, Message> { tertiary_action: Option>, } +impl Default for Dialog<'_, Message> { + fn default() -> Self { + Self::new() + } +} + impl<'a, Message> Dialog<'a, Message> { pub fn new() -> Self { Self { diff --git a/src/widget/dnd_destination.rs b/src/widget/dnd_destination.rs index 4fcca830..31fa0305 100644 --- a/src/widget/dnd_destination.rs +++ b/src/widget/dnd_destination.rs @@ -243,8 +243,8 @@ impl<'a, Message: 'static> DndDestination<'a, Message> { } } -impl<'a, Message: 'static> Widget - for DndDestination<'a, Message> +impl Widget + for DndDestination<'_, Message> { fn children(&self) -> Vec { vec![Tree::new(&self.container)] diff --git a/src/widget/dnd_source.rs b/src/widget/dnd_source.rs index d57e099b..4936ca10 100644 --- a/src/widget/dnd_source.rs +++ b/src/widget/dnd_source.rs @@ -111,7 +111,7 @@ impl< clipboard, false, if let Some(window) = self.window.as_ref() { - Some(iced_core::clipboard::DndSource::Surface(window.clone())) + Some(iced_core::clipboard::DndSource::Surface(*window)) } else { Some(iced_core::clipboard::DndSource::Widget(self.id.clone())) }, @@ -153,10 +153,9 @@ impl< } impl< - 'a, Message: Clone + 'static, D: iced::clipboard::mime::AsMimeTypes + std::marker::Send + 'static, - > Widget for DndSource<'a, Message, D> + > Widget for DndSource<'_, Message, D> { fn children(&self) -> Vec { vec![Tree::new(&self.container)] diff --git a/src/widget/dropdown/menu/mod.rs b/src/widget/dropdown/menu/mod.rs index 736fbac5..f10be142 100644 --- a/src/widget/dropdown/menu/mod.rs +++ b/src/widget/dropdown/menu/mod.rs @@ -7,9 +7,8 @@ use std::borrow::Cow; use std::sync::{Arc, Mutex}; pub use appearance::{Appearance, StyleSheet}; -use iced::advanced::widget; -use crate::widget::{icon, Container, RcElementWrapper, RcWrapper}; +use crate::widget::{icon, Container, RcWrapper}; use iced_core::event::{self, Event}; use iced_core::layout::{self, Layout}; use iced_core::text::{self, Text}; @@ -418,8 +417,8 @@ where text_line_height: text::LineHeight, } -impl<'a, S: AsRef, Message> Widget - for List<'a, S, Message> +impl, Message> Widget + for List<'_, S, Message> where [S]: std::borrow::ToOwned, { diff --git a/src/widget/dropdown/mod.rs b/src/widget/dropdown/mod.rs index 1821482f..3480e494 100644 --- a/src/widget/dropdown/mod.rs +++ b/src/widget/dropdown/mod.rs @@ -14,13 +14,12 @@ pub use widget::*; /// Displays a list of options in a popover menu on select. pub fn dropdown< - 'a, S: AsRef + std::clone::Clone + Send + Sync + 'static, Message: 'static + Clone, >( - selections: &'a [S], + selections: &[S], selected: Option, on_selected: impl Fn(usize) -> Message + Send + Sync + 'static, -) -> Dropdown<'a, S, Message> { +) -> Dropdown<'_, S, Message> { Dropdown::new(selections, selected, on_selected) } diff --git a/src/widget/dropdown/multi/menu.rs b/src/widget/dropdown/multi/menu.rs index f5ee5f5b..4587b220 100644 --- a/src/widget/dropdown/multi/menu.rs +++ b/src/widget/dropdown/multi/menu.rs @@ -180,8 +180,8 @@ impl<'a, Message: 'a> Overlay<'a, Message> { } } -impl<'a, Message> iced_core::Overlay - for Overlay<'a, Message> +impl iced_core::Overlay + for Overlay<'_, Message> { fn layout(&mut self, renderer: &crate::Renderer, bounds: Size) -> layout::Node { let position = self.position; @@ -279,8 +279,8 @@ struct InnerList<'a, S, Item, Message> { text_line_height: text::LineHeight, } -impl<'a, S, Item, Message> Widget - for InnerList<'a, S, Item, Message> +impl Widget + for InnerList<'_, S, Item, Message> where S: AsRef, Item: Clone + PartialEq, diff --git a/src/widget/dropdown/multi/widget.rs b/src/widget/dropdown/multi/widget.rs index b3bb09e2..14f89d72 100644 --- a/src/widget/dropdown/multi/widget.rs +++ b/src/widget/dropdown/multi/widget.rs @@ -159,7 +159,7 @@ impl<'a, S: AsRef, Message: 'a, Item: Clone + PartialEq + 'static> cursor: mouse::Cursor, viewport: &Rectangle, ) { - let font = self.font.unwrap_or_else(|| crate::font::default()); + let font = self.font.unwrap_or_else(crate::font::default); draw( renderer, @@ -278,7 +278,7 @@ pub fn layout( bounds: Size::new(f32::MAX, f32::MAX), size: iced::Pixels(text_size), line_height: text_line_height, - font: font.unwrap_or_else(|| crate::font::default()), + font: font.unwrap_or_else(crate::font::default), horizontal_alignment: alignment::Horizontal::Left, vertical_alignment: alignment::Vertical::Top, shaping: text::Shaping::Advanced, @@ -422,7 +422,7 @@ pub fn overlay<'a, S: AsRef, Message: 'a, Item: Clone + PartialEq + 'static bounds: Size::new(f32::MAX, f32::MAX), size: iced::Pixels(text_size), line_height, - font: font.unwrap_or_else(|| crate::font::default()), + font: font.unwrap_or_else(crate::font::default), horizontal_alignment: alignment::Horizontal::Left, vertical_alignment: alignment::Vertical::Top, shaping: text::Shaping::Advanced, diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs index 7a0130cc..17ac30fb 100644 --- a/src/widget/dropdown/widget.rs +++ b/src/widget/dropdown/widget.rs @@ -6,7 +6,7 @@ use super::menu::{self, Menu}; use crate::widget::icon::{self, Handle}; use crate::Element; use derive_setters::Setters; -use iced::{window, Radians}; +use iced::window; use iced_core::event::{self, Event}; use iced_core::text::{self, Paragraph, Text}; use iced_core::widget::tree::{self, Tree}; @@ -139,8 +139,8 @@ where } } -impl<'a, S: AsRef + Send + Sync + Clone + 'static, Message: 'static + std::clone::Clone> - Widget for Dropdown<'a, S, Message> +impl + Send + Sync + Clone + 'static, Message: 'static + std::clone::Clone> + Widget for Dropdown<'_, S, Message> where [S]: std::borrow::ToOwned, { @@ -270,7 +270,7 @@ where cursor: mouse::Cursor, viewport: &Rectangle, ) { - let font = self.font.unwrap_or_else(|| crate::font::default()); + let font = self.font.unwrap_or_else(crate::font::default); draw( renderer, theme, @@ -407,7 +407,7 @@ pub fn layout( bounds: Size::new(f32::MAX, f32::MAX), size: iced::Pixels(text_size), line_height: text_line_height, - font: font.unwrap_or_else(|| crate::font::default()), + font: font.unwrap_or_else(crate::font::default), horizontal_alignment: alignment::Horizontal::Left, vertical_alignment: alignment::Vertical::Top, shaping: text::Shaping::Advanced, diff --git a/src/widget/flex_row/widget.rs b/src/widget/flex_row/widget.rs index 49955217..1b6aeb00 100644 --- a/src/widget/flex_row/widget.rs +++ b/src/widget/flex_row/widget.rs @@ -85,8 +85,8 @@ impl<'a, Message> FlexRow<'a, Message> { } } -impl<'a, Message: 'static + Clone> Widget - for FlexRow<'a, Message> +impl Widget + for FlexRow<'_, Message> { fn children(&self) -> Vec { self.children.iter().map(Tree::new).collect() diff --git a/src/widget/grid/widget.rs b/src/widget/grid/widget.rs index 961ffb90..fc91ba29 100644 --- a/src/widget/grid/widget.rs +++ b/src/widget/grid/widget.rs @@ -44,6 +44,12 @@ pub struct Grid<'a, Message> { row: u16, } +impl Default for Grid<'_, Message> { + fn default() -> Self { + Self::new() + } +} + impl<'a, Message> Grid<'a, Message> { pub const fn new() -> Self { Self { @@ -106,7 +112,7 @@ impl<'a, Message> Grid<'a, Message> { } } -impl<'a, Message: 'static + Clone> Widget for Grid<'a, Message> { +impl Widget for Grid<'_, Message> { fn children(&self) -> Vec { self.children.iter().map(Tree::new).collect() } @@ -303,6 +309,12 @@ pub struct Assignment { pub(super) height: u16, } +impl Default for Assignment { + fn default() -> Self { + Self::new() + } +} + impl Assignment { pub const fn new() -> Self { Self { diff --git a/src/widget/header_bar.rs b/src/widget/header_bar.rs index 93c7354b..32bfa278 100644 --- a/src/widget/header_bar.rs +++ b/src/widget/header_bar.rs @@ -120,8 +120,8 @@ pub struct HeaderBarWidget<'a, Message> { header_bar_inner: Element<'a, Message>, } -impl<'a, Message: Clone + 'static> Widget - for HeaderBarWidget<'a, Message> +impl Widget + for HeaderBarWidget<'_, Message> { fn diff(&mut self, tree: &mut tree::Tree) { tree.diff_children(&mut [&mut self.header_bar_inner]); diff --git a/src/widget/icon/mod.rs b/src/widget/icon/mod.rs index 318b9fb1..45d5451d 100644 --- a/src/widget/icon/mod.rs +++ b/src/widget/icon/mod.rs @@ -84,7 +84,7 @@ impl Icon { self.height .unwrap_or_else(|| Length::Fixed(f32::from(self.size))), ) - .rotation(self.rotation.unwrap_or_else(Rotation::default)) + .rotation(self.rotation.unwrap_or_default()) .content_fit(self.content_fit) .into() }; @@ -100,7 +100,7 @@ impl Icon { self.height .unwrap_or_else(|| Length::Fixed(f32::from(self.size))), ) - .rotation(self.rotation.unwrap_or_else(Rotation::default)) + .rotation(self.rotation.unwrap_or_default()) .content_fit(self.content_fit) .symbolic(self.handle.symbolic) .into() diff --git a/src/widget/icon/named.rs b/src/widget/icon/named.rs index 40432c04..055b2e42 100644 --- a/src/widget/icon/named.rs +++ b/src/widget/icon/named.rs @@ -144,7 +144,7 @@ impl From for Icon { } } -impl<'a, Message: 'static> From for crate::Element<'a, Message> { +impl From for crate::Element<'_, Message> { fn from(builder: Named) -> Self { builder.icon().into() } diff --git a/src/widget/id_container.rs b/src/widget/id_container.rs index ae30289f..2070780b 100644 --- a/src/widget/id_container.rs +++ b/src/widget/id_container.rs @@ -47,8 +47,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget - for IdContainer<'a, Message, Theme, Renderer> +impl Widget + for IdContainer<'_, Message, Theme, Renderer> where Renderer: iced_core::Renderer, { diff --git a/src/widget/layer_container.rs b/src/widget/layer_container.rs index 016932b4..c482da4a 100644 --- a/src/widget/layer_container.rs +++ b/src/widget/layer_container.rs @@ -138,8 +138,8 @@ where } } -impl<'a, Message, Renderer> Widget - for LayerContainer<'a, Message, Renderer> +impl Widget + for LayerContainer<'_, Message, Renderer> where Renderer: iced_core::Renderer, { diff --git a/src/widget/list/column.rs b/src/widget/list/column.rs index 39eb96a1..1a9b7348 100644 --- a/src/widget/list/column.rs +++ b/src/widget/list/column.rs @@ -24,7 +24,7 @@ pub struct ListColumn<'a, Message> { children: Vec>, } -impl<'a, Message: 'static> Default for ListColumn<'a, Message> { +impl Default for ListColumn<'_, Message> { fn default() -> Self { let cosmic_theme::Spacing { space_xxs, space_m, .. diff --git a/src/widget/menu/key_bind.rs b/src/widget/menu/key_bind.rs index a6934ff1..8b4ed227 100644 --- a/src/widget/menu/key_bind.rs +++ b/src/widget/menu/key_bind.rs @@ -40,7 +40,7 @@ impl KeyBind { pub fn matches(&self, modifiers: Modifiers, key: &Key) -> bool { let key_eq = match (key, &self.key) { // CapsLock and Shift change the case of Key::Character, so we compare these in a case insensitive way - (Key::Character(a), Key::Character(b)) => a.eq_ignore_ascii_case(&b), + (Key::Character(a), Key::Character(b)) => a.eq_ignore_ascii_case(b), (a, b) => a.eq(b), }; key_eq diff --git a/src/widget/menu/menu_bar.rs b/src/widget/menu/menu_bar.rs index a1be7c82..b02e0ad2 100644 --- a/src/widget/menu/menu_bar.rs +++ b/src/widget/menu/menu_bar.rs @@ -64,8 +64,8 @@ impl Default for MenuBarState { } } -pub(crate) fn menu_roots_children<'a, Message, Renderer>( - menu_roots: &Vec>, +pub(crate) fn menu_roots_children( + menu_roots: &Vec>, ) -> Vec where Renderer: renderer::Renderer, @@ -95,8 +95,8 @@ where } #[allow(invalid_reference_casting)] -pub(crate) fn menu_roots_diff<'a, Message, Renderer>( - menu_roots: &mut Vec>, +pub(crate) fn menu_roots_diff( + menu_roots: &mut Vec>, tree: &mut Tree, ) where Renderer: renderer::Renderer, @@ -280,8 +280,8 @@ where self } } -impl<'a, Message, Renderer> Widget - for MenuBar<'a, Message, Renderer> +impl Widget + for MenuBar<'_, Message, Renderer> where Renderer: renderer::Renderer, { diff --git a/src/widget/menu/menu_inner.rs b/src/widget/menu/menu_inner.rs index b64fba2c..1cd60dec 100644 --- a/src/widget/menu/menu_inner.rs +++ b/src/widget/menu/menu_inner.rs @@ -447,7 +447,7 @@ where pub(crate) style: &'b ::Style, pub(crate) position: Point, } -impl<'a, 'b, Message, Renderer> Menu<'a, 'b, Message, Renderer> +impl<'b, Message, Renderer> Menu<'_, 'b, Message, Renderer> where Renderer: renderer::Renderer, { @@ -455,8 +455,8 @@ where overlay::Element::new(Box::new(self)) } } -impl<'a, 'b, Message, Renderer> overlay::Overlay - for Menu<'a, 'b, Message, Renderer> +impl overlay::Overlay + for Menu<'_, '_, Message, Renderer> where Renderer: renderer::Renderer, { diff --git a/src/widget/mod.rs b/src/widget/mod.rs index 13a16dd6..52978f46 100644 --- a/src/widget/mod.rs +++ b/src/widget/mod.rs @@ -344,7 +344,7 @@ pub mod wayland; pub mod tooltip { use crate::Element; - use std::borrow::Cow; + pub use iced::widget::tooltip::Position; diff --git a/src/widget/nav_bar_toggle.rs b/src/widget/nav_bar_toggle.rs index 1d807060..2a315683 100644 --- a/src/widget/nav_bar_toggle.rs +++ b/src/widget/nav_bar_toggle.rs @@ -25,7 +25,7 @@ pub fn nav_bar_toggle() -> NavBarToggle { } } -impl<'a, Message: 'static + Clone> From> for Element<'a, Message> { +impl From> for Element<'_, Message> { fn from(nav_bar_toggle: NavBarToggle) -> Self { let icon = if nav_bar_toggle.active { widget::icon::from_svg_bytes( diff --git a/src/widget/popover.rs b/src/widget/popover.rs index 974153d3..12a64d06 100644 --- a/src/widget/popover.rs +++ b/src/widget/popover.rs @@ -75,8 +75,8 @@ impl<'a, Message, Renderer> Popover<'a, Message, Renderer> { // TODO More options for positioning similar to GdkPopup, xdg_popup } -impl<'a, Message: Clone, Renderer> Widget - for Popover<'a, Message, Renderer> +impl Widget + for Popover<'_, Message, Renderer> where Renderer: iced_core::Renderer, { @@ -305,8 +305,8 @@ pub struct Overlay<'a, 'b, Message, Renderer> { pos: Point, } -impl<'a, 'b, Message, Renderer> overlay::Overlay - for Overlay<'a, 'b, Message, Renderer> +impl overlay::Overlay + for Overlay<'_, '_, Message, Renderer> where Message: Clone, Renderer: iced_core::Renderer, @@ -425,7 +425,7 @@ where ) -> Option> { self.content .as_widget_mut() - .overlay(&mut self.tree, layout, renderer, Default::default()) + .overlay(self.tree, layout, renderer, Default::default()) } } diff --git a/src/widget/radio.rs b/src/widget/radio.rs index 55d96192..ebb75ee2 100644 --- a/src/widget/radio.rs +++ b/src/widget/radio.rs @@ -155,7 +155,7 @@ where } } -impl<'a, Message, Renderer> Widget for Radio<'a, Message, Renderer> +impl Widget for Radio<'_, Message, Renderer> where Message: Clone, Renderer: iced_core::Renderer, diff --git a/src/widget/responsive_container.rs b/src/widget/responsive_container.rs index 27322f2c..ff644852 100644 --- a/src/widget/responsive_container.rs +++ b/src/widget/responsive_container.rs @@ -58,8 +58,8 @@ where } } -impl<'a, Message, Theme, Renderer> Widget - for ResponsiveContainer<'a, Message, Theme, Renderer> +impl Widget + for ResponsiveContainer<'_, Message, Theme, Renderer> where Renderer: iced_core::Renderer, Message: From, diff --git a/src/widget/segmented_button/horizontal.rs b/src/widget/segmented_button/horizontal.rs index a859b2ca..ccf4c8ae 100644 --- a/src/widget/segmented_button/horizontal.rs +++ b/src/widget/segmented_button/horizontal.rs @@ -30,8 +30,8 @@ where SegmentedButton::new(model) } -impl<'a, SelectionMode, Message> SegmentedVariant - for SegmentedButton<'a, Horizontal, SelectionMode, Message> +impl SegmentedVariant + for SegmentedButton<'_, Horizontal, SelectionMode, Message> where Model: Selectable, SelectionMode: Default, diff --git a/src/widget/segmented_button/model/entity.rs b/src/widget/segmented_button/model/entity.rs index 77f591b9..02a7d371 100644 --- a/src/widget/segmented_button/model/entity.rs +++ b/src/widget/segmented_button/model/entity.rs @@ -15,7 +15,7 @@ pub struct EntityMut<'a, SelectionMode: Default> { pub(super) model: &'a mut Model, } -impl<'a, SelectionMode: Default> EntityMut<'a, SelectionMode> +impl EntityMut<'_, SelectionMode> where Model: Selectable, { diff --git a/src/widget/segmented_button/vertical.rs b/src/widget/segmented_button/vertical.rs index d8ae0be9..3f5d5645 100644 --- a/src/widget/segmented_button/vertical.rs +++ b/src/widget/segmented_button/vertical.rs @@ -30,8 +30,8 @@ where SegmentedButton::new(model) } -impl<'a, SelectionMode, Message> SegmentedVariant - for SegmentedButton<'a, Vertical, SelectionMode, Message> +impl SegmentedVariant + for SegmentedButton<'_, Vertical, SelectionMode, Message> where Model: Selectable, SelectionMode: Default, diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs index e40465d0..0e433aec 100644 --- a/src/widget/segmented_button/widget.rs +++ b/src/widget/segmented_button/widget.rs @@ -547,8 +547,8 @@ where } } -impl<'a, Variant, SelectionMode, Message> Widget - for SegmentedButton<'a, Variant, SelectionMode, Message> +impl Widget + for SegmentedButton<'_, Variant, SelectionMode, Message> where Self: SegmentedVariant, Model: Selectable, @@ -562,7 +562,7 @@ where if let Some(ref context_menu) = self.context_menu { let mut tree = Tree::empty(); tree.state = tree::State::new(MenuBarState::default()); - tree.children = menu_roots_children(&context_menu); + tree.children = menu_roots_children(context_menu); children.push(tree); } @@ -719,7 +719,7 @@ where let on_dnd_enter = self.on_dnd_enter .as_ref() - .zip(entity.clone()) + .zip(entity) .map(|(on_enter, entity)| { move |_, _, mime_types| on_enter(entity, mime_types) }); diff --git a/src/widget/settings/section.rs b/src/widget/settings/section.rs index e32251ef..01937671 100644 --- a/src/widget/settings/section.rs +++ b/src/widget/settings/section.rs @@ -20,9 +20,9 @@ pub fn section<'a, Message: 'static>() -> Section<'a, Message> { } /// A section with a pre-defined list column. -pub fn with_column<'a, Message: 'static>( - children: ListColumn<'a, Message>, -) -> Section<'a, Message> { +pub fn with_column( + children: ListColumn<'_, Message>, +) -> Section<'_, Message> { Section { title: Cow::Borrowed(""), children, diff --git a/src/widget/spin_button.rs b/src/widget/spin_button.rs index 10c19125..41620c77 100644 --- a/src/widget/spin_button.rs +++ b/src/widget/spin_button.rs @@ -9,12 +9,10 @@ use crate::{ Element, }; use apply::Apply; -use derive_setters::Setters; -use iced::{alignment::Horizontal, Border, Shadow}; +use iced::{Border, Shadow}; use iced::{Alignment, Length}; -use std::marker::PhantomData; use std::ops::{Add, Sub}; -use std::{borrow::Cow, fmt::Display}; +use std::borrow::Cow; /// Horizontal spin button widget. pub fn spin_button<'a, T, M>( @@ -153,9 +151,9 @@ where } } -fn horizontal_variant<'a, T, Message>( - spin_button: SpinButton<'a, T, Message>, -) -> Element<'a, Message> +fn horizontal_variant( + spin_button: SpinButton<'_, T, Message>, +) -> Element<'_, Message> where Message: Clone + 'static, T: Copy + Sub + Add + PartialOrd, @@ -193,7 +191,7 @@ where .into() } -fn vertical_variant<'a, T, Message>(spin_button: SpinButton<'a, T, Message>) -> Element<'a, Message> +fn vertical_variant(spin_button: SpinButton<'_, T, Message>) -> Element<'_, Message> where Message: Clone + 'static, T: Copy + Sub + Add + PartialOrd, diff --git a/src/widget/text_input/input.rs b/src/widget/text_input/input.rs index e76ec02d..d6c11cf6 100644 --- a/src/widget/text_input/input.rs +++ b/src/widget/text_input/input.rs @@ -18,7 +18,6 @@ use super::style::StyleSheet; pub use super::value::Value; use apply::Apply; -use cosmic_theme::Theme; use iced::clipboard::dnd::{DndAction, DndEvent, OfferEvent, SourceEvent}; use iced::clipboard::mime::AsMimeTypes; use iced::Limits; @@ -40,10 +39,6 @@ use iced_core::{ Clipboard, Color, Element, Layout, Length, Padding, Pixels, Point, Rectangle, Shell, Size, Vector, Widget, }; -#[cfg(feature = "wayland")] -use iced_renderer::core::event::{wayland, PlatformSpecific}; -#[cfg(feature = "wayland")] -use iced_runtime::platform_specific; use iced_runtime::{task, Action, Task}; thread_local! { @@ -343,7 +338,7 @@ where /// Sets the message that should be produced when the [`TextInput`] is /// focused and the enter key is pressed. - pub fn on_submit(mut self, callback: F) -> Self + pub fn on_submit(self, callback: F) -> Self where F: 'a + Fn(String) -> Message, { @@ -526,7 +521,7 @@ where } } -impl<'a, Message> Widget for TextInput<'a, Message> +impl Widget for TextInput<'_, Message> where Message: Clone + 'static, { @@ -605,13 +600,10 @@ where // if the previous state was at the end of the text, keep it there let old_value = Value::new(&old_value); if state.is_focused.is_some() { - match state.cursor.state(&old_value) { - cursor::State::Index(index) => { - if index == old_value.len() { - state.cursor.move_to(self.value.len()); - } + if let cursor::State::Index(index) = state.cursor.state(&old_value) { + if index == old_value.len() { + state.cursor.move_to(self.value.len()); } - _ => {} }; } @@ -808,7 +800,7 @@ where } } - if tree.children.len() > 0 { + if !tree.children.is_empty() { let index = tree.children.len() - 1; if let (Some(trailing_icon), Some(tree)) = (self.trailing_icon.as_mut(), tree.children.get_mut(index)) @@ -1387,7 +1379,7 @@ where iced_core::clipboard::start_dnd( clipboard, false, - id.map(|id| iced_core::clipboard::DndSource::Widget(id)), + id.map(iced_core::clipboard::DndSource::Widget), Some(iced_core::clipboard::IconSurface::new( Element::from( TextInput::<'static, ()>::new("", input_text.clone()) @@ -1583,7 +1575,7 @@ where match key { keyboard::Key::Named(keyboard::key::Named::Enter) => { - if let Some(on_submit) = on_submit.clone() { + if let Some(on_submit) = on_submit { shell.publish((on_submit)(unsecured_value.to_string())); } } diff --git a/src/widget/toaster/mod.rs b/src/widget/toaster/mod.rs index 2ed8289e..1acbce0c 100644 --- a/src/widget/toaster/mod.rs +++ b/src/widget/toaster/mod.rs @@ -8,7 +8,7 @@ use std::rc::Rc; use crate::widget::container; use crate::widget::Column; -use iced::{Padding, Task}; +use iced::Task; use iced_core::Element; use slotmap::new_key_type; use slotmap::SlotMap; diff --git a/src/widget/toaster/widget.rs b/src/widget/toaster/widget.rs index 7a7f6949..bde5c890 100644 --- a/src/widget/toaster/widget.rs +++ b/src/widget/toaster/widget.rs @@ -35,8 +35,8 @@ impl<'a, Message, Theme, Renderer> Toaster<'a, Message, Theme, Renderer> { } } -impl<'a, Message, Theme, Renderer> Widget - for Toaster<'a, Message, Theme, Renderer> +impl Widget + for Toaster<'_, Message, Theme, Renderer> where Renderer: iced_core::Renderer, { @@ -191,8 +191,8 @@ where } } -impl<'a, 'b, Message, Theme, Renderer> Overlay - for ToasterOverlay<'a, 'b, Message, Theme, Renderer> +impl Overlay + for ToasterOverlay<'_, '_, Message, Theme, Renderer> where Renderer: renderer::Renderer, { diff --git a/src/widget/wayland/tooltip/widget.rs b/src/widget/wayland/tooltip/widget.rs index 7897a344..0eb3352c 100644 --- a/src/widget/wayland/tooltip/widget.rs +++ b/src/widget/wayland/tooltip/widget.rs @@ -7,10 +7,9 @@ //! A [`Tooltip`] has some local [`State`]. use iced_runtime::core::widget::Id; -use iced_runtime::{keyboard, task, Action, Task}; use iced_core::event::{self, Event}; -use iced_core::renderer::{self, Quad, Renderer}; +use iced_core::renderer::{self, Renderer}; use iced_core::touch; use iced_core::widget::tree::{self, Tree}; use iced_core::widget::Operation; @@ -20,9 +19,7 @@ use iced_core::{overlay, Shadow}; use iced_core::{ Background, Clipboard, Color, Layout, Length, Padding, Point, Rectangle, Shell, Vector, Widget, }; -use iced_renderer::core::widget::operation; -use crate::theme::THEME; pub use super::{Catalog, Style}; @@ -267,7 +264,7 @@ impl<'a, Message: 'a + Clone> Widget let styling = theme.style(&self.style); - let mut icon_color = styling.icon_color.unwrap_or(renderer_style.icon_color); + let icon_color = styling.icon_color.unwrap_or(renderer_style.icon_color); draw::<_, crate::Theme>( renderer,