merge imports with rustfmt

src/application.rs

@@ -1,10 +1,11 @@
-use crate::config;
-use crate::helpers::Keyring;
-use crate::models::ProvidersModel;
-use crate::widgets::{PreferencesWindow, ProvidersDialog, Window};
+use crate::{
+    config,
+    helpers::Keyring,
+    models::ProvidersModel,
+    widgets::{PreferencesWindow, ProvidersDialog, Window},
+};
 use gettextrs::gettext;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
+use gio::{prelude::*, subclass::ObjectSubclass};
 use glib::{clone, glib_object_subclass, glib_wrapper};
 use gtk::prelude::*;
 use gtk_macros::{action, get_action};
@@ -12,8 +13,7 @@ use std::env;
 
 mod imp {
     use super::*;
-    use glib::subclass::prelude::*;
-    use glib::{subclass, WeakRef};
+    use glib::{subclass, subclass::prelude::*, WeakRef};
     use gtk::subclass::prelude::{ApplicationImpl, ApplicationImplExt, GtkApplicationImpl};
     use std::cell::{Cell, RefCell};
 

src/backup/mod.rs

@@ -27,7 +27,6 @@ mod andotp;
 mod bitwarden;
 mod freeotp;
 mod legacy;
-pub use self::andotp::AndOTP;
-pub use self::bitwarden::Bitwarden;
-pub use self::freeotp::FreeOTP;
-pub use self::legacy::LegacyAuthenticator;
+pub use self::{
+    andotp::AndOTP, bitwarden::Bitwarden, freeotp::FreeOTP, legacy::LegacyAuthenticator,
+};

src/helpers/qrcode.rs

@@ -1,7 +1,9 @@
 use crate::models::OTPUri;
 use anyhow::Result;
-use ashpd::desktop::screenshot::{Screenshot, ScreenshotOptions, ScreenshotProxy};
-use ashpd::{zbus, RequestProxy, Response, WindowIdentifier};
+use ashpd::{
+    desktop::screenshot::{Screenshot, ScreenshotOptions, ScreenshotProxy},
+    zbus, RequestProxy, Response, WindowIdentifier,
+};
 use gio::FileExt;
 use image::GenericImageView;
 use std::str::FromStr;

src/models/account.rs

@@ -2,21 +2,20 @@ use super::{
     provider::{DiProvider, Provider},
     OTPMethod, OTPUri,
 };
-use crate::helpers::Keyring;
-use crate::models::database;
-use crate::schema::accounts;
+use crate::{helpers::Keyring, models::database, schema::accounts};
 use anyhow::Result;
 use byteorder::{BigEndian, ReadBytesExt};
 use core::cmp::Ordering;
 use diesel::{BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl};
 use gio::{subclass::ObjectSubclass, FileExt};
-use glib::{clone, glib_object_subclass, glib_wrapper};
-use glib::{Cast, ObjectExt, StaticType, ToValue};
+use glib::{clone, glib_object_subclass, glib_wrapper, Cast, ObjectExt, StaticType, ToValue};
 use once_cell::sync::OnceCell;
 use qrcode::QrCode;
 use ring::hmac;
-use std::cell::{Cell, RefCell};
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::{
+    cell::{Cell, RefCell},
+    time::{SystemTime, UNIX_EPOCH},
+};
 use unicase::UniCase;
 
 #[derive(Insertable)]

src/models/account_sorter.rs

@@ -1,13 +1,10 @@
 use super::account::Account;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::StaticType;
-use glib::{glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{glib_object_subclass, glib_wrapper, StaticType};
 
 mod imp {
     use super::*;
-    use glib::subclass;
-    use glib::subclass::prelude::*;
+    use glib::{subclass, subclass::prelude::*};
     use gtk::subclass::sorter::SorterImpl;
 
     #[derive(Debug)]

src/models/accounts.rs

@@ -1,14 +1,11 @@
 use super::account::Account;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::StaticType;
-use glib::{glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{glib_object_subclass, glib_wrapper, StaticType};
 
 mod imp {
     use super::*;
     use gio::subclass::ListModelImpl;
-    use glib::subclass;
-    use glib::subclass::prelude::*;
+    use glib::{subclass, subclass::prelude::*};
     use std::cell::RefCell;
 
     #[derive(Debug)]

src/models/algorithm.rs

@@ -2,8 +2,7 @@ use gettextrs::gettext;
 use glib::GEnum;
 use ring::hmac;
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
-use std::str::FromStr;
-use std::string::ToString;
+use std::{str::FromStr, string::ToString};
 
 #[derive(Debug, Eq, PartialEq, Clone, Copy, GEnum)]
 #[repr(u32)]

src/models/database.rs

@@ -1,10 +1,7 @@
 use anyhow::Result;
-use diesel::prelude::*;
-use diesel::r2d2;
-use diesel::r2d2::ConnectionManager;
+use diesel::{prelude::*, r2d2, r2d2::ConnectionManager};
 use once_cell::sync::Lazy;
-use std::path::PathBuf;
-use std::{fs, fs::File};
+use std::{fs, fs::File, path::PathBuf};
 
 type Pool = r2d2::Pool<ConnectionManager<SqliteConnection>>;
 

src/models/mod.rs

@@ -9,12 +9,14 @@ mod provider;
 mod provider_sorter;
 mod providers;
 
-pub use self::account::Account;
-pub use self::account_sorter::AccountSorter;
-pub use self::accounts::AccountsModel;
-pub use self::algorithm::{Algorithm, OTPMethod};
-pub use self::favicon::{FaviconError, FaviconScrapper};
-pub use self::otp_uri::OTPUri;
-pub use self::provider::Provider;
-pub use self::provider_sorter::ProviderSorter;
-pub use self::providers::ProvidersModel;
+pub use self::{
+    account::Account,
+    account_sorter::AccountSorter,
+    accounts::AccountsModel,
+    algorithm::{Algorithm, OTPMethod},
+    favicon::{FaviconError, FaviconScrapper},
+    otp_uri::OTPUri,
+    provider::Provider,
+    provider_sorter::ProviderSorter,
+    providers::ProvidersModel,
+};

src/models/provider.rs

@@ -1,17 +1,18 @@
 use super::algorithm::{Algorithm, OTPMethod};
-use crate::models::{database, Account, AccountsModel, FaviconError, FaviconScrapper};
-use crate::schema::providers;
+use crate::{
+    models::{database, Account, AccountsModel, FaviconError, FaviconScrapper},
+    schema::providers,
+};
 use anyhow::Result;
 use core::cmp::Ordering;
-use diesel::ExpressionMethods;
-use diesel::{QueryDsl, RunQueryDsl};
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::{glib_object_subclass, glib_wrapper};
-use glib::{Cast, StaticType, ToValue};
-use std::cell::{Cell, RefCell};
-use std::str::FromStr;
-use std::string::ToString;
+use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{glib_object_subclass, glib_wrapper, Cast, StaticType, ToValue};
+use std::{
+    cell::{Cell, RefCell},
+    str::FromStr,
+    string::ToString,
+};
 use unicase::UniCase;
 use url::Url;
 

src/models/provider_sorter.rs

@@ -1,13 +1,10 @@
 use super::provider::Provider;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::StaticType;
-use glib::{glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{glib_object_subclass, glib_wrapper, StaticType};
 
 mod imp {
     use super::*;
-    use glib::subclass;
-    use glib::subclass::prelude::*;
+    use glib::{subclass, subclass::prelude::*};
     use gtk::subclass::sorter::SorterImpl;
 
     #[derive(Debug)]

src/models/providers.rs

@@ -1,16 +1,13 @@
 use super::{Account, Algorithm, OTPMethod, Provider};
 use anyhow::Result;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::StaticType;
-use glib::{glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{glib_object_subclass, glib_wrapper, StaticType};
 use gtk::prelude::*;
 
 mod imp {
     use super::*;
     use gio::subclass::ListModelImpl;
-    use glib::subclass;
-    use glib::subclass::prelude::*;
+    use glib::{subclass, subclass::prelude::*};
     use std::cell::RefCell;
 
     #[derive(Debug)]

src/widgets/accounts/add.rs

@@ -1,12 +1,11 @@
-use crate::helpers::qrcode;
-use crate::models::{Account, OTPMethod, OTPUri, Provider, ProvidersModel};
-use crate::widgets::{ProviderImage, UrlRow};
+use crate::{
+    helpers::qrcode,
+    models::{Account, OTPMethod, OTPUri, Provider, ProvidersModel},
+    widgets::{ProviderImage, UrlRow},
+};
 use anyhow::Result;
-use gio::prelude::*;
-use gio::{subclass::ObjectSubclass, ActionMapExt};
-use glib::signal::Inhibit;
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass, ActionMapExt};
+use glib::{clone, glib_object_subclass, glib_wrapper, signal::Inhibit, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use gtk_macros::{action, get_action};
 use once_cell::sync::OnceCell;

src/widgets/accounts/mod.rs

@@ -2,6 +2,5 @@ mod add;
 mod qrcode_page;
 mod row;
 
-pub use self::add::AccountAddDialog;
-pub use self::row::AccountRow;
+pub use self::{add::AccountAddDialog, row::AccountRow};
 pub use qrcode_page::QRCodePage;

src/widgets/accounts/qrcode_page.rs

@@ -1,8 +1,6 @@
-use crate::models::Account;
-use crate::widgets::UrlRow;
+use crate::{models::Account, widgets::UrlRow};
 use gio::{subclass::ObjectSubclass, FileExt};
-use glib::subclass::prelude::*;
-use glib::{glib_object_subclass, glib_wrapper};
+use glib::{glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 
 mod imp {

src/widgets/accounts/row.rs

@@ -1,8 +1,6 @@
 use crate::models::Account;
-use gio::prelude::*;
-use gio::{subclass::ObjectSubclass, ActionMapExt};
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass, ActionMapExt};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use gtk_macros::{action, get_action};
 use std::cell::RefCell;

src/widgets/mod.rs

@@ -4,8 +4,10 @@ mod providers;
 mod url_row;
 mod window;
 
-pub use self::accounts::AccountAddDialog;
-pub use self::preferences::PreferencesWindow;
-pub use self::providers::{ProviderImage, ProvidersDialog, ProvidersList};
-pub use self::url_row::UrlRow;
-pub use self::window::{View, Window};
+pub use self::{
+    accounts::AccountAddDialog,
+    preferences::PreferencesWindow,
+    providers::{ProviderImage, ProvidersDialog, ProvidersList},
+    url_row::UrlRow,
+    window::{View, Window},
+};

src/widgets/preferences/password_page.rs

@@ -1,9 +1,6 @@
-use crate::config;
-use crate::helpers::Keyring;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use crate::{config, helpers::Keyring};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use gtk_macros::{action, get_action};
 use once_cell::sync::OnceCell;

src/widgets/preferences/window.rs

@@ -1,15 +1,12 @@
 use super::password_page::PasswordPage;
-use crate::backup::{
-    AndOTP, Backupable, Bitwarden, FreeOTP, LegacyAuthenticator, Operation, Restorable,
+use crate::{
+    backup::{AndOTP, Backupable, Bitwarden, FreeOTP, LegacyAuthenticator, Operation, Restorable},
+    config,
+    models::ProvidersModel,
 };
-use crate::config;
-use crate::models::ProvidersModel;
 use gettextrs::gettext;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use gio::ActionMapExt;
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass, ActionMapExt};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use libhandy::prelude::*;
 use once_cell::sync::OnceCell;

src/widgets/providers/all.rs

@@ -1,10 +1,7 @@
 use super::{ProviderPage, ProviderPageMode};
 use crate::models::{Provider, ProviderSorter, ProvidersModel};
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use gio::ListModelExt;
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use gio::{prelude::*, subclass::ObjectSubclass, ListModelExt};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use row::ProviderActionRow;
 

src/widgets/providers/image.rs

@@ -1,8 +1,6 @@
 use crate::models::Provider;
 use gio::{subclass::ObjectSubclass, FileExt};
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
-use glib::{Receiver, Sender};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*, Receiver, Sender};
 use gtk::{prelude::*, CompositeTemplate};
 
 pub enum ImageAction {

src/widgets/providers/list.rs

@@ -1,9 +1,10 @@
-use crate::config;
-use crate::models::{Account, Provider, ProviderSorter, ProvidersModel};
-use crate::widgets::providers::ProviderRow;
+use crate::{
+    config,
+    models::{Account, Provider, ProviderSorter, ProvidersModel},
+    widgets::providers::ProviderRow,
+};
 use gio::{subclass::ObjectSubclass, ListModelExt};
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 
 mod imp {

src/widgets/providers/mod.rs

@@ -3,8 +3,10 @@ mod image;
 mod list;
 mod page;
 mod row;
-pub use self::all::ProvidersDialog;
-pub use self::image::ProviderImage;
-pub use self::list::ProvidersList;
-pub use self::page::{ProviderPage, ProviderPageMode};
-pub use self::row::ProviderRow;
+pub use self::{
+    all::ProvidersDialog,
+    image::ProviderImage,
+    list::ProvidersList,
+    page::{ProviderPage, ProviderPageMode},
+    row::ProviderRow,
+};

src/widgets/providers/page.rs

@@ -1,9 +1,9 @@
-use crate::models::{Algorithm, OTPMethod, Provider};
-use crate::widgets::ProviderImage;
+use crate::{
+    models::{Algorithm, OTPMethod, Provider},
+    widgets::ProviderImage,
+};
 use gio::subclass::ObjectSubclass;
-use glib::subclass::prelude::*;
-use glib::translate::ToGlib;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*, translate::ToGlib};
 use gtk::{prelude::*, CompositeTemplate};
 use libhandy::ComboRowExt;
 

src/widgets/providers/row.rs

@@ -1,9 +1,9 @@
-use crate::models::{Account, AccountSorter, OTPMethod, Provider};
-use crate::widgets::{accounts::AccountRow, ProviderImage};
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use crate::{
+    models::{Account, AccountSorter, OTPMethod, Provider},
+    widgets::{accounts::AccountRow, ProviderImage},
+};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{clone, glib_object_subclass, glib_wrapper, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use std::cell::RefCell;
 mod imp {

src/widgets/window.rs

@@ -1,14 +1,13 @@
-use crate::application::Application;
-use crate::config;
-use crate::helpers::Keyring;
-use crate::models::{Account, ProvidersModel};
-use crate::widgets::{accounts::QRCodePage, providers::ProvidersList, AccountAddDialog};
-use crate::window_state;
-use gio::prelude::*;
-use gio::subclass::ObjectSubclass;
-use glib::signal::Inhibit;
-use glib::subclass::prelude::*;
-use glib::{clone, glib_object_subclass, glib_wrapper};
+use crate::{
+    application::Application,
+    config,
+    helpers::Keyring,
+    models::{Account, ProvidersModel},
+    widgets::{accounts::QRCodePage, providers::ProvidersList, AccountAddDialog},
+    window_state,
+};
+use gio::{prelude::*, subclass::ObjectSubclass};
+use glib::{clone, glib_object_subclass, glib_wrapper, signal::Inhibit, subclass::prelude::*};
 use gtk::{prelude::*, CompositeTemplate};
 use gtk_macros::{action, get_action};
 use once_cell::sync::OnceCell;