cargo fmt

src/app/core.rs

@@ -4,10 +4,10 @@
 use std::collections::HashMap;
 
 use crate::widget::{
-        button, icon,
+    button, icon,
-        menu::{self},
+    menu::{self},
-        nav_bar, responsive_container,
+    nav_bar, responsive_container,
-    };
+};
 use cosmic_config::CosmicConfigEntry;
 use cosmic_theme::ThemeMode;
 use iced::{window, Limits, Size};
@@ -17,7 +17,6 @@ use slotmap::Key;
 
 use crate::Theme;
 
-
 /// Status of the nav bar and its panels.
 #[derive(Clone)]
 pub struct NavBar {
@@ -403,10 +402,6 @@ impl Core {
             Vec<menu::Item<A, std::borrow::Cow<'static, str>>>,
         )>,
     ) -> crate::Element<'a, Message> {
-        
-
-        
-
         use crate::widget::id_container;
 
         let menu_bar_size = self.menu_bars.get(&id);

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.
 
-
 pub mod command;
 pub mod context_drawer;
 mod core;
@@ -18,8 +17,6 @@ pub mod settings;
 pub mod message {
     use crate::surface_message::SurfaceMessage;
 
-    
-
     #[derive(Clone, Debug)]
     #[must_use]
     pub enum Message<M> {
@@ -549,7 +546,8 @@ where
                 } else {
                     p.activate(platform_data)
                 }
-            }; match res {
+            };
+            match res {
                 Ok(()) => {
                     tracing::info!("Successfully activated another instance");
                     true

src/applet/mod.rs

@@ -25,12 +25,7 @@ use cosmic_panel_config::{CosmicPanelBackground, PanelAnchor, PanelSize};
 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};
-use std::{
+use std::{borrow::Cow, num::NonZeroU32, rc::Rc, sync::LazyLock};
-    borrow::Cow,
-    num::NonZeroU32,
-    rc::Rc,
-    sync::LazyLock,
-};
 use tracing::info;
 
 use crate::app::cosmic;
@@ -166,11 +161,7 @@ impl Context {
         let height = f32::from(height) + applet_padding as f32 * 2.;
         let mut settings = crate::app::Settings::default()
             .size(iced_core::Size::new(width, height))
-            .size_limits(
+            .size_limits(Limits::NONE.min_height(height).min_width(width))
-                Limits::NONE
-                    .min_height(height)
-                    .min_width(width),
-            )
             .resizable(None)
             .default_text_size(14.0)
             .default_font(crate::font::default())

src/config/mod.rs

@@ -152,7 +152,8 @@ impl From<FontConfig> for iced::Font {
         let mut family_map = FAMILY_MAP.lock().unwrap();
 
         let name: &'static str = family_map
-            .get(font.family.as_str()).copied()
+            .get(font.family.as_str())
+            .copied()
             .unwrap_or_else(|| {
                 let value = font.family.clone().leak();
                 family_map.insert(value);

src/theme/style/iced.rs

@@ -753,9 +753,7 @@ impl slider::Catalog for Theme {
 impl menu::Catalog for Theme {
     type Class<'a> = ();
 
-    fn default<'a>() -> <Self as menu::Catalog>::Class<'a> {
+    fn default<'a>() -> <Self as menu::Catalog>::Class<'a> {}
-        
-    }
 
     fn style(&self, class: &<Self as menu::Catalog>::Class<'_>) -> menu::Style {
         let cosmic = self.cosmic();
@@ -776,9 +774,7 @@ impl menu::Catalog for Theme {
 impl pick_list::Catalog for Theme {
     type Class<'a> = ();
 
-    fn default<'a>() -> <Self as pick_list::Catalog>::Class<'a> {
+    fn default<'a>() -> <Self as pick_list::Catalog>::Class<'a> {}
-        
-    }
 
     fn style(
         &self,
@@ -821,9 +817,7 @@ impl pick_list::Catalog for Theme {
 impl radio::Catalog for Theme {
     type Class<'a> = ();
 
-    fn default<'a>() -> Self::Class<'a> {
+    fn default<'a>() -> Self::Class<'a> {}
-        
-    }
 
     fn style(&self, class: &Self::Class<'_>, status: radio::Status) -> radio::Style {
         let theme = self.cosmic();
@@ -875,9 +869,7 @@ impl radio::Catalog for Theme {
 impl toggler::Catalog for Theme {
     type Class<'a> = ();
 
-    fn default<'a>() -> Self::Class<'a> {
+    fn default<'a>() -> Self::Class<'a> {}
-        
-    }
 
     fn style(&self, class: &Self::Class<'_>, status: toggler::Status) -> toggler::Style {
         let cosmic = self.cosmic();
@@ -932,9 +924,7 @@ impl toggler::Catalog for Theme {
 impl pane_grid::Catalog for Theme {
     type Class<'a> = ();
 
-    fn default<'a>() -> <Self as pane_grid::Catalog>::Class<'a> {
+    fn default<'a>() -> <Self as pane_grid::Catalog>::Class<'a> {}
-        
-    }
 
     fn style(&self, class: &<Self as pane_grid::Catalog>::Class<'_>) -> pane_grid::Style {
         let theme = self.cosmic();

src/widget/button/widget.rs

@@ -593,12 +593,7 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
         }
         match self.description.as_ref() {
             Some(iced_accessibility::Description::Id(id)) => {
-                node.set_described_by(
+                node.set_described_by(id.iter().cloned().map(NodeId::from).collect::<Vec<_>>());
-                    id.iter()
-                        .cloned()
-                        .map(NodeId::from)
-                        .collect::<Vec<_>>(),
-                );
             }
             Some(iced_accessibility::Description::Text(text)) => {
                 node.set_description(text.clone());

src/widget/context_drawer/overlay.rs

@@ -17,8 +17,7 @@ pub(super) struct Overlay<'a, 'b, Message> {
     pub(super) width: f32,
 }
 
-impl<Message> overlay::Overlay<Message, crate::Theme, crate::Renderer>
+impl<Message> overlay::Overlay<Message, crate::Theme, crate::Renderer> for Overlay<'_, '_, Message>
-    for Overlay<'_, '_, Message>
 where
     Message: Clone,
 {

src/widget/context_menu.rs

@@ -46,9 +46,7 @@ pub struct ContextMenu<'a, Message> {
     context_menu: Option<Vec<menu::Tree<'a, Message>>>,
 }
 
-impl<Message: Clone> Widget<Message, crate::Theme, crate::Renderer>
+impl<Message: Clone> Widget<Message, crate::Theme, crate::Renderer> for ContextMenu<'_, Message> {
-    for ContextMenu<'_, Message>
-{
     fn tag(&self) -> tree::Tag {
         tree::Tag::of::<LocalState>()
     }

src/widget/dropdown/menu/mod.rs

@@ -417,8 +417,7 @@ where
     text_line_height: text::LineHeight,
 }
 
-impl<S: AsRef<str>, Message> Widget<Message, crate::Theme, crate::Renderer>
+impl<S: AsRef<str>, Message> Widget<Message, crate::Theme, crate::Renderer> for List<'_, S, Message>
-    for List<'_, S, Message>
 where
     [S]: std::borrow::ToOwned,
 {

src/widget/dropdown/multi/menu.rs

@@ -180,9 +180,7 @@ impl<'a, Message: 'a> Overlay<'a, Message> {
     }
 }
 
-impl<Message> iced_core::Overlay<Message, crate::Theme, crate::Renderer>
+impl<Message> iced_core::Overlay<Message, crate::Theme, crate::Renderer> for Overlay<'_, Message> {
-    for Overlay<'_, Message>
-{
     fn layout(&mut self, renderer: &crate::Renderer, bounds: Size) -> layout::Node {
         let position = self.position;
         let space_below = bounds.height - (position.y + self.target_height);

src/widget/flex_row/widget.rs

@@ -85,9 +85,7 @@ impl<'a, Message> FlexRow<'a, Message> {
     }
 }
 
-impl<Message: 'static + Clone> Widget<Message, crate::Theme, Renderer>
+impl<Message: 'static + Clone> Widget<Message, crate::Theme, Renderer> for FlexRow<'_, Message> {
-    for FlexRow<'_, Message>
-{
     fn children(&self) -> Vec<Tree> {
         self.children.iter().map(Tree::new).collect()
     }

src/widget/layer_container.rs

@@ -138,8 +138,7 @@ where
     }
 }
 
-impl<Message, Renderer> Widget<Message, Theme, Renderer>
+impl<Message, Renderer> Widget<Message, Theme, Renderer> for LayerContainer<'_, Message, Renderer>
-    for LayerContainer<'_, Message, Renderer>
 where
     Renderer: iced_core::Renderer,
 {

src/widget/menu/menu_bar.rs

@@ -280,8 +280,7 @@ where
         self
     }
 }
-impl<Message, Renderer> Widget<Message, crate::Theme, Renderer>
+impl<Message, Renderer> Widget<Message, crate::Theme, Renderer> for MenuBar<'_, Message, Renderer>
-    for MenuBar<'_, Message, Renderer>
 where
     Renderer: renderer::Renderer,
 {

src/widget/mod.rs

@@ -345,7 +345,6 @@ pub mod wayland;
 pub mod tooltip {
     use crate::Element;
 
-
     pub use iced::widget::tooltip::Position;
 
     pub type Tooltip<'a, Message> =

src/widget/settings/section.rs

@@ -20,9 +20,7 @@ pub fn section<'a, Message: 'static>() -> Section<'a, Message> {
 }
 
 /// A section with a pre-defined list column.
-pub fn with_column<Message: 'static>(
+pub fn with_column<Message: 'static>(children: ListColumn<'_, Message>) -> Section<'_, Message> {
-    children: ListColumn<'_, Message>,
-) -> Section<'_, Message> {
     Section {
         title: Cow::Borrowed(""),
         children,

src/widget/spin_button.rs

@@ -9,10 +9,10 @@ use crate::{
     Element,
 };
 use apply::Apply;
-use iced::{Border, Shadow};
 use iced::{Alignment, Length};
-use std::ops::{Add, Sub};
+use iced::{Border, Shadow};
 use std::borrow::Cow;
+use std::ops::{Add, Sub};
 
 /// Horizontal spin button widget.
 pub fn spin_button<'a, T, M>(
@@ -151,9 +151,7 @@ where
     }
 }
 
-fn horizontal_variant<T, Message>(
+fn horizontal_variant<T, Message>(spin_button: SpinButton<'_, T, Message>) -> Element<'_, Message>
-    spin_button: SpinButton<'_, T, Message>,
-) -> Element<'_, Message>
 where
     Message: Clone + 'static,
     T: Copy + Sub<Output = T> + Add<Output = T> + PartialOrd,

src/widget/wayland/tooltip/widget.rs

@@ -20,7 +20,6 @@ use iced_core::{
     Background, Clipboard, Color, Layout, Length, Padding, Point, Rectangle, Shell, Vector, Widget,
 };
 
-
 pub use super::{Catalog, Style};
 
 /// Internally defines different button widget variants.