From 1c54ddad29110c8d2b8d1fdbd898f3cfddf1db78 Mon Sep 17 00:00:00 2001 From: Eduardo Flores Date: Sat, 18 Jan 2025 11:36:41 +0100 Subject: [PATCH] chore: organize imports --- Cargo.lock | 1 - Cargo.toml | 2 -- src/app.rs | 59 +++++++++++++++++++++-------------- src/app/config.rs | 3 +- src/app/key_bind.rs | 8 +++-- src/app/localize.rs | 5 +-- src/app/markdown.rs | 4 +-- src/app/menu.rs | 6 ++-- src/app/settings.rs | 19 ++++++----- src/content.rs | 20 +++++++----- src/core/services/computer.rs | 2 +- src/details.rs | 24 +++++++++----- src/todo.rs | 15 +++++---- 13 files changed, 98 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1eef7ec..0deacf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5104,7 +5104,6 @@ dependencies = [ "libcosmic", "libset", "log", - "once_cell", "open", "paste", "ron", diff --git a/Cargo.toml b/Cargo.toml index cd34a55..e9a330d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,9 +4,7 @@ version = "0.1.1" edition = "2021" [dependencies] - i18n-embed-fl = "0.8" -once_cell = "1.19" rust-embed = "8" log = "0.4" env_logger = "0.11" diff --git a/src/app.rs b/src/app.rs index 7737e1f..d2c2411 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,33 +1,44 @@ -use std::any::TypeId; -use std::collections::{HashMap, VecDeque}; -use std::{env, process}; +use std::{ + any::TypeId, + collections::{HashMap, VecDeque}, + env, process, +}; -use crate::core::models::List; -use crate::core::models::Task; -use crate::core::service::{Provider, TaskService}; use chrono::{Local, NaiveDate}; use cli_clipboard::{ClipboardContext, ClipboardProvider}; -use cosmic::app::context_drawer::ContextDrawer; -use cosmic::app::{message, Core, Message as CosmicMessage}; -use cosmic::cosmic_config::Update; -use cosmic::cosmic_theme::ThemeMode; -use cosmic::iced::alignment::{Horizontal, Vertical}; -use cosmic::iced::keyboard::{Key, Modifiers}; -use cosmic::iced::{event, keyboard::Event as KeyEvent, window, Event, Length, Subscription}; -use cosmic::widget::about::About; -use cosmic::widget::menu::action::MenuAction; -use cosmic::widget::menu::key_bind::KeyBind; -use cosmic::widget::segmented_button::{Entity, EntityMut, SingleSelect}; -use cosmic::widget::{horizontal_space, scrollable, segmented_button}; use cosmic::{ - app, cosmic_config, cosmic_theme, executor, theme, widget, Application, ApplicationExt, Element, + app::{self, context_drawer::ContextDrawer, message, Core, Message as CosmicMessage}, + cosmic_config::{self, Update}, + cosmic_theme::{self, ThemeMode}, + executor, + iced::{ + alignment::{Horizontal, Vertical}, + event, + keyboard::{Event as KeyEvent, Key, Modifiers}, + window, Event, Length, Subscription, + }, + theme, + widget::{ + self, + about::About, + horizontal_space, + menu::{action::MenuAction, key_bind::KeyBind}, + scrollable, + segmented_button::{self, Entity, EntityMut, SingleSelect}, + }, + Application, ApplicationExt, Element, }; -use crate::app::config::CONFIG_VERSION; -use crate::app::key_bind::key_binds; -use crate::content::Content; -use crate::details::Details; -use crate::{content, details, fl, todo}; +use crate::{ + app::{config::CONFIG_VERSION, key_bind::key_binds}, + content::{self, Content}, + core::{ + models::{List, Task}, + service::{Provider, TaskService}, + }, + details::{self, Details}, + fl, todo, +}; pub mod config; pub mod icons; diff --git a/src/app/config.rs b/src/app/config.rs index bcda8dc..3f18dbd 100644 --- a/src/app/config.rs +++ b/src/app/config.rs @@ -1,10 +1,11 @@ -use crate::app::Tasks; use cosmic::{ cosmic_config::{self, cosmic_config_derive::CosmicConfigEntry, Config, CosmicConfigEntry}, theme, Application, }; use serde::{Deserialize, Serialize}; +use crate::app::Tasks; + pub const CONFIG_VERSION: u64 = 1; #[derive(Clone, Default, Debug, Eq, PartialEq, Deserialize, Serialize, CosmicConfigEntry)] diff --git a/src/app/key_bind.rs b/src/app/key_bind.rs index 2b6d166..cc51c2b 100644 --- a/src/app/key_bind.rs +++ b/src/app/key_bind.rs @@ -1,8 +1,10 @@ use std::collections::HashMap; -use cosmic::widget::menu::key_bind::KeyBind; -use cosmic::widget::menu::key_bind::Modifier; -use cosmic::{iced::keyboard::Key, iced_core::keyboard::key::Named}; +use cosmic::{ + iced::keyboard::Key, + iced_core::keyboard::key::Named, + widget::menu::key_bind::{KeyBind, Modifier}, +}; use crate::app::Action; diff --git a/src/app/localize.rs b/src/app/localize.rs index 569a6f4..5367cad 100644 --- a/src/app/localize.rs +++ b/src/app/localize.rs @@ -1,17 +1,18 @@ // SPDX-License-Identifier: GPL-3.0-only +use std::sync::LazyLock; + use i18n_embed::{ fluent::{fluent_language_loader, FluentLanguageLoader}, DefaultLocalizer, LanguageLoader, Localizer, }; -use once_cell::sync::Lazy; use rust_embed::RustEmbed; #[derive(RustEmbed)] #[folder = "i18n/"] struct Localizations; -pub static LANGUAGE_LOADER: Lazy = Lazy::new(|| { +pub static LANGUAGE_LOADER: LazyLock = LazyLock::new(|| { let loader: FluentLanguageLoader = fluent_language_loader!(); loader diff --git a/src/app/markdown.rs b/src/app/markdown.rs index 7c35e31..ee8bfa2 100644 --- a/src/app/markdown.rs +++ b/src/app/markdown.rs @@ -1,6 +1,4 @@ -use crate::core::models::List; -use crate::core::models::Status; -use crate::core::models::Task; +use crate::core::models::{List, Status, Task}; pub trait Markdown { fn markdown(&self) -> String; diff --git a/src/app/menu.rs b/src/app/menu.rs index d7110f5..6e2df57 100644 --- a/src/app/menu.rs +++ b/src/app/menu.rs @@ -2,19 +2,17 @@ use std::collections::HashMap; -use cosmic::widget::menu::key_bind::KeyBind; use cosmic::{ - widget::menu::{items, root, Item, ItemHeight, ItemWidth, MenuBar, Tree}, + widget::menu::{items, key_bind::KeyBind, root, Item, ItemHeight, ItemWidth, MenuBar, Tree}, Element, }; use crate::{ + app::icons, app::{Action, Message}, fl, }; -use super::icons; - pub fn menu_bar<'a>(key_binds: &HashMap) -> Element<'a, Message> { MenuBar::new(vec![ Tree::with_children( diff --git a/src/app/settings.rs b/src/app/settings.rs index 4db9ce4..32deff4 100644 --- a/src/app/settings.rs +++ b/src/app/settings.rs @@ -1,13 +1,16 @@ -use crate::app::icons::{IconCache, ICON_CACHE}; -use crate::app::Flags; -use cosmic::app::Settings; -use cosmic::iced::{Limits, Size}; -use cosmic::Application; +use cosmic::{ + app::Settings, + iced::{Limits, Size}, + Application, +}; use std::sync::Mutex; -use super::config::TasksConfig; -use super::localize::localize; -use super::Tasks; +use crate::app::{ + config::TasksConfig, + icons::{IconCache, ICON_CACHE}, + localize::localize, + Flags, Tasks, +}; pub fn init() { localize(); diff --git a/src/content.rs b/src/content.rs index be2e20c..4cff3e4 100644 --- a/src/content.rs +++ b/src/content.rs @@ -1,12 +1,18 @@ -use crate::app::icons; -use crate::core::models::{self, List, Status}; -use cosmic::iced::alignment::{Horizontal, Vertical}; -use cosmic::iced::{Alignment, Length, Subscription}; -use cosmic::iced_widget::row; -use cosmic::{theme, widget, Apply, Element}; +use cosmic::{ + iced::{ + alignment::{Horizontal, Vertical}, + Alignment, Length, Subscription, + }, + iced_widget::row, + theme, widget, Apply, Element, +}; use slotmap::{DefaultKey, SecondaryMap, SlotMap}; -use crate::fl; +use crate::{ + app::icons, + core::models::{self, List, Status}, + fl, +}; pub struct Content { list: Option, diff --git a/src/core/services/computer.rs b/src/core/services/computer.rs index db4e030..ac7ee94 100644 --- a/src/core/services/computer.rs +++ b/src/core/services/computer.rs @@ -6,7 +6,7 @@ use crate::{ Error, }; -use self::engine::ComputerStorageEngine; +use engine::ComputerStorageEngine; mod engine; diff --git a/src/details.rs b/src/details.rs index da9d8d1..e11a480 100644 --- a/src/details.rs +++ b/src/details.rs @@ -1,14 +1,22 @@ -use crate::app::icons; -use crate::core::models::{self, Priority, Status}; use chrono::{NaiveDate, TimeZone, Utc}; -use cosmic::iced::{Alignment, Length}; -use cosmic::iced_widget::row; -use cosmic::widget::segmented_button::Entity; -use cosmic::widget::{segmented_button, text_editor}; -use cosmic::{theme, widget, Element}; +use cosmic::{ + iced::{Alignment, Length}, + iced_widget::row, + theme, + widget::{ + self, + segmented_button::{self, Entity}, + text_editor, + }, + Element, +}; use slotmap::{DefaultKey, SecondaryMap, SlotMap}; -use crate::fl; +use crate::{ + app::icons, + core::models::{self, Priority, Status}, + fl, +}; pub struct Details { pub task: Option, diff --git a/src/todo.rs b/src/todo.rs index 5e0e5ba..587495d 100644 --- a/src/todo.rs +++ b/src/todo.rs @@ -1,9 +1,12 @@ -use crate::app::markdown::Markdown; -use crate::core::models::List; -use crate::core::models::Task; -use crate::core::service::TaskService; -use crate::core::TasksError; -use crate::Error; +use crate::{ + app::markdown::Markdown, + core::{ + models::{List, Task}, + service::TaskService, + TasksError, + }, + Error, +}; pub async fn update_list(list: List, service: TaskService) -> Result<(), Error> { if let Some(mut service) = service.get_service() {