improv: Adjust use formatting

Author: ids1024

src/application/key.rs

@@ -1,9 +1,11 @@
 use std::cell::RefCell;
 
-use crate::color::Rgb;
-use super::page::Page;
-use super::picker::SCANCODE_LABELS;
-use super::rect::Rect;
+use crate::Rgb;
+use super::{
+    Page,
+    Rect,
+    SCANCODE_LABELS,
+};
 
 #[derive(Clone, Debug)]
 pub struct Key {

src/application/keyboard.rs

@@ -20,15 +20,19 @@ use std::{
     str,
 };
 
-use crate::daemon::DaemonBoard;
-use crate::keyboard_color_button::KeyboardColorButton;
-use crate::keymap::KeyMap;
-use super::error_dialog::error_dialog;
-use super::key::Key;
-use super::keyboard_layer::KeyboardLayer;
-use super::layout::Layout;
-use super::page::Page;
-use super::picker::Picker;
+use crate::{
+    DaemonBoard,
+    KeyboardColorButton,
+    KeyMap,
+};
+use super::{
+    error_dialog,
+    Key,
+    KeyboardLayer,
+    Layout,
+    Page,
+    Picker,
+};
 
 #[derive(Default, gtk::CompositeTemplate)]
 pub struct KeyboardInner {

src/application/keyboard_layer.rs

@@ -10,9 +10,8 @@ use std::{
 };
 use once_cell::unsync::OnceCell;
 
-use crate::color::Rgb;
-use super::key::Key;
-use super::page::Page;
+use crate::Rgb;
+use super::{Key, Page};
 
 const SCALE: f64 = 64.0;
 const MARGIN: f64 = 2.;

src/application/layout/mod.rs

@@ -5,10 +5,8 @@ use std::collections::HashMap;
 mod physical_layout;
 pub(super) use physical_layout::PhysicalLayout;
 
-use crate::color::Rgb;
-use crate::keymap::KeyMap;
-use super::key::Key;
-use super::rect::Rect;
+use crate::{KeyMap, Rgb};
+use super::{Key, Rect};
 use physical_layout::{PhysicalKeyEnum, PhysicalLayoutEntry};
 
 pub(super) struct Layout {

src/application/main_window.rs

@@ -4,10 +4,18 @@ use gtk::subclass::prelude::*;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::rc::Rc;
 
-use crate::daemon::{Daemon, DaemonBoard, DaemonClient, DaemonDummy, DaemonServer};
-use super::keyboard::Keyboard;
-use super::picker::Picker;
-use super::shortcuts_window::shortcuts_window;
+use crate::{
+    Daemon,
+    DaemonBoard,
+    DaemonClient,
+    DaemonDummy,
+    DaemonServer,
+};
+use super::{
+    Keyboard,
+    Picker,
+    shortcuts_window,
+};
 
 #[derive(Default, gtk::CompositeTemplate)]
 pub struct MainWindowInner {

src/application/mod.rs

@@ -1,13 +1,9 @@
 use cascade::cascade;
-use gio::prelude::*;
 use glib::subclass;
-use glib::subclass::prelude::*;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use once_cell::unsync::OnceCell;
 
-use main_window::MainWindow;
-
 mod about_dialog;
 mod error_dialog;
 mod key;
@@ -20,6 +16,19 @@ mod picker;
 mod rect;
 mod shortcuts_window;
 
+use self::{
+    error_dialog::*,
+    key::*,
+    keyboard::*,
+    keyboard_layer::*,
+    layout::*,
+    main_window::*,
+    page::*,
+    picker::*,
+    rect::*,
+    shortcuts_window::*,
+};
+
 pub struct ConfiguratorAppInner {
     phony_board_names: OnceCell<Vec<String>>,
 }

src/application/picker/mod.rs

@@ -1,8 +1,6 @@
-use super::keyboard::Keyboard;
 use cascade::cascade;
 use glib::clone;
 use glib::subclass;
-use glib::subclass::prelude::*;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use once_cell::sync::Lazy;
@@ -12,6 +10,8 @@ use std::{
     rc::Rc,
 };
 
+use super::Keyboard;
+
 mod picker_group;
 mod picker_json;
 mod picker_key;

src/application/picker/picker_group.rs

@@ -2,7 +2,7 @@ use cascade::cascade;
 use gtk::prelude::*;
 use std::rc::Rc;
 
-use super::picker_key::PickerKey;
+use super::PickerKey;
 
 pub(super) struct PickerGroup {
     /// Number of keys to show in each row

src/daemon/board.rs

@@ -1,6 +1,6 @@
 use std::rc::Rc;
 
-use crate::color::Rgb;
+use crate::Rgb;
 use super::Daemon;
 
 #[derive(Clone, glib::GBoxed)]

src/daemon/dummy.rs

@@ -6,7 +6,7 @@ use std::{
     collections::HashMap,
 };
 
-use crate::color::Rgb;
+use crate::Rgb;
 use super::Daemon;
 
 #[derive(Default)]