chore: merge imports

cosmic-applet-audio/src/config.rs

@@ -1,8 +1,7 @@
 // Copyright 2023 System76 <info@system76.com>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use cosmic::cosmic_config::cosmic_config_derive::CosmicConfigEntry;
-use cosmic::cosmic_config::{self, CosmicConfigEntry};
+use cosmic::cosmic_config::{self, cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, CosmicConfigEntry, PartialEq, Eq)]

cosmic-applet-audio/src/lib.rs

@@ -4,43 +4,36 @@
 mod localize;
 mod mouse_area;
 
-use crate::localize::localize;
-use crate::pulse::DeviceInfo;
+use crate::{localize::localize, pulse::DeviceInfo};
 use config::AudioAppletConfig;
-use cosmic::app::Command;
-use cosmic::applet::cosmic_panel_config::PanelAnchor;
-use cosmic::applet::menu_button;
-use cosmic::applet::menu_control_padding;
-use cosmic::applet::padded_control;
-use cosmic::applet::token::subscription::{
-    activation_token_subscription, TokenRequest, TokenUpdate,
+use cosmic::{
+    app::Command,
+    applet::{
+        cosmic_panel_config::PanelAnchor,
+        menu_button, menu_control_padding, padded_control,
+        token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate},
+    },
+    cctk::sctk::reexports::calloop,
+    cosmic_config::CosmicConfigEntry,
+    iced::{
+        self, widget,
+        widget::{column, row, slider, text},
+        window, Alignment, Length, Limits, Subscription,
+    },
+    iced_runtime::core::alignment::Horizontal,
+    iced_style::application,
+    widget::{button, divider, horizontal_space, icon, Column, Row},
+    Element, Renderer, Theme,
 };
-use cosmic::cctk::sctk::reexports::calloop;
-use cosmic::cosmic_config::CosmicConfigEntry;
-use cosmic::iced::widget;
-use cosmic::iced::Limits;
-use cosmic::iced::{
-    self,
-    widget::{column, row, slider, text},
-    window, Alignment, Length, Subscription,
-};
-use cosmic::iced_runtime::core::alignment::Horizontal;
-use cosmic::iced_style::application;
-use cosmic::widget::button;
-use cosmic::widget::horizontal_space;
-use cosmic::widget::Column;
-use cosmic::widget::Row;
-use cosmic::widget::{divider, icon};
-use cosmic::Renderer;
-use cosmic::{Element, Theme};
 use cosmic_settings_subscriptions::pulse as sub_pulse;
 use cosmic_time::{anim, chain, id, once_cell::sync::Lazy, Instant, Timeline};
-use iced::wayland::popup::{destroy_popup, get_popup};
-use iced::widget::container;
+use iced::{
+    wayland::popup::{destroy_popup, get_popup},
+    widget::container,
+};
 use libpulse_binding::volume::Volume;
 use mpris2_zbus::player::PlaybackStatus;
-use mpris_subscription::MprisRequest;
-use mpris_subscription::MprisUpdate;
+use mpris_subscription::{MprisRequest, MprisUpdate};
 
 mod config;
 mod mpris_subscription;

cosmic-applet-audio/src/mouse_area.rs

@@ -1,16 +1,13 @@
 //! A container for capturing mouse events.
 
-use cosmic::iced_renderer::core::widget::OperationOutputWrapper;
-use cosmic::iced_renderer::core::Point;
+use cosmic::iced_renderer::core::{widget::OperationOutputWrapper, Point};
 
-use cosmic::iced_core::event::{self, Event};
-use cosmic::iced_core::layout;
-use cosmic::iced_core::mouse;
-use cosmic::iced_core::overlay;
-use cosmic::iced_core::renderer;
-use cosmic::iced_core::touch;
-use cosmic::iced_core::widget::{tree, Operation, Tree};
-use cosmic::iced_core::{Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget};
+use cosmic::iced_core::{
+    event::{self, Event},
+    layout, mouse, overlay, renderer, touch,
+    widget::{tree, Operation, Tree},
+    Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget,
+};
 
 /// Emit messages on mouse events.
 #[allow(missing_debug_implementations)]

cosmic-applet-audio/src/pulse.rs

@@ -1,13 +1,14 @@
 // Copyright 2023 System76 <info@system76.com>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::cell::RefCell;
-use std::{rc::Rc, thread};
+use std::{cell::RefCell, rc::Rc, thread};
 
 extern crate libpulse_binding as pulse;
 
-use cosmic::iced::{self, subscription};
-use cosmic::iced_futures::futures::{self, SinkExt};
+use cosmic::{
+    iced::{self, subscription},
+    iced_futures::futures::{self, SinkExt},
+};
 use cosmic_time::once_cell::sync::Lazy;
 
 use libpulse_binding::{