From cc7df23f39d59ea1a87b012e4bc9346f66e37eb0 Mon Sep 17 00:00:00 2001 From: yggverse Date: Sun, 16 Mar 2025 21:56:18 +0200 Subject: [PATCH] apply new fmt version --- src/app/browser.rs | 6 +++--- src/app/browser/action.rs | 2 +- src/app/browser/window.rs | 2 +- src/app/browser/window/action.rs | 2 +- src/app/browser/window/action/append.rs | 2 +- src/app/browser/window/action/load.rs | 2 +- src/app/browser/window/action/open.rs | 2 +- src/app/browser/window/header/bar.rs | 2 +- src/app/browser/window/header/bar/menu.rs | 2 +- .../browser/window/header/bar/tab/append.rs | 2 +- src/app/browser/window/tab.rs | 2 +- src/app/browser/window/tab/action.rs | 2 +- src/app/browser/window/tab/item.rs | 2 +- .../tab/item/action/history/memory/cursor.rs | 18 +++--------------- src/app/browser/window/tab/item/action/load.rs | 2 +- .../window/tab/item/client/driver/gemini.rs | 2 +- .../browser/window/tab/item/page/content.rs | 2 +- .../window/tab/item/page/content/directory.rs | 5 ++--- .../tab/item/page/content/directory/column.rs | 4 ++-- .../window/tab/item/page/content/image.rs | 2 +- .../tab/item/page/content/status/download.rs | 2 +- .../content/status/download/action/cancel.rs | 2 +- .../content/status/download/action/complete.rs | 2 +- .../content/status/download/action/update.rs | 2 +- .../page/content/status/download/cancel.rs | 2 +- .../page/content/status/download/choose.rs | 2 +- .../item/page/content/status/download/open.rs | 2 +- .../page/content/status/download/progress.rs | 2 +- .../page/content/status/download/status.rs | 2 +- .../tab/item/page/content/status/identity.rs | 2 +- .../tab/item/page/content/status/loading.rs | 4 ++-- .../tab/item/page/content/status/mime.rs | 2 +- .../window/tab/item/page/content/text.rs | 4 ++-- .../tab/item/page/content/text/gemini.rs | 4 ++-- .../tab/item/page/content/text/gemini/ansi.rs | 2 +- .../item/page/content/text/gemini/gutter.rs | 4 ++-- .../tab/item/page/content/text/gemini/icon.rs | 2 +- .../item/page/content/text/gemini/syntax.rs | 2 +- src/app/browser/window/tab/item/page/input.rs | 2 +- .../window/tab/item/page/input/response.rs | 11 ++++++----- .../tab/item/page/input/response/control.rs | 2 +- .../page/input/response/control/counter.rs | 2 +- .../item/page/input/response/control/send.rs | 2 +- .../tab/item/page/input/response/form.rs | 2 +- .../window/tab/item/page/input/sensitive.rs | 6 +++--- .../tab/item/page/input/sensitive/form.rs | 2 +- .../window/tab/item/page/input/titan.rs | 8 ++++---- .../tab/item/page/input/titan/control.rs | 2 +- .../item/page/input/titan/control/upload.rs | 2 +- .../window/tab/item/page/input/titan/file.rs | 4 ++-- .../window/tab/item/page/input/titan/header.rs | 4 ++-- .../tab/item/page/input/titan/header/form.rs | 8 ++------ .../window/tab/item/page/input/titan/text.rs | 2 +- .../tab/item/page/input/titan/text/form.rs | 2 +- .../browser/window/tab/item/page/navigation.rs | 2 +- .../tab/item/page/navigation/bookmark.rs | 2 +- .../window/tab/item/page/navigation/history.rs | 2 +- .../tab/item/page/navigation/history/back.rs | 2 +- .../item/page/navigation/history/forward.rs | 2 +- .../window/tab/item/page/navigation/home.rs | 2 +- .../window/tab/item/page/navigation/reload.rs | 2 +- .../window/tab/item/page/navigation/request.rs | 6 +++--- .../page/navigation/request/identity/common.rs | 4 ++-- .../navigation/request/identity/common/form.rs | 4 ++-- .../request/identity/common/form/drop.rs | 6 +++--- .../request/identity/common/form/exit.rs | 8 ++++---- .../request/identity/common/form/file.rs | 6 +++--- .../request/identity/common/form/list.rs | 4 ++-- .../request/identity/common/form/name.rs | 2 +- .../request/identity/common/form/save.rs | 8 ++++---- .../identity/common/form/save/certificate.rs | 2 +- .../tab/item/page/navigation/request/search.rs | 4 ++-- .../page/navigation/request/search/form.rs | 2 +- .../navigation/request/search/form/drop.rs | 6 +++--- .../navigation/request/search/form/list.rs | 4 ++-- .../navigation/request/search/form/query.rs | 2 +- .../item/page/navigation/request/suggestion.rs | 8 ++++---- src/app/browser/window/tab/item/page/search.rs | 2 +- .../window/tab/item/page/search/form.rs | 2 +- .../window/tab/item/page/search/form/input.rs | 2 +- .../tab/item/page/search/form/navigation.rs | 2 +- .../item/page/search/form/navigation/back.rs | 2 +- .../page/search/form/navigation/forward.rs | 2 +- .../window/tab/item/page/search/form/result.rs | 2 +- .../window/tab/item/page/search/placeholder.rs | 2 +- .../window/tab/item/page/search/subject.rs | 2 +- .../item/page/search/subject/tag/current.rs | 2 +- .../tab/item/page/search/subject/tag/found.rs | 2 +- src/profile.rs | 2 +- src/profile/history/database.rs | 2 +- src/profile/identity.rs | 2 +- src/profile/identity/auth/memory.rs | 2 +- src/profile/identity/item.rs | 2 +- src/profile/identity/memory.rs | 2 +- 94 files changed, 139 insertions(+), 155 deletions(-) diff --git a/src/app/browser.rs b/src/app/browser.rs index de813393..fa22eb90 100644 --- a/src/app/browser.rs +++ b/src/app/browser.rs @@ -10,12 +10,12 @@ use widget::Widget; use window::Window; use crate::Profile; -use adw::{prelude::AdwDialogExt, AboutDialog, Application}; +use adw::{AboutDialog, Application, prelude::AdwDialogExt}; use anyhow::Result; use gtk::{ + FileLauncher, gio::{Cancellable, File}, prelude::GtkWindowExt, - FileLauncher, }; use sqlite::Transaction; use std::{rc::Rc, sync::Arc}; @@ -146,7 +146,7 @@ impl Browser { pub fn init(&self, application: Option<&Application>) -> &Self { // Assign browser window to this application self.widget.application_window.set_application(application); // @TODO - // Init main window + // Init main window self.window.init(); self } diff --git a/src/app/browser/action.rs b/src/app/browser/action.rs index 2e116523..a26e047d 100644 --- a/src/app/browser/action.rs +++ b/src/app/browser/action.rs @@ -12,7 +12,7 @@ use profile::Profile; use gtk::{ gio::{SimpleAction, SimpleActionGroup}, - glib::{uuid_string_random, GString}, + glib::{GString, uuid_string_random}, prelude::ActionMapExt, }; use std::rc::Rc; diff --git a/src/app/browser/window.rs b/src/app/browser/window.rs index 985a1a81..fa5f306f 100644 --- a/src/app/browser/window.rs +++ b/src/app/browser/window.rs @@ -8,7 +8,7 @@ use crate::Profile; use action::{Action, Position}; use adw::ToolbarView; use anyhow::Result; -use gtk::{prelude::BoxExt, Box, Orientation}; +use gtk::{Box, Orientation, prelude::BoxExt}; use header::Header; use sqlite::Transaction; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/action.rs b/src/app/browser/window/action.rs index 0ec2f340..67e43332 100644 --- a/src/app/browser/window/action.rs +++ b/src/app/browser/window/action.rs @@ -30,7 +30,7 @@ use source::Source; use gtk::{ gio::SimpleActionGroup, - glib::{uuid_string_random, GString}, + glib::{GString, uuid_string_random}, prelude::ActionMapExt, }; use std::rc::Rc; diff --git a/src/app/browser/window/action/append.rs b/src/app/browser/window/action/append.rs index 66d1bc9d..7d05c73b 100644 --- a/src/app/browser/window/action/append.rs +++ b/src/app/browser/window/action/append.rs @@ -1,6 +1,6 @@ use gtk::{ gio::SimpleAction, - glib::{uuid_string_random, Variant}, + glib::{Variant, uuid_string_random}, prelude::{ActionExt, ToVariant}, }; diff --git a/src/app/browser/window/action/load.rs b/src/app/browser/window/action/load.rs index 64a452c5..1ba507c3 100644 --- a/src/app/browser/window/action/load.rs +++ b/src/app/browser/window/action/load.rs @@ -2,7 +2,7 @@ use gtk::{ gio::SimpleAction, - glib::{uuid_string_random, SignalHandlerId}, + glib::{SignalHandlerId, uuid_string_random}, prelude::StaticVariantType, }; diff --git a/src/app/browser/window/action/open.rs b/src/app/browser/window/action/open.rs index 0888f557..b142377f 100644 --- a/src/app/browser/window/action/open.rs +++ b/src/app/browser/window/action/open.rs @@ -55,7 +55,7 @@ impl Open { /// Formatted action connector for external implementation pub fn on_activate(&self, callback: impl Fn(Option, &str) + 'static) -> SignalHandlerId { - use gtk::{prelude::FileExt, FileDialog, Window}; + use gtk::{FileDialog, Window, prelude::FileExt}; use std::rc::Rc; let cancellable = self.cancellable(); diff --git a/src/app/browser/window/header/bar.rs b/src/app/browser/window/header/bar.rs index 6badb1a4..927cc6cb 100644 --- a/src/app/browser/window/header/bar.rs +++ b/src/app/browser/window/header/bar.rs @@ -8,7 +8,7 @@ use tab::Tab; use super::{BrowserAction, Profile, WindowAction}; use adw::{TabBar, TabView}; -use gtk::{prelude::BoxExt, Box, MenuButton, Orientation}; +use gtk::{Box, MenuButton, Orientation, prelude::BoxExt}; use std::{rc::Rc, sync::Arc}; pub trait Bar { diff --git a/src/app/browser/window/header/bar/menu.rs b/src/app/browser/window/header/bar/menu.rs index a14b7af3..f19574a0 100644 --- a/src/app/browser/window/header/bar/menu.rs +++ b/src/app/browser/window/header/bar/menu.rs @@ -1,9 +1,9 @@ use super::{BrowserAction, Profile, WindowAction}; use gtk::{ + Align, MenuButton, gio::{self}, glib::{GString, Uri, UriFlags}, prelude::{ActionExt, ToVariant}, - Align, MenuButton, }; use indexmap::IndexMap; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/header/bar/tab/append.rs b/src/app/browser/window/header/bar/tab/append.rs index 1562c924..7ec405b2 100644 --- a/src/app/browser/window/header/bar/tab/append.rs +++ b/src/app/browser/window/header/bar/tab/append.rs @@ -1,5 +1,5 @@ use super::WindowAction; -use gtk::{prelude::ButtonExt, Align, Button}; +use gtk::{Align, Button, prelude::ButtonExt}; use std::rc::Rc; pub trait Append { diff --git a/src/app/browser/window/tab.rs b/src/app/browser/window/tab.rs index 41431af6..400fe9d3 100644 --- a/src/app/browser/window/tab.rs +++ b/src/app/browser/window/tab.rs @@ -8,7 +8,7 @@ use crate::Profile; use action::Action; use adw::{TabPage, TabView}; use anyhow::Result; -use gtk::{gio::Icon, glib::Propagation, prelude::ActionExt, Box, Orientation}; +use gtk::{Box, Orientation, gio::Icon, glib::Propagation, prelude::ActionExt}; pub use item::Item; use menu::Menu; use sourceview::prelude::IsA; diff --git a/src/app/browser/window/tab/action.rs b/src/app/browser/window/tab/action.rs index 20c76f4b..fc31e4d5 100644 --- a/src/app/browser/window/tab/action.rs +++ b/src/app/browser/window/tab/action.rs @@ -1,6 +1,6 @@ use gtk::{ gio::SimpleActionGroup, - glib::{uuid_string_random, GString}, + glib::{GString, uuid_string_random}, }; /// [SimpleActionGroup](https://docs.gtk.org/gio/class.SimpleActionGroup.html) wrapper for `Tab` actions diff --git a/src/app/browser/window/tab/item.rs b/src/app/browser/window/tab/item.rs index 8d8c2cba..71b90d74 100644 --- a/src/app/browser/window/tab/item.rs +++ b/src/app/browser/window/tab/item.rs @@ -10,8 +10,8 @@ use adw::TabPage; use anyhow::Result; use client::Client; use gtk::{ - prelude::{ActionExt, ActionMapExt, BoxExt}, Box, + prelude::{ActionExt, ActionMapExt, BoxExt}, }; use page::Page; use sqlite::Transaction; diff --git a/src/app/browser/window/tab/item/action/history/memory/cursor.rs b/src/app/browser/window/tab/item/action/history/memory/cursor.rs index e734e8be..8a5255dd 100644 --- a/src/app/browser/window/tab/item/action/history/memory/cursor.rs +++ b/src/app/browser/window/tab/item/action/history/memory/cursor.rs @@ -36,31 +36,19 @@ impl Cursor { let i = len2i(len)?; let n = self.0.unwrap_or_default(); - if n < i { - Some(n + 1) - } else { - None - } + if n < i { Some(n + 1) } else { None } } pub fn back(&self, len: usize) -> Option { len2i(len)?; let n = self.0.unwrap_or_default(); - if n > 0 { - Some(n - 1) - } else { - None - } + if n > 0 { Some(n - 1) } else { None } } } // Tools fn len2i(len: usize) -> Option { - if len > 0 { - Some(len - 1) - } else { - None - } + if len > 0 { Some(len - 1) } else { None } } diff --git a/src/app/browser/window/tab/item/action/load.rs b/src/app/browser/window/tab/item/action/load.rs index e11da482..bb39158d 100644 --- a/src/app/browser/window/tab/item/action/load.rs +++ b/src/app/browser/window/tab/item/action/load.rs @@ -1,6 +1,6 @@ use gtk::{ gio::SimpleAction, - glib::{uuid_string_random, GString}, + glib::{GString, uuid_string_random}, prelude::{ActionExt, StaticVariantType, ToVariant}, }; diff --git a/src/app/browser/window/tab/item/client/driver/gemini.rs b/src/app/browser/window/tab/item/client/driver/gemini.rs index 19ba0010..f027dcf9 100644 --- a/src/app/browser/window/tab/item/client/driver/gemini.rs +++ b/src/app/browser/window/tab/item/client/driver/gemini.rs @@ -1,7 +1,7 @@ use super::{Feature, Page}; use ggemini::client::connection::response::{ - failure::{Permanent, Temporary}, Certificate, Failure, Input, Redirect, + failure::{Permanent, Temporary}, }; use ggemini::{ client::{Client, Request, Response}, diff --git a/src/app/browser/window/tab/item/page/content.rs b/src/app/browser/window/tab/item/page/content.rs index 44fd1517..54da98b1 100644 --- a/src/app/browser/window/tab/item/page/content.rs +++ b/src/app/browser/window/tab/item/page/content.rs @@ -10,11 +10,11 @@ use text::Text; use super::{ItemAction, TabAction, WindowAction}; use adw::StatusPage; use gtk::{ + Box, Orientation, gdk::Paintable, gio::{Cancellable, File}, glib::Uri, prelude::{BoxExt, IsA, WidgetExt}, - Box, Orientation, }; use std::{rc::Rc, time::Duration}; diff --git a/src/app/browser/window/tab/item/page/content/directory.rs b/src/app/browser/window/tab/item/page/content/directory.rs index d90f604b..c13eb565 100644 --- a/src/app/browser/window/tab/item/page/content/directory.rs +++ b/src/app/browser/window/tab/item/page/content/directory.rs @@ -1,6 +1,6 @@ mod column; -use gtk::{gio::File, ScrolledWindow}; +use gtk::{ScrolledWindow, gio::File}; pub struct Directory; // @TODO save settings @@ -15,8 +15,7 @@ impl Directory { use gtk::gio::FileInfo; // Init model - const ATTRIBUTES: &str = - "standard::type,standard::display-name,standard::symbolic-icon,standard::size,standard::content-type,time::modified,time::created,time::access"; + const ATTRIBUTES: &str = "standard::type,standard::display-name,standard::symbolic-icon,standard::size,standard::content-type,time::modified,time::created,time::access"; let directory_list = gtk::DirectoryList::builder() .file(file) diff --git a/src/app/browser/window/tab/item/page/content/directory/column.rs b/src/app/browser/window/tab/item/page/content/directory/column.rs index 4b6c24ae..f3ef8a7e 100644 --- a/src/app/browser/window/tab/item/page/content/directory/column.rs +++ b/src/app/browser/window/tab/item/page/content/directory/column.rs @@ -5,9 +5,9 @@ use display::Display; use format::Format; use gtk::{ + ColumnViewColumn, Label, ListItem, SignalListItemFactory, gio::{File, FileInfo, FileQueryInfoFlags}, glib::{GString, Priority}, - ColumnViewColumn, Label, ListItem, SignalListItemFactory, }; pub trait Column { @@ -23,9 +23,9 @@ pub trait Column { impl Column for ColumnViewColumn { fn icon() -> Self { use gtk::{ + Align, ColumnViewColumn, ListItem, SignalListItemFactory, gio::FileInfo, prelude::{BoxExt, Cast, ListItemExt, WidgetExt}, - Align, ColumnViewColumn, ListItem, SignalListItemFactory, }; ColumnViewColumn::builder() diff --git a/src/app/browser/window/tab/item/page/content/image.rs b/src/app/browser/window/tab/item/page/content/image.rs index 6786bede..e0d82da3 100644 --- a/src/app/browser/window/tab/item/page/content/image.rs +++ b/src/app/browser/window/tab/item/page/content/image.rs @@ -1,7 +1,7 @@ use gtk::{ + ContentFit, Picture, gdk::Paintable, prelude::{IsA, WidgetExt}, - ContentFit, Picture, }; pub struct Image { diff --git a/src/app/browser/window/tab/item/page/content/status/download.rs b/src/app/browser/window/tab/item/page/content/status/download.rs index ace3beee..026b14f9 100644 --- a/src/app/browser/window/tab/item/page/content/status/download.rs +++ b/src/app/browser/window/tab/item/page/content/status/download.rs @@ -14,9 +14,9 @@ use status::Status; use adw::StatusPage; use gtk::{ + Box, FileDialog, FileLauncher, Orientation, Window, gio::{Cancellable, File}, prelude::{BoxExt, CancellableExt, WidgetExt}, - Box, FileDialog, FileLauncher, Orientation, Window, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/content/status/download/action/cancel.rs b/src/app/browser/window/tab/item/page/content/status/download/action/cancel.rs index 4a0336af..0bb9ae8a 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/action/cancel.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/action/cancel.rs @@ -2,7 +2,7 @@ use gtk::{ gio::SimpleAction, - glib::{uuid_string_random, SignalHandlerId}, + glib::{SignalHandlerId, uuid_string_random}, prelude::{ActionExt, StaticVariantType, ToVariant}, }; diff --git a/src/app/browser/window/tab/item/page/content/status/download/action/complete.rs b/src/app/browser/window/tab/item/page/content/status/download/action/complete.rs index 775c2f5a..95f5a787 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/action/complete.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/action/complete.rs @@ -2,7 +2,7 @@ use gtk::{ gio::SimpleAction, - glib::{uuid_string_random, SignalHandlerId}, + glib::{SignalHandlerId, uuid_string_random}, prelude::{ActionExt, StaticVariantType, ToVariant}, }; diff --git a/src/app/browser/window/tab/item/page/content/status/download/action/update.rs b/src/app/browser/window/tab/item/page/content/status/download/action/update.rs index cf6d1840..7716f563 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/action/update.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/action/update.rs @@ -2,7 +2,7 @@ use gtk::{ gio::SimpleAction, - glib::{uuid_string_random, SignalHandlerId}, + glib::{SignalHandlerId, uuid_string_random}, prelude::{ActionExt, StaticVariantType, ToVariant}, }; diff --git a/src/app/browser/window/tab/item/page/content/status/download/cancel.rs b/src/app/browser/window/tab/item/page/content/status/download/cancel.rs index 4f792d3c..e3053bbf 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/cancel.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/cancel.rs @@ -1,4 +1,4 @@ -use gtk::{glib::SignalHandlerId, prelude::ButtonExt, Align, Button}; +use gtk::{Align, Button, glib::SignalHandlerId, prelude::ButtonExt}; // Defaults diff --git a/src/app/browser/window/tab/item/page/content/status/download/choose.rs b/src/app/browser/window/tab/item/page/content/status/download/choose.rs index db3daae3..608aa93d 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/choose.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/choose.rs @@ -1,7 +1,7 @@ use gtk::{ + Align, Button, glib::SignalHandlerId, prelude::{ButtonExt, WidgetExt}, - Align, Button, }; // Defaults diff --git a/src/app/browser/window/tab/item/page/content/status/download/open.rs b/src/app/browser/window/tab/item/page/content/status/download/open.rs index 224d7cf9..cfbec5c8 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/open.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/open.rs @@ -1,4 +1,4 @@ -use gtk::{glib::SignalHandlerId, prelude::ButtonExt, Align, Button}; +use gtk::{Align, Button, glib::SignalHandlerId, prelude::ButtonExt}; // Defaults diff --git a/src/app/browser/window/tab/item/page/content/status/download/progress.rs b/src/app/browser/window/tab/item/page/content/status/download/progress.rs index 3e3564de..03731109 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/progress.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/progress.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Spinner}; // use adw::Spinner; @TODO adw 1.6 / ubuntu 24.10+ +use gtk::{Spinner, prelude::WidgetExt}; // use adw::Spinner; @TODO adw 1.6 / ubuntu 24.10+ // Defaults diff --git a/src/app/browser/window/tab/item/page/content/status/download/status.rs b/src/app/browser/window/tab/item/page/content/status/download/status.rs index f95ff233..ca524589 100644 --- a/src/app/browser/window/tab/item/page/content/status/download/status.rs +++ b/src/app/browser/window/tab/item/page/content/status/download/status.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Label}; +use gtk::{Label, prelude::WidgetExt}; // Defaults diff --git a/src/app/browser/window/tab/item/page/content/status/identity.rs b/src/app/browser/window/tab/item/page/content/status/identity.rs index 1ea12eb4..c5ea27bc 100644 --- a/src/app/browser/window/tab/item/page/content/status/identity.rs +++ b/src/app/browser/window/tab/item/page/content/status/identity.rs @@ -1,6 +1,6 @@ use super::{ItemAction, TabAction}; use adw::StatusPage; -use gtk::{prelude::ActionExt, Align, Button}; +use gtk::{Align, Button, prelude::ActionExt}; use std::rc::Rc; // Defaults diff --git a/src/app/browser/window/tab/item/page/content/status/loading.rs b/src/app/browser/window/tab/item/page/content/status/loading.rs index e341f712..9924e522 100644 --- a/src/app/browser/window/tab/item/page/content/status/loading.rs +++ b/src/app/browser/window/tab/item/page/content/status/loading.rs @@ -1,8 +1,8 @@ use adw::StatusPage; use gtk::{ - glib::{timeout_add_local, ControlFlow}, - prelude::WidgetExt, Spinner, // use adw::Spinner; @TODO adw 1.6 / ubuntu 24.10+ + glib::{ControlFlow, timeout_add_local}, + prelude::WidgetExt, }; use std::time::Duration; diff --git a/src/app/browser/window/tab/item/page/content/status/mime.rs b/src/app/browser/window/tab/item/page/content/status/mime.rs index beab4bbe..434331db 100644 --- a/src/app/browser/window/tab/item/page/content/status/mime.rs +++ b/src/app/browser/window/tab/item/page/content/status/mime.rs @@ -1,6 +1,6 @@ use super::ItemAction; use adw::StatusPage; -use gtk::{glib::Uri, prelude::ButtonExt, Align, Button}; +use gtk::{Align, Button, glib::Uri, prelude::ButtonExt}; use std::rc::Rc; /// Create new default `GObject` preset for mime issue diff --git a/src/app/browser/window/tab/item/page/content/text.rs b/src/app/browser/window/tab/item/page/content/text.rs index a9ddb72f..9a45212b 100644 --- a/src/app/browser/window/tab/item/page/content/text.rs +++ b/src/app/browser/window/tab/item/page/content/text.rs @@ -5,7 +5,7 @@ mod source; use super::{ItemAction, WindowAction}; use adw::ClampScrollable; use gemini::Gemini; -use gtk::{glib::Uri, ScrolledWindow, TextView}; +use gtk::{ScrolledWindow, TextView, glib::Uri}; use plain::Plain; use source::Source; use std::rc::Rc; @@ -72,7 +72,7 @@ impl Text { // Grab focus into the `TextView` on click empty `ClampScrollable` area fn grab_focus_patch(clamp_scrollable: &ClampScrollable, text_view: &TextView) { - use gtk::{prelude::WidgetExt, GestureClick}; + use gtk::{GestureClick, prelude::WidgetExt}; let controller = GestureClick::new(); controller.connect_pressed({ diff --git a/src/app/browser/window/tab/item/page/content/text/gemini.rs b/src/app/browser/window/tab/item/page/content/text/gemini.rs index 0143caf2..8998602e 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini.rs @@ -19,12 +19,12 @@ use ggemtext::line::{ link::Link, }; use gtk::{ + EventControllerMotion, GestureClick, TextBuffer, TextTag, TextView, TextWindowType, + UriLauncher, Window, WrapMode, gdk::{BUTTON_MIDDLE, BUTTON_PRIMARY, RGBA}, gio::Cancellable, glib::{TimeZone, Uri}, prelude::{TextBufferExt, TextBufferExtManual, TextTagExt, TextViewExt, WidgetExt}, - EventControllerMotion, GestureClick, TextBuffer, TextTag, TextView, TextWindowType, - UriLauncher, Window, WrapMode, }; use std::{cell::Cell, collections::HashMap, rc::Rc}; diff --git a/src/app/browser/window/tab/item/page/content/text/gemini/ansi.rs b/src/app/browser/window/tab/item/page/content/text/gemini/ansi.rs index 803ec0e3..e8f377f4 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini/ansi.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini/ansi.rs @@ -4,7 +4,7 @@ mod tag; use tag::Tag; use ansi_parser::{AnsiParser, AnsiSequence, Output}; -use gtk::{prelude::TextTagExt, TextTag}; +use gtk::{TextTag, prelude::TextTagExt}; /// Apply ANSI/SGR format to new buffer pub fn format(source_code: &str) -> Vec<(TextTag, String)> { diff --git a/src/app/browser/window/tab/item/page/content/text/gemini/gutter.rs b/src/app/browser/window/tab/item/page/content/text/gemini/gutter.rs index 2df6a0ca..6a558ef2 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini/gutter.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini/gutter.rs @@ -1,8 +1,8 @@ use gtk::{ - glib::{timeout_add_local_once, Uri}, + Align, Label, TextView, TextWindowType, + glib::{Uri, timeout_add_local_once}, pango::EllipsizeMode, prelude::{TextViewExt, WidgetExt}, - Align, Label, TextView, TextWindowType, }; use std::{cell::Cell, rc::Rc, time::Duration}; diff --git a/src/app/browser/window/tab/item/page/content/text/gemini/icon.rs b/src/app/browser/window/tab/item/page/content/text/gemini/icon.rs index 203d1c65..a85ec38f 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini/icon.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini/icon.rs @@ -1,4 +1,4 @@ -use gtk::{gdk::Display, IconLookupFlags, IconPaintable, IconTheme, TextDirection}; +use gtk::{IconLookupFlags, IconPaintable, IconTheme, TextDirection, gdk::Display}; const SIZE: i32 = 16; diff --git a/src/app/browser/window/tab/item/page/content/text/gemini/syntax.rs b/src/app/browser/window/tab/item/page/content/text/gemini/syntax.rs index 69fcca16..50de853d 100644 --- a/src/app/browser/window/tab/item/page/content/text/gemini/syntax.rs +++ b/src/app/browser/window/tab/item/page/content/text/gemini/syntax.rs @@ -6,10 +6,10 @@ use tag::Tag; use adw::StyleManager; use gtk::{ + TextTag, gdk::RGBA, pango::{Style, Underline}, prelude::TextTagExt, - TextTag, }; use syntect::{ easy::HighlightLines, diff --git a/src/app/browser/window/tab/item/page/input.rs b/src/app/browser/window/tab/item/page/input.rs index 5becc41a..eab68b34 100644 --- a/src/app/browser/window/tab/item/page/input.rs +++ b/src/app/browser/window/tab/item/page/input.rs @@ -5,9 +5,9 @@ mod titan; use super::ItemAction; use adw::Clamp; use gtk::{ + Widget, glib::{Bytes, Uri}, prelude::{IsA, WidgetExt}, - Widget, }; use response::Response; use sensitive::Sensitive; diff --git a/src/app/browser/window/tab/item/page/input/response.rs b/src/app/browser/window/tab/item/page/input/response.rs index f96cec75..07d3168b 100644 --- a/src/app/browser/window/tab/item/page/input/response.rs +++ b/src/app/browser/window/tab/item/page/input/response.rs @@ -8,10 +8,10 @@ use title::Title; use super::ItemAction; use gtk::{ - gio::SimpleAction, - glib::{uuid_string_random, Uri, UriHideFlags}, - prelude::{ActionExt, BoxExt, DisplayExt, WidgetExt}, Box, Label, Orientation, TextView, + gio::SimpleAction, + glib::{Uri, UriHideFlags, uuid_string_random}, + prelude::{ActionExt, BoxExt, DisplayExt, WidgetExt}, }; use std::rc::Rc; @@ -94,9 +94,10 @@ impl Response for Box { form.add_controller({ const SHORTCUT: &str = "Return"; // @TODO optional + /*control - .send - .set_tooltip_text(Some(&format!("Shortcut: {SHORTCUT}")));*/ + .send + .set_tooltip_text(Some(&format!("Shortcut: {SHORTCUT}")));*/ let c = gtk::ShortcutController::new(); c.add_shortcut( gtk::Shortcut::builder() diff --git a/src/app/browser/window/tab/item/page/input/response/control.rs b/src/app/browser/window/tab/item/page/input/response/control.rs index 8fa33af8..2251339d 100644 --- a/src/app/browser/window/tab/item/page/input/response/control.rs +++ b/src/app/browser/window/tab/item/page/input/response/control.rs @@ -2,7 +2,7 @@ mod counter; mod send; use counter::Counter; -use gtk::{gio::SimpleAction, prelude::BoxExt, Align, Box, Button, Label, Orientation}; +use gtk::{Align, Box, Button, Label, Orientation, gio::SimpleAction, prelude::BoxExt}; use send::Send; const SPACING: i32 = 8; diff --git a/src/app/browser/window/tab/item/page/input/response/control/counter.rs b/src/app/browser/window/tab/item/page/input/response/control/counter.rs index 1dd9b28e..e469a0c8 100644 --- a/src/app/browser/window/tab/item/page/input/response/control/counter.rs +++ b/src/app/browser/window/tab/item/page/input/response/control/counter.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Label}; +use gtk::{Label, prelude::WidgetExt}; use plurify::Plurify; pub trait Counter { diff --git a/src/app/browser/window/tab/item/page/input/response/control/send.rs b/src/app/browser/window/tab/item/page/input/response/control/send.rs index a8354701..432ed0c1 100644 --- a/src/app/browser/window/tab/item/page/input/response/control/send.rs +++ b/src/app/browser/window/tab/item/page/input/response/control/send.rs @@ -1,7 +1,7 @@ use gtk::{ + Button, gio::SimpleAction, prelude::{ActionExt, ButtonExt, WidgetExt}, - Button, }; pub trait Send { diff --git a/src/app/browser/window/tab/item/page/input/response/form.rs b/src/app/browser/window/tab/item/page/input/response/form.rs index 25d6b178..1a0e1c0e 100644 --- a/src/app/browser/window/tab/item/page/input/response/form.rs +++ b/src/app/browser/window/tab/item/page/input/response/form.rs @@ -1,8 +1,8 @@ use gtk::{ + TextView, WrapMode, gio::SimpleAction, glib::GString, prelude::{ActionExt, TextBufferExt, TextViewExt, WidgetExt}, - TextView, WrapMode, }; use libspelling::{Checker, TextBufferAdapter}; use sourceview::Buffer; diff --git a/src/app/browser/window/tab/item/page/input/sensitive.rs b/src/app/browser/window/tab/item/page/input/sensitive.rs index 9b821a77..1a8ab3ff 100644 --- a/src/app/browser/window/tab/item/page/input/sensitive.rs +++ b/src/app/browser/window/tab/item/page/input/sensitive.rs @@ -3,10 +3,10 @@ mod form; use super::ItemAction; use form::Form; use gtk::{ - gio::SimpleAction, - glib::{uuid_string_random, Uri, UriHideFlags}, - prelude::{BoxExt, EditableExt, WidgetExt}, Box, Orientation, + gio::SimpleAction, + glib::{Uri, UriHideFlags, uuid_string_random}, + prelude::{BoxExt, EditableExt, WidgetExt}, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/input/sensitive/form.rs b/src/app/browser/window/tab/item/page/input/sensitive/form.rs index caff386c..781ff673 100644 --- a/src/app/browser/window/tab/item/page/input/sensitive/form.rs +++ b/src/app/browser/window/tab/item/page/input/sensitive/form.rs @@ -1,6 +1,6 @@ use adw::{ - prelude::{EntryRowExt, PreferencesRowExt}, PasswordEntryRow, + prelude::{EntryRowExt, PreferencesRowExt}, }; use gtk::{ gio::SimpleAction, diff --git a/src/app/browser/window/tab/item/page/input/titan.rs b/src/app/browser/window/tab/item/page/input/titan.rs index b1335452..cc89f239 100644 --- a/src/app/browser/window/tab/item/page/input/titan.rs +++ b/src/app/browser/window/tab/item/page/input/titan.rs @@ -7,9 +7,9 @@ mod text; use control::Control; use file::File; use gtk::{ + Notebook, glib::Bytes, prelude::{DisplayExt, WidgetExt}, - Notebook, }; pub use header::Header; use tab::Tab; @@ -21,7 +21,7 @@ pub trait Titan { impl Titan for gtk::Box { fn titan(callback: impl Fn(Header, Bytes, Box) + 'static) -> Self { - use gtk::{glib::uuid_string_random, prelude::ButtonExt, Label}; + use gtk::{Label, glib::uuid_string_random, prelude::ButtonExt}; use std::rc::Rc; // Init components @@ -57,7 +57,7 @@ impl Titan for gtk::Box { // Init main widget let g_box = { - use gtk::{prelude::BoxExt, Box, Orientation}; + use gtk::{Box, Orientation, prelude::BoxExt}; let g_box = { const MARGIN: i32 = 8; @@ -182,4 +182,4 @@ fn notebook_css_patch(notebook: &Notebook) { gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, ); } // @TODO replace `Notebook` with `ToggleGroup` in Adw 1.7 / Ubuntu 26.04 - // https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.ToggleGroup.html +// https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.ToggleGroup.html diff --git a/src/app/browser/window/tab/item/page/input/titan/control.rs b/src/app/browser/window/tab/item/page/input/titan/control.rs index 00cee1b7..6780948f 100644 --- a/src/app/browser/window/tab/item/page/input/titan/control.rs +++ b/src/app/browser/window/tab/item/page/input/titan/control.rs @@ -4,8 +4,8 @@ mod upload; use counter::Counter; use gtk::{ - prelude::{BoxExt, WidgetExt}, Align, Box, Button, Label, Orientation, + prelude::{BoxExt, WidgetExt}, }; use options::Options; pub use upload::Upload; diff --git a/src/app/browser/window/tab/item/page/input/titan/control/upload.rs b/src/app/browser/window/tab/item/page/input/titan/control/upload.rs index c6099c5a..a14d9be1 100644 --- a/src/app/browser/window/tab/item/page/input/titan/control/upload.rs +++ b/src/app/browser/window/tab/item/page/input/titan/control/upload.rs @@ -1,6 +1,6 @@ use gtk::{ - prelude::{ButtonExt, WidgetExt}, Button, + prelude::{ButtonExt, WidgetExt}, }; pub trait Upload { diff --git a/src/app/browser/window/tab/item/page/input/titan/file.rs b/src/app/browser/window/tab/item/page/input/titan/file.rs index c2db6896..c7e96290 100644 --- a/src/app/browser/window/tab/item/page/input/titan/file.rs +++ b/src/app/browser/window/tab/item/page/input/titan/file.rs @@ -1,8 +1,8 @@ use super::{Control, Header}; use gtk::{ + Button, gio::FileQueryInfoFlags, glib::{Bytes, Priority}, - Button, }; use std::{cell::RefCell, rc::Rc}; @@ -15,9 +15,9 @@ pub struct File { impl File { pub fn build(control: &Rc) -> Self { use gtk::{ + Button, FileDialog, Window, gio::Cancellable, prelude::{ButtonExt, FileExt, WidgetExt}, - Button, FileDialog, Window, }; // Init components diff --git a/src/app/browser/window/tab/item/page/input/titan/header.rs b/src/app/browser/window/tab/item/page/input/titan/header.rs index 2b780a7e..59462feb 100644 --- a/src/app/browser/window/tab/item/page/input/titan/header.rs +++ b/src/app/browser/window/tab/item/page/input/titan/header.rs @@ -1,6 +1,6 @@ mod form; -use gtk::{glib::GString, prelude::IsA, Widget}; +use gtk::{Widget, glib::GString, prelude::IsA}; #[derive(Default, Clone)] pub struct Header { @@ -13,8 +13,8 @@ impl Header { /// * takes ownership of `Self`, return new updated copy in `callback` function pub fn dialog(self, widget: Option<&impl IsA>, callback: impl Fn(Self) + 'static) { use adw::{ - prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, AlertDialog, ResponseAppearance, + prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, }; use form::Form; diff --git a/src/app/browser/window/tab/item/page/input/titan/header/form.rs b/src/app/browser/window/tab/item/page/input/titan/header/form.rs index ba2aef66..7b6b99a2 100644 --- a/src/app/browser/window/tab/item/page/input/titan/header/form.rs +++ b/src/app/browser/window/tab/item/page/input/titan/header/form.rs @@ -5,9 +5,9 @@ use mime::Mime; use token::Token; use gtk::{ + Box, Entry, Orientation, glib::GString, prelude::{BoxExt, EditableExt}, - Box, Entry, Orientation, }; pub struct Form { @@ -48,9 +48,5 @@ impl Form { fn value(label: &Entry) -> Option { let text = label.text(); - if !text.is_empty() { - Some(text) - } else { - None - } + if !text.is_empty() { Some(text) } else { None } } diff --git a/src/app/browser/window/tab/item/page/input/titan/text.rs b/src/app/browser/window/tab/item/page/input/titan/text.rs index b660a671..e800dc9f 100644 --- a/src/app/browser/window/tab/item/page/input/titan/text.rs +++ b/src/app/browser/window/tab/item/page/input/titan/text.rs @@ -2,9 +2,9 @@ mod form; use super::{Control, Header}; use gtk::{ + TextBuffer, TextView, glib::{Bytes, GString}, prelude::{TextBufferExt, TextViewExt}, - TextBuffer, TextView, }; use std::{cell::RefCell, rc::Rc}; diff --git a/src/app/browser/window/tab/item/page/input/titan/text/form.rs b/src/app/browser/window/tab/item/page/input/titan/text/form.rs index 088bbd10..114c0c99 100644 --- a/src/app/browser/window/tab/item/page/input/titan/text/form.rs +++ b/src/app/browser/window/tab/item/page/input/titan/text/form.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, TextView, WrapMode}; +use gtk::{TextView, WrapMode, prelude::WidgetExt}; use libspelling::{Checker, TextBufferAdapter}; use sourceview::Buffer; diff --git a/src/app/browser/window/tab/item/page/navigation.rs b/src/app/browser/window/tab/item/page/navigation.rs index d8ebd894..da9e7c66 100644 --- a/src/app/browser/window/tab/item/page/navigation.rs +++ b/src/app/browser/window/tab/item/page/navigation.rs @@ -9,9 +9,9 @@ use super::{ItemAction, Profile, TabAction, WindowAction}; use anyhow::Result; use bookmark::Bookmark; use gtk::{ + Box, Button, Orientation, glib::{GString, Uri}, prelude::{BoxExt, EditableExt, EntryExt, WidgetExt}, - Box, Button, Orientation, }; use history::History; use home::Home; diff --git a/src/app/browser/window/tab/item/page/navigation/bookmark.rs b/src/app/browser/window/tab/item/page/navigation/bookmark.rs index f3b6c56d..140bfcbc 100644 --- a/src/app/browser/window/tab/item/page/navigation/bookmark.rs +++ b/src/app/browser/window/tab/item/page/navigation/bookmark.rs @@ -1,7 +1,7 @@ use super::{Profile, WindowAction}; use gtk::{ - prelude::{ActionExt, ButtonExt, EditableExt, WidgetExt}, Button, Entry, + prelude::{ActionExt, ButtonExt, EditableExt, WidgetExt}, }; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/tab/item/page/navigation/history.rs b/src/app/browser/window/tab/item/page/navigation/history.rs index d423e0f5..74442b2f 100644 --- a/src/app/browser/window/tab/item/page/navigation/history.rs +++ b/src/app/browser/window/tab/item/page/navigation/history.rs @@ -5,7 +5,7 @@ pub use back::Back; pub use forward::Forward; use super::{ItemAction, TabAction, WindowAction}; -use gtk::{prelude::BoxExt, Box, Button, Orientation}; +use gtk::{Box, Button, Orientation, prelude::BoxExt}; use std::rc::Rc; pub trait History { diff --git a/src/app/browser/window/tab/item/page/navigation/history/back.rs b/src/app/browser/window/tab/item/page/navigation/history/back.rs index fecafd0b..6a3ff39a 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/back.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/back.rs @@ -1,9 +1,9 @@ use super::{ItemAction, TabAction, WindowAction}; use crate::app::browser::window::action::Position; use gtk::{ + Button, GestureClick, gdk::BUTTON_MIDDLE, prelude::{ActionExt, WidgetExt}, - Button, GestureClick, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/navigation/history/forward.rs b/src/app/browser/window/tab/item/page/navigation/history/forward.rs index 28ed02bb..45f2a0eb 100644 --- a/src/app/browser/window/tab/item/page/navigation/history/forward.rs +++ b/src/app/browser/window/tab/item/page/navigation/history/forward.rs @@ -1,9 +1,9 @@ use super::{ItemAction, TabAction, WindowAction}; use crate::app::browser::window::action::Position; use gtk::{ + Button, GestureClick, gdk::BUTTON_MIDDLE, prelude::{ActionExt, WidgetExt}, - Button, GestureClick, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/navigation/home.rs b/src/app/browser/window/tab/item/page/navigation/home.rs index 20f93e70..b8e1b261 100644 --- a/src/app/browser/window/tab/item/page/navigation/home.rs +++ b/src/app/browser/window/tab/item/page/navigation/home.rs @@ -1,9 +1,9 @@ use super::{ItemAction, Request, TabAction, WindowAction}; use crate::app::browser::window::action::Position; use gtk::{ + Button, GestureClick, gdk::BUTTON_MIDDLE, prelude::{ActionExt, WidgetExt}, - Button, GestureClick, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/navigation/reload.rs b/src/app/browser/window/tab/item/page/navigation/reload.rs index 8e2715b0..f7c6f7a8 100644 --- a/src/app/browser/window/tab/item/page/navigation/reload.rs +++ b/src/app/browser/window/tab/item/page/navigation/reload.rs @@ -1,9 +1,9 @@ use super::{ItemAction, Request, TabAction, WindowAction}; use crate::app::browser::window::action::Position; use gtk::{ + Button, GestureClick, gdk::BUTTON_MIDDLE, prelude::{ActionExt, WidgetExt}, - Button, GestureClick, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/navigation/request.rs b/src/app/browser/window/tab/item/page/navigation/request.rs index 7c788811..c0a80d18 100644 --- a/src/app/browser/window/tab/item/page/navigation/request.rs +++ b/src/app/browser/window/tab/item/page/navigation/request.rs @@ -5,12 +5,12 @@ mod search; mod suggestion; use super::{ItemAction, Profile}; -use adw::{prelude::AdwDialogExt, AlertDialog}; +use adw::{AlertDialog, prelude::AdwDialogExt}; use anyhow::Result; use gtk::{ - glib::{gformat, GString, Uri, UriFlags}, - prelude::{EditableExt, EntryExt, WidgetExt}, Entry, EntryIconPosition, StateFlags, + glib::{GString, Uri, UriFlags, gformat}, + prelude::{EditableExt, EntryExt, WidgetExt}, }; use primary_icon::PrimaryIcon; use sqlite::Transaction; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common.rs index 7ab51604..4bbe55bb 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common.rs @@ -27,10 +27,10 @@ impl Common for AlertDialog { callback: &Rc, ) -> Self { use adw::{ - prelude::{AlertDialogExt, AlertDialogExtManual}, ResponseAppearance, + prelude::{AlertDialogExt, AlertDialogExtManual}, }; - use form::{list::item::value::Value, Form}; + use form::{Form, list::item::value::Value}; // Response variants const RESPONSE_APPLY: (&str, &str) = ("apply", "Apply"); diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form.rs index 04aa6dc4..b7b7b52c 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form.rs @@ -8,16 +8,16 @@ mod save; use drop::Drop; use exit::Exit; use file::File; -use list::{item::value::Value, List}; +use list::{List, item::value::Value}; use name::Name; use save::Save; use super::WidgetAction; use crate::Profile; use gtk::{ + Box, Button, Entry, Orientation, glib::Uri, prelude::{BoxExt, WidgetExt}, - Box, Button, Entry, Orientation, }; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/drop.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/drop.rs index 85fd2283..043838ac 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/drop.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/drop.rs @@ -1,13 +1,13 @@ -use super::list::{item::Value, List}; +use super::list::{List, item::Value}; use crate::profile::Profile; use adw::{ - prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, AlertDialog, ResponseAppearance, + prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, }; use gtk::{ + Button, glib::timeout_add_seconds_local_once, prelude::{ButtonExt, WidgetExt}, - Button, }; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/exit.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/exit.rs index b7511327..59e05a7a 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/exit.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/exit.rs @@ -1,12 +1,12 @@ use super::{ - list::{item::Value, List}, WidgetAction, + list::{List, item::Value}, }; use crate::Profile; use gtk::{ - glib::{timeout_add_seconds_local_once, Uri}, - prelude::{ButtonExt, WidgetExt}, Button, + glib::{Uri, timeout_add_seconds_local_once}, + prelude::{ButtonExt, WidgetExt}, }; use std::{rc::Rc, sync::Arc}; @@ -30,8 +30,8 @@ impl Exit for Button { request: &Uri, ) -> Self { use adw::{ - prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, AlertDialog, ResponseAppearance, + prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, }; const LABEL: &str = "Disconnect"; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/file.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/file.rs index a3fbee8e..0672dba5 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/file.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/file.rs @@ -1,9 +1,9 @@ use super::WidgetAction; use gtk::{ - gio::{Cancellable, ListStore, TlsCertificate}, - glib::{gformat, GString}, - prelude::{ButtonExt, FileExt, TlsCertificateExt, WidgetExt}, Button, FileDialog, FileFilter, Window, + gio::{Cancellable, ListStore, TlsCertificate}, + glib::{GString, gformat}, + prelude::{ButtonExt, FileExt, TlsCertificateExt, WidgetExt}, }; use std::{cell::RefCell, rc::Rc}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/list.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/list.rs index 48443d14..8393970b 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/list.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/list.rs @@ -6,14 +6,14 @@ use item::Item; use super::WidgetAction; use crate::profile::Profile; use gtk::{ + Align, Box, DropDown, Image, Label, ListItem, Orientation, SignalListItemFactory, gdk::Cursor, gio::{ - prelude::{Cast, CastNone}, ListStore, + prelude::{Cast, CastNone}, }, glib::Uri, prelude::{BoxExt, ListItemExt, ObjectExt, WidgetExt}, - Align, Box, DropDown, Image, Label, ListItem, Orientation, SignalListItemFactory, }; pub struct List { diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/name.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/name.rs index 015c1c2f..f1c3882c 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/name.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/name.rs @@ -1,7 +1,7 @@ use super::WidgetAction; use gtk::{ - prelude::{EditableExt, EntryExt, WidgetExt}, Entry, + prelude::{EditableExt, EntryExt, WidgetExt}, }; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save.rs index f636efca..909df98c 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save.rs @@ -1,13 +1,13 @@ mod certificate; use certificate::Certificate; -use super::list::{item::Value, List}; +use super::list::{List, item::Value}; use crate::profile::Profile; use gtk::{ - gio::{Cancellable, FileCreateFlags, ListStore}, - glib::{timeout_add_seconds_local_once, Priority}, - prelude::{ButtonExt, FileExt, OutputStreamExtManual, WidgetExt}, Button, FileDialog, FileFilter, Window, + gio::{Cancellable, FileCreateFlags, ListStore}, + glib::{Priority, timeout_add_seconds_local_once}, + prelude::{ButtonExt, FileExt, OutputStreamExtManual, WidgetExt}, }; use std::{path::MAIN_SEPARATOR, rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save/certificate.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save/certificate.rs index 5aa42366..31c4fff0 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save/certificate.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common/form/save/certificate.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use crate::profile::Profile; use gtk::{gio::TlsCertificate, prelude::TlsCertificateExt}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/search.rs b/src/app/browser/window/tab/item/page/navigation/request/search.rs index 953e7031..57c0c35e 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/search.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/search.rs @@ -3,10 +3,10 @@ mod form; use crate::Profile; use adw::AlertDialog; use adw::{ - prelude::{AlertDialogExt, AlertDialogExtManual}, ResponseAppearance, + prelude::{AlertDialogExt, AlertDialogExtManual}, }; -use form::{list::item::Value, list::Item, Form, Query}; +use form::{Form, Query, list::Item, list::item::Value}; use gtk::prelude::{EditableExt, WidgetExt}; use sourceview::prelude::CastNone; use std::rc::Rc; diff --git a/src/app/browser/window/tab/item/page/navigation/request/search/form.rs b/src/app/browser/window/tab/item/page/navigation/request/search/form.rs index fd6b53cf..82ab85b3 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/search/form.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/search/form.rs @@ -4,7 +4,7 @@ pub mod query; use crate::Profile; use drop::Drop; -use gtk::{prelude::BoxExt, Box, Button, Entry, Orientation}; +use gtk::{Box, Button, Entry, Orientation, prelude::BoxExt}; use list::List; pub use query::Query; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/search/form/drop.rs b/src/app/browser/window/tab/item/page/navigation/request/search/form/drop.rs index dc597c89..0b9c33b0 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/search/form/drop.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/search/form/drop.rs @@ -1,13 +1,13 @@ -use super::list::{item::Value, List}; +use super::list::{List, item::Value}; use crate::profile::Profile; use adw::{ - prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, AlertDialog, ResponseAppearance, + prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual}, }; use gtk::{ + Button, glib::timeout_add_seconds_local_once, prelude::{ButtonExt, WidgetExt}, - Button, }; use std::{rc::Rc, sync::Arc}; diff --git a/src/app/browser/window/tab/item/page/navigation/request/search/form/list.rs b/src/app/browser/window/tab/item/page/navigation/request/search/form/list.rs index d39433b5..79b6d64c 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/search/form/list.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/search/form/list.rs @@ -2,12 +2,12 @@ pub mod item; use crate::profile::Profile; use gtk::{ + Align, Box, DropDown, Label, ListItem, Orientation, SignalListItemFactory, gio::{ - prelude::{Cast, CastNone}, ListStore, + prelude::{Cast, CastNone}, }, prelude::{BoxExt, ListItemExt, ObjectExt, WidgetExt}, - Align, Box, DropDown, Label, ListItem, Orientation, SignalListItemFactory, }; pub use item::Item; use std::sync::Arc; diff --git a/src/app/browser/window/tab/item/page/navigation/request/search/form/query.rs b/src/app/browser/window/tab/item/page/navigation/request/search/form/query.rs index 4964e859..35fac930 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/search/form/query.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/search/form/query.rs @@ -1,7 +1,7 @@ use gtk::{ + Entry, glib::{Uri, UriFlags}, prelude::{EditableExt, EntryExt}, - Entry, }; const MIN_LENGTH: u16 = 1; diff --git a/src/app/browser/window/tab/item/page/navigation/request/suggestion.rs b/src/app/browser/window/tab/item/page/navigation/request/suggestion.rs index 48337c14..6c64fa77 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/suggestion.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/suggestion.rs @@ -2,18 +2,18 @@ mod item; use super::Profile; use adw::{ - prelude::{ActionRowExt, PopoverExt, PreferencesRowExt}, ActionRow, + prelude::{ActionRowExt, PopoverExt, PreferencesRowExt}, }; use gtk::{ + Align, Entry, INVALID_LIST_POSITION, ListItem, ListView, Popover, SignalListItemFactory, + SingleSelection, gio::{ - prelude::{Cast, CastNone}, ListStore, + prelude::{Cast, CastNone}, }, glib::{GString, SignalHandlerId}, prelude::{EditableExt, EntryExt, ListItemExt, WidgetExt}, - Align, Entry, ListItem, ListView, Popover, SignalListItemFactory, SingleSelection, - INVALID_LIST_POSITION, }; pub use item::Item; use sourceview::prelude::ListModelExt; diff --git a/src/app/browser/window/tab/item/page/search.rs b/src/app/browser/window/tab/item/page/search.rs index a9b50936..c3607f4e 100644 --- a/src/app/browser/window/tab/item/page/search.rs +++ b/src/app/browser/window/tab/item/page/search.rs @@ -8,8 +8,8 @@ use placeholder::Placeholder; use subject::Subject; use gtk::{ - prelude::{BoxExt, ButtonExt, WidgetExt}, Align, Box, Orientation, TextView, + prelude::{BoxExt, ButtonExt, WidgetExt}, }; use std::{cell::RefCell, rc::Rc}; diff --git a/src/app/browser/window/tab/item/page/search/form.rs b/src/app/browser/window/tab/item/page/search/form.rs index 1a719932..82728f02 100644 --- a/src/app/browser/window/tab/item/page/search/form.rs +++ b/src/app/browser/window/tab/item/page/search/form.rs @@ -10,11 +10,11 @@ use navigation::Navigation; use result::Result; use gtk::{ + Align, Box, Orientation, TextIter, TextSearchFlags, TextView, prelude::{ BoxExt, ButtonExt, CheckButtonExt, DisplayExt, EditableExt, EntryExt, TextBufferExt, TextViewExt, WidgetExt, }, - Align, Box, Orientation, TextIter, TextSearchFlags, TextView, }; use std::{cell::RefCell, rc::Rc}; diff --git a/src/app/browser/window/tab/item/page/search/form/input.rs b/src/app/browser/window/tab/item/page/search/form/input.rs index 305a9342..5368377f 100644 --- a/src/app/browser/window/tab/item/page/search/form/input.rs +++ b/src/app/browser/window/tab/item/page/search/form/input.rs @@ -1,6 +1,6 @@ use gtk::{ - prelude::{EditableExt, EntryExt, WidgetExt}, Align, Entry, EntryIconPosition, + prelude::{EditableExt, EntryExt, WidgetExt}, }; const MARGIN: i32 = 6; diff --git a/src/app/browser/window/tab/item/page/search/form/navigation.rs b/src/app/browser/window/tab/item/page/search/form/navigation.rs index 5a9b1256..99bb263c 100644 --- a/src/app/browser/window/tab/item/page/search/form/navigation.rs +++ b/src/app/browser/window/tab/item/page/search/form/navigation.rs @@ -8,8 +8,8 @@ use model::Model; use super::Subject; use gtk::{ - prelude::{BoxExt, TextBufferExt, TextViewExt}, Box, Orientation, TextIter, + prelude::{BoxExt, TextBufferExt, TextViewExt}, }; use std::cell::RefCell; diff --git a/src/app/browser/window/tab/item/page/search/form/navigation/back.rs b/src/app/browser/window/tab/item/page/search/form/navigation/back.rs index 67b48036..0cb0f2fe 100644 --- a/src/app/browser/window/tab/item/page/search/form/navigation/back.rs +++ b/src/app/browser/window/tab/item/page/search/form/navigation/back.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Align, Button}; +use gtk::{Align, Button, prelude::WidgetExt}; pub struct Back { pub button: Button, diff --git a/src/app/browser/window/tab/item/page/search/form/navigation/forward.rs b/src/app/browser/window/tab/item/page/search/form/navigation/forward.rs index 3f334c8e..1357afe7 100644 --- a/src/app/browser/window/tab/item/page/search/form/navigation/forward.rs +++ b/src/app/browser/window/tab/item/page/search/form/navigation/forward.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Align, Button}; +use gtk::{Align, Button, prelude::WidgetExt}; pub struct Forward { pub button: Button, diff --git a/src/app/browser/window/tab/item/page/search/form/result.rs b/src/app/browser/window/tab/item/page/search/form/result.rs index 1d9fd2ec..2c905b93 100644 --- a/src/app/browser/window/tab/item/page/search/form/result.rs +++ b/src/app/browser/window/tab/item/page/search/form/result.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Label}; +use gtk::{Label, prelude::WidgetExt}; const MARGIN: i32 = 3; diff --git a/src/app/browser/window/tab/item/page/search/placeholder.rs b/src/app/browser/window/tab/item/page/search/placeholder.rs index 600527d2..19f2e96a 100644 --- a/src/app/browser/window/tab/item/page/search/placeholder.rs +++ b/src/app/browser/window/tab/item/page/search/placeholder.rs @@ -1,4 +1,4 @@ -use gtk::{prelude::WidgetExt, Align, Label}; +use gtk::{Align, Label, prelude::WidgetExt}; const MARGIN: i32 = 6; diff --git a/src/app/browser/window/tab/item/page/search/subject.rs b/src/app/browser/window/tab/item/page/search/subject.rs index 2ee2ac16..7c3b49a9 100644 --- a/src/app/browser/window/tab/item/page/search/subject.rs +++ b/src/app/browser/window/tab/item/page/search/subject.rs @@ -3,8 +3,8 @@ mod tag; use tag::Tag; use gtk::{ - prelude::{TextBufferExt, TextViewExt}, TextView, + prelude::{TextBufferExt, TextViewExt}, }; pub struct Subject { diff --git a/src/app/browser/window/tab/item/page/search/subject/tag/current.rs b/src/app/browser/window/tab/item/page/search/subject/tag/current.rs index 5fe63365..473386d6 100644 --- a/src/app/browser/window/tab/item/page/search/subject/tag/current.rs +++ b/src/app/browser/window/tab/item/page/search/subject/tag/current.rs @@ -1,4 +1,4 @@ -use gtk::{gdk::RGBA, TextTag}; +use gtk::{TextTag, gdk::RGBA}; pub fn new() -> TextTag { TextTag::builder() diff --git a/src/app/browser/window/tab/item/page/search/subject/tag/found.rs b/src/app/browser/window/tab/item/page/search/subject/tag/found.rs index 4d7fc5cc..618a4d3e 100644 --- a/src/app/browser/window/tab/item/page/search/subject/tag/found.rs +++ b/src/app/browser/window/tab/item/page/search/subject/tag/found.rs @@ -1,4 +1,4 @@ -use gtk::{gdk::RGBA, TextTag}; +use gtk::{TextTag, gdk::RGBA}; pub fn new() -> TextTag { TextTag::builder() diff --git a/src/profile.rs b/src/profile.rs index 6e3c72b1..1e0e32fd 100644 --- a/src/profile.rs +++ b/src/profile.rs @@ -7,7 +7,7 @@ mod search; use anyhow::Result; use bookmark::Bookmark; use database::Database; -use gtk::glib::{user_config_dir, DateTime}; +use gtk::glib::{DateTime, user_config_dir}; use history::History; use identity::Identity; use r2d2::Pool; diff --git a/src/profile/history/database.rs b/src/profile/history/database.rs index 7273d838..ec77a840 100644 --- a/src/profile/history/database.rs +++ b/src/profile/history/database.rs @@ -1,4 +1,4 @@ -use super::{item::Event, Item}; +use super::{Item, item::Event}; use anyhow::Result; use gtk::glib::DateTime; use r2d2::Pool; diff --git a/src/profile/identity.rs b/src/profile/identity.rs index 68d03d81..2b01a2d2 100644 --- a/src/profile/identity.rs +++ b/src/profile/identity.rs @@ -4,7 +4,7 @@ mod database; mod item; mod memory; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use auth::Auth; use database::Database; use gtk::glib::DateTime; diff --git a/src/profile/identity/auth/memory.rs b/src/profile/identity/auth/memory.rs index 70a0304d..57361232 100644 --- a/src/profile/identity/auth/memory.rs +++ b/src/profile/identity/auth/memory.rs @@ -1,6 +1,6 @@ pub mod auth; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; pub use auth::Auth; use std::{collections::HashMap, sync::RwLock}; diff --git a/src/profile/identity/item.rs b/src/profile/identity/item.rs index 615d7f4d..751f69de 100644 --- a/src/profile/identity/item.rs +++ b/src/profile/identity/item.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use gtk::gio::TlsCertificate; /// Gemini identity holder for cached record in application-wide struct format. diff --git a/src/profile/identity/memory.rs b/src/profile/identity/memory.rs index 990e4e4c..25fbfbf2 100644 --- a/src/profile/identity/memory.rs +++ b/src/profile/identity/memory.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use std::{collections::HashMap, sync::RwLock}; /// Reduce disk usage by cache index in memory