Make module dependencies explicit across the workspace

shell/ferese-settings/src/main.rs

@@ -9,7 +9,7 @@ mod panel_inspector;
 mod panel_preview;
 mod theme_controls;
 
-use theme_controls::*;
+use theme_controls::gallery_id;
 
 mod displays;
 mod displays_ui;
@@ -1309,7 +1309,9 @@ mod tests {
         app.page = Page::Bar;
         let edit = panel_controls::initialize(&app.draft).unwrap();
         app.draft.edit(&edit).unwrap();
-        use cosmic::iced::advanced::{layout, renderer::Headless, widget::Tree};
+        use cosmic::iced::advanced::layout;
+        use cosmic::iced::advanced::renderer::Headless;
+        use cosmic::iced::advanced::widget::Tree;
         use cosmic::iced::{Font, Pixels, Size};
         let runtime = tokio::runtime::Builder::new_current_thread()
             .enable_all()
@@ -1537,7 +1539,9 @@ mod tests {
             .enable_all()
             .build()
             .unwrap();
-        use cosmic::iced::advanced::{layout, renderer::Headless, widget::Tree};
+        use cosmic::iced::advanced::layout;
+        use cosmic::iced::advanced::renderer::Headless;
+        use cosmic::iced::advanced::widget::Tree;
         use cosmic::iced::{Font, Pixels, Size};
         let renderer = runtime
             .block_on(<cosmic::Renderer as Headless>::new(
@@ -1722,9 +1726,8 @@ mod tests {
     #[ignore = "release scroll/render sample; requires both renderer backends"]
     fn profile_dense_pages_on_both_renderers() {
         use cosmic::iced::advanced::renderer::{Headless, Renderer as _};
-        use cosmic::iced::advanced::{
-            Layout, Shell, clipboard, layout, mouse, renderer, widget::Tree,
-        };
+        use cosmic::iced::advanced::widget::Tree;
+        use cosmic::iced::advanced::{Layout, Shell, clipboard, layout, mouse, renderer};
         use cosmic::iced::{Color, Event, Font, Pixels, Point, Rectangle, Size};
         let runtime = tokio::runtime::Builder::new_current_thread()
             .enable_all()

shell/ferese-settings/src/panel_controls.rs

@@ -1,7 +1,8 @@
 use ferese_panel::{Edge, ItemKind, Panel};
 
 use crate::panel_edit::{Action, Destination, Zone};
-use crate::{App, Element, Message, schema::Page, store, widget};
+use crate::schema::Page;
+use crate::{App, Element, Message, store, widget};
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub(super) enum PanelPage {
@@ -1036,7 +1037,8 @@ mod tests {
     #[test]
     fn editor_zones_wrap_without_putting_groups_outside_the_available_width() {
         use cosmic::Application;
-        use cosmic::iced::advanced::{Layout, layout, renderer::Headless, widget as advanced};
+        use cosmic::iced::advanced::renderer::Headless;
+        use cosmic::iced::advanced::{Layout, layout, widget as advanced};
         use cosmic::iced::{Font, Pixels, Rectangle, Size};
         struct Bounds {
             ids: Vec<advanced::Id>,

shell/ferese-settings/src/panel_drag.rs

@@ -455,7 +455,8 @@ impl Widget<Message, Theme, Renderer> for Editor<'_> {
 mod tests {
     use super::*;
     use crate::store::{Snapshot, set};
-    use cosmic::iced::advanced::{clipboard, renderer::Headless};
+    use cosmic::iced::advanced::clipboard;
+    use cosmic::iced::advanced::renderer::Headless;
     use cosmic::iced::{Font, Pixels};
     use cosmic::widget::{button, column, container, row, text};
 

shell/ferese-settings/src/panel_preview.rs

@@ -522,9 +522,8 @@ fn preview_button(palette: visuals::Palette, selected: bool) -> cosmic::theme::B
 mod tests {
     use super::*;
     use cosmic::Application;
-    use cosmic::iced::advanced::{
-        Layout, Shell, clipboard, layout, mouse, renderer::Headless, widget,
-    };
+    use cosmic::iced::advanced::renderer::Headless;
+    use cosmic::iced::advanced::{Layout, Shell, clipboard, layout, mouse, widget};
     use cosmic::iced::{Event, Font, Pixels, Point, Rectangle, Size};
 
     #[test]

shell/ferese-settings/src/wallpaper_controls.rs

@@ -488,8 +488,9 @@ mod tests {
     #[test]
     fn preview_slots_keep_their_size_while_loading_and_on_failure() {
         use cosmic::Application;
+        use cosmic::iced::advanced::layout;
         use cosmic::iced::advanced::renderer::Headless;
-        use cosmic::iced::advanced::{layout, widget::Tree};
+        use cosmic::iced::advanced::widget::Tree;
         use cosmic::iced::{Font, Pixels, Size};
 
         let runtime = tokio::runtime::Builder::new_current_thread()
@@ -565,7 +566,8 @@ mod tests {
     fn render_preview_pages_on_both_backends() {
         use cosmic::Application;
         use cosmic::iced::advanced::renderer::{Headless, Renderer as _};
-        use cosmic::iced::advanced::{Layout, layout, mouse, renderer, widget::Tree};
+        use cosmic::iced::advanced::widget::Tree;
+        use cosmic::iced::advanced::{Layout, layout, mouse, renderer};
         use cosmic::iced::{Color, Font, Pixels, Rectangle, Size};
 
         let runtime = tokio::runtime::Builder::new_current_thread()