rustfmt: run with automerge enabled

This commit is contained in:
Bilal Elmoussaoui 2021-01-22 21:40:48 +01:00
parent adab1fd7f3
commit fac2ae8ad5
18 changed files with 28 additions and 42 deletions

View File

@ -6,8 +6,7 @@ use crate::{
};
use gettextrs::gettext;
use glib::clone;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*};
use gtk::{gio, glib, prelude::*, subclass::prelude::*};
use gtk_macros::{action, get_action};
use std::env;

View File

@ -2,15 +2,17 @@ use super::{
provider::{DiProvider, Provider},
OTPMethod, OTPUri,
};
use crate::models::otp;
use crate::widgets::QRCodeData;
use crate::{helpers::Keyring, models::database, schema::accounts};
use crate::{
helpers::Keyring,
models::{database, otp},
schema::accounts,
widgets::QRCodeData,
};
use anyhow::Result;
use core::cmp::Ordering;
use diesel::{BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl};
use glib::{clone, Cast, ObjectExt, StaticType, ToValue};
use gtk::glib;
use gtk::subclass::prelude::*;
use gtk::{glib, subclass::prelude::*};
use once_cell::sync::OnceCell;
use std::{
cell::{Cell, RefCell},

View File

@ -1,7 +1,6 @@
use super::account::Account;
use glib::StaticType;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*};
use gtk::{gio, glib, prelude::*, subclass::prelude::*};
mod imp {
use super::*;

View File

@ -1,5 +1,7 @@
use super::algorithm::{Algorithm, OTPMethod};
use super::CLIENT;
use super::{
algorithm::{Algorithm, OTPMethod},
CLIENT,
};
use crate::{
models::{database, Account, AccountsModel, FaviconError, FaviconScrapper},
schema::providers,
@ -9,8 +11,7 @@ use async_std::prelude::*;
use core::cmp::Ordering;
use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
use glib::{Cast, StaticType, ToValue};
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*};
use gtk::{gio, glib, prelude::*, subclass::prelude::*};
use std::{
cell::{Cell, RefCell},
str::FromStr,

View File

@ -1,8 +1,7 @@
use super::{Account, Algorithm, OTPMethod, Provider};
use anyhow::Result;
use glib::StaticType;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*};
use gtk::{gio, glib, prelude::*, subclass::prelude::*};
mod imp {
use super::*;

View File

@ -5,8 +5,7 @@ use crate::{
};
use anyhow::Result;
use glib::{clone, signal::Inhibit};
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
use gtk_macros::{action, get_action};
use once_cell::sync::OnceCell;

View File

@ -1,7 +1,6 @@
use super::qrcode_paintable::QRCodePaintable;
use crate::{models::Account, widgets::UrlRow};
use gtk::subclass::prelude::*;
use gtk::{glib, prelude::*, CompositeTemplate};
use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
mod imp {
use super::*;

View File

@ -1,6 +1,4 @@
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::{gdk, glib, graphene};
use gtk::{gdk, glib, graphene, prelude::*, subclass::prelude::*};
#[derive(Debug, Clone)]
pub struct QRCodeData {

View File

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

View File

@ -1,7 +1,6 @@
use crate::{config, helpers::Keyring};
use glib::clone;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
use gtk_macros::{action, get_action};
use once_cell::sync::OnceCell;
use std::cell::Cell;

View File

@ -8,8 +8,7 @@ use adw::prelude::*;
use anyhow::Result;
use gettextrs::gettext;
use glib::clone;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
use once_cell::sync::OnceCell;
mod imp {

View File

@ -1,8 +1,7 @@
use super::{ProviderPage, ProviderPageMode};
use crate::models::{Provider, ProviderSorter, ProvidersModel};
use glib::clone;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
use row::ProviderActionRow;
mod imp {

View File

@ -1,7 +1,6 @@
use crate::models::Provider;
use glib::{clone, Receiver, Sender};
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
pub enum ImageAction {
Ready(gio::File),

View File

@ -4,8 +4,7 @@ use crate::{
widgets::providers::ProviderRow,
};
use glib::clone;
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
mod imp {
use super::*;

View File

@ -4,8 +4,7 @@ use crate::{
};
use adw::ComboRowExt;
use glib::{clone, translate::ToGlib};
use gtk::subclass::prelude::*;
use gtk::{glib, prelude::*, CompositeTemplate};
use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
pub enum ProviderPageMode {
Create,

View File

@ -2,8 +2,7 @@ use crate::{
models::{Account, AccountSorter, OTPMethod, Provider},
widgets::{accounts::AccountRow, ProviderImage},
};
use gtk::subclass::prelude::*;
use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
mod imp {

View File

@ -1,7 +1,6 @@
use adw::ActionRowExt;
use glib::{clone, ObjectExt, ToValue};
use gtk::subclass::prelude::*;
use gtk::{glib, WidgetExt};
use gtk::{glib, subclass::prelude::*, WidgetExt};
mod imp {
use super::*;

View File

@ -7,8 +7,7 @@ use crate::{
window_state,
};
use glib::{clone, signal::Inhibit};
use gtk::subclass::prelude::*;
use gtk::{gio, glib, prelude::*, CompositeTemplate};
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
use gtk_macros::{action, get_action};
use once_cell::sync::OnceCell;