From cab28345d7ef0f343af0fec1db8065790505d638 Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Thu, 21 Apr 2022 20:01:29 +0200 Subject: [PATCH] run cargo fmt on code --- src/main.rs | 4 +--- src/ui/app/update.rs | 16 +++++++++------- src/ui/components/mod.rs | 10 ++++++---- src/ui/components/toolbox_apps/mod.rs | 2 +- src/ui/components/toolbox_apps/model.rs | 5 ++--- src/ui/components/toolbox_apps/update.rs | 12 +++++++++--- src/ui/components/toolbox_apps/widgets.rs | 6 +----- src/ui/components/toolbox_settings/model.rs | 4 +--- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2e605dc..0d80142 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,5 @@ use relm4::{factory::FactoryVec, RelmApp}; -use ui::app::{ - model::{AppModel, ToolboxStatus, ToolboxContainer}, -}; +use ui::app::model::{AppModel, ToolboxContainer, ToolboxStatus}; mod ui; diff --git a/src/ui/app/update.rs b/src/ui/app/update.rs index e289fa2..002e711 100644 --- a/src/ui/app/update.rs +++ b/src/ui/app/update.rs @@ -1,8 +1,9 @@ use relm4::{AppUpdate, Sender}; -use crate::ui::components::{toolbox_settings::{ - messages::ToolboxSettingsDialogMsg, -}, toolbox_apps::messages::ToolboxAppDialogMsg, AppComponents}; +use crate::ui::components::{ + toolbox_apps::messages::ToolboxAppDialogMsg, + toolbox_settings::messages::ToolboxSettingsDialogMsg, AppComponents, +}; use super::{messages::AppMsg, model::AppModel}; @@ -14,11 +15,12 @@ impl AppUpdate for AppModel { .toolbox_settings_dialog .send(ToolboxSettingsDialogMsg::Show) .unwrap(); - }, + } AppMsg::ShowToolboxAppsRequest => { - components.toolbox_apps_dialog - .send(ToolboxAppDialogMsg::Show) - .unwrap(); + components + .toolbox_apps_dialog + .send(ToolboxAppDialogMsg::Show) + .unwrap(); } } true diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index 7c0aa91..b155c9b 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -1,15 +1,17 @@ -use relm4::Sender; use relm4::RelmComponent; +use relm4::Sender; -use self::{toolbox_settings::model::ToolboxSettingsDialogModel, toolbox_apps::model::ToolboxAppDialogModel}; +use self::{ + toolbox_apps::model::ToolboxAppDialogModel, toolbox_settings::model::ToolboxSettingsDialogModel, +}; use super::app::model::AppModel; -pub mod toolbox_settings; pub mod toolbox_apps; +pub mod toolbox_settings; #[derive(relm4::Components)] pub struct AppComponents { pub toolbox_settings_dialog: RelmComponent, pub toolbox_apps_dialog: RelmComponent, -} \ No newline at end of file +} diff --git a/src/ui/components/toolbox_apps/mod.rs b/src/ui/components/toolbox_apps/mod.rs index 888ab79..cfdc5b2 100644 --- a/src/ui/components/toolbox_apps/mod.rs +++ b/src/ui/components/toolbox_apps/mod.rs @@ -1,5 +1,5 @@ +pub mod factory; pub mod messages; pub mod model; pub mod update; pub mod widgets; -pub mod factory; diff --git a/src/ui/components/toolbox_apps/model.rs b/src/ui/components/toolbox_apps/model.rs index 0ae936a..2b3efe6 100644 --- a/src/ui/components/toolbox_apps/model.rs +++ b/src/ui/components/toolbox_apps/model.rs @@ -1,7 +1,6 @@ -use relm4::{Model, factory::{FactoryVec}}; +use relm4::{factory::FactoryVec, Model}; - -use super::{messages::ToolboxAppDialogMsg, widgets::{ToolboxAppDialogWidgets}}; +use super::{messages::ToolboxAppDialogMsg, widgets::ToolboxAppDialogWidgets}; #[derive(Default)] pub struct DotDesktopApplication { diff --git a/src/ui/components/toolbox_apps/update.rs b/src/ui/components/toolbox_apps/update.rs index 8cf46ea..e74a7b9 100644 --- a/src/ui/components/toolbox_apps/update.rs +++ b/src/ui/components/toolbox_apps/update.rs @@ -1,8 +1,11 @@ -use relm4::{ComponentUpdate, Sender, factory::FactoryVec}; +use relm4::{factory::FactoryVec, ComponentUpdate, Sender}; use crate::ui::app::{messages::AppMsg, model::AppModel}; -use super::{messages::ToolboxAppDialogMsg, model::{ToolboxAppDialogModel, DotDesktopApplication}}; +use super::{ + messages::ToolboxAppDialogMsg, + model::{DotDesktopApplication, ToolboxAppDialogModel}, +}; impl ComponentUpdate for ToolboxAppDialogModel { fn init_model(_parent_model: &AppModel) -> Self { @@ -27,7 +30,10 @@ impl ComponentUpdate for ToolboxAppDialogModel { selected: false, icon_path: "".to_string(), }); - ToolboxAppDialogModel { hidden: true, apps: factory_vec } + ToolboxAppDialogModel { + hidden: true, + apps: factory_vec, + } } fn update( diff --git a/src/ui/components/toolbox_apps/widgets.rs b/src/ui/components/toolbox_apps/widgets.rs index 6ebeed1..322312a 100644 --- a/src/ui/components/toolbox_apps/widgets.rs +++ b/src/ui/components/toolbox_apps/widgets.rs @@ -13,8 +13,6 @@ use relm4::Widgets; use gtk::prelude::*; - - use crate::ui::app::model::AppModel; use crate::ui::components::toolbox_apps::messages::ToolboxAppDialogMsg; @@ -25,8 +23,6 @@ pub struct AppFactoryWidgets { pub app_box: gtk::Box, } - - #[relm4::widget(pub)] impl Widgets for ToolboxAppDialogWidgets { view! { @@ -59,7 +55,7 @@ impl Widgets for ToolboxAppDialogWidgets { factory!(model.apps), } } - + } } } diff --git a/src/ui/components/toolbox_settings/model.rs b/src/ui/components/toolbox_settings/model.rs index 2927fb6..e0f07be 100644 --- a/src/ui/components/toolbox_settings/model.rs +++ b/src/ui/components/toolbox_settings/model.rs @@ -1,9 +1,7 @@ -use relm4::{Model}; - +use relm4::Model; use super::{messages::ToolboxSettingsDialogMsg, widgets::ToolboxSettingsDialogWidgets}; - pub struct ToolboxSettingsDialogModel { pub hidden: bool, }