diff --git a/examples/app_library/app_group/imp.rs b/examples/app_library/app_group/imp.rs index 734e1b7..68a5ee7 100644 --- a/examples/app_library/app_group/imp.rs +++ b/examples/app_library/app_group/imp.rs @@ -142,7 +142,7 @@ impl ObjectImpl for AppGroup { .get::() .expect("The icon needs to be a Variant"), ) - .expect("The icon variant needs to be a Vec"); + .expect("The icon variant needs to be a Vec"); self.data.borrow_mut().app_names = appnames; } _ => unimplemented!(), diff --git a/examples/app_library/app_group/mod.rs b/examples/app_library/app_group/mod.rs index 8b3622d..2e674ba 100644 --- a/examples/app_library/app_group/mod.rs +++ b/examples/app_library/app_group/mod.rs @@ -20,7 +20,7 @@ impl AppGroup { ("icon", &data.icon), ("category", &data.category), ]) - .expect("Failed to create `ApplicationObject`."); + .expect("Failed to create `ApplicationObject`."); if let Err(e) = self_.set_property("appnames", data.app_names.to_variant()) { println!("failed to set category icon property"); dbg!(e); diff --git a/examples/app_library/grid_item/imp.rs b/examples/app_library/grid_item/imp.rs index 3a7d22a..2043f4e 100644 --- a/examples/app_library/grid_item/imp.rs +++ b/examples/app_library/grid_item/imp.rs @@ -1,10 +1,10 @@ use std::cell::Cell; -use gtk4 as gtk; -use gtk::CompositeTemplate; use gtk::glib; use gtk::prelude::*; use gtk::subclass::prelude::*; +use gtk::CompositeTemplate; +use gtk4 as gtk; #[derive(Debug, Default, CompositeTemplate)] #[template(file = "grid_item.ui")] diff --git a/examples/app_library/grid_item/mod.rs b/examples/app_library/grid_item/mod.rs index da1d8e6..2eed274 100644 --- a/examples/app_library/grid_item/mod.rs +++ b/examples/app_library/grid_item/mod.rs @@ -2,13 +2,13 @@ use gdk4::ContentProvider; use gdk4::Display; use gio::File; use gio::Icon; -use gtk::{gio, glib}; -use gtk4 as gtk; -use gtk4::DragSource; -use gtk4::IconTheme; -use gtk4::traits::WidgetExt; use gtk::prelude::*; use gtk::subclass::prelude::*; +use gtk::{gio, glib}; +use gtk4 as gtk; +use gtk4::traits::WidgetExt; +use gtk4::DragSource; +use gtk4::IconTheme; use crate::app_group::AppGroup; diff --git a/examples/app_library/main.rs b/examples/app_library/main.rs index ae3e90b..527b1d2 100644 --- a/examples/app_library/main.rs +++ b/examples/app_library/main.rs @@ -1,8 +1,8 @@ +use gtk::gdk::Display; +use gtk::prelude::*; use gtk4 as gtk; use gtk4::CssProvider; use gtk4::StyleContext; -use gtk::gdk::Display; -use gtk::prelude::*; use once_cell::sync::OnceCell; use x11rb::rust_connection::RustConnection; diff --git a/examples/app_library/window/imp.rs b/examples/app_library/window/imp.rs index 13694ed..a60c8cd 100644 --- a/examples/app_library/window/imp.rs +++ b/examples/app_library/window/imp.rs @@ -2,12 +2,12 @@ use std::fs::File; use glib::signal::Inhibit; use glib::subclass::InitializingObject; +use gtk::prelude::*; +use gtk::subclass::prelude::*; use gtk::{gio, glib}; use gtk::{CompositeTemplate, GridView, SearchEntry}; use gtk4 as gtk; use gtk4::ScrolledWindow; -use gtk::prelude::*; -use gtk::subclass::prelude::*; use once_cell::sync::OnceCell; use crate::app_group::AppGroup; diff --git a/examples/app_library/window/mod.rs b/examples/app_library/window/mod.rs index 0405a7b..955e5ad 100644 --- a/examples/app_library/window/mod.rs +++ b/examples/app_library/window/mod.rs @@ -6,14 +6,14 @@ use gdk4_x11::X11Surface; use glib::FromVariant; use glib::Object; use glib::Variant; +use gtk::prelude::*; +use gtk::subclass::prelude::*; use gtk::{gio, glib}; use gtk::{Application, SignalListItemFactory}; use gtk4 as gtk; use gtk4::Dialog; use gtk4::Entry; use gtk4::Label; -use gtk::prelude::*; -use gtk::subclass::prelude::*; use x11rb::connection::Connection; use x11rb::protocol::xproto; use x11rb::protocol::xproto::ConnectionExt; @@ -172,10 +172,10 @@ impl Window { category: "".to_string(), }), ] - .iter() - .for_each(|group| { - group_model.append(group); - }); + .iter() + .for_each(|group| { + group_model.append(group); + }); let group_selection = gtk4::SingleSelection::new(Some(&group_model)); imp.group_grid_view.set_model(Some(&group_selection)); } diff --git a/examples/dock/dock_item/imp.rs b/examples/dock/dock_item/imp.rs index 63154bc..a35252c 100644 --- a/examples/dock/dock_item/imp.rs +++ b/examples/dock/dock_item/imp.rs @@ -1,8 +1,8 @@ -use gtk4 as gtk; -use gtk::CompositeTemplate; use gtk::glib; use gtk::prelude::*; use gtk::subclass::prelude::*; +use gtk::CompositeTemplate; +use gtk4 as gtk; #[derive(Debug, Default, CompositeTemplate)] #[template(file = "dock_item.ui")] diff --git a/examples/dock/dock_item/mod.rs b/examples/dock/dock_item/mod.rs index d652d59..6fb2960 100644 --- a/examples/dock/dock_item/mod.rs +++ b/examples/dock/dock_item/mod.rs @@ -1,9 +1,9 @@ use gio::DesktopAppInfo; use gio::Icon; -use gtk4 as gtk; use gtk::glib; use gtk::prelude::*; use gtk::subclass::prelude::*; +use gtk4 as gtk; use crate::dock_object::DockObject; use crate::utils::BoxedWindowList; diff --git a/examples/dock/main.rs b/examples/dock/main.rs index eccb432..6b83f0a 100644 --- a/examples/dock/main.rs +++ b/examples/dock/main.rs @@ -4,13 +4,13 @@ use std::time::Duration; use futures::executor::block_on; use gdk4::Display; use gio::DesktopAppInfo; -use gtk4 as gtk; -use gtk4::CssProvider; -use gtk4::StyleContext; -use gtk::Application; use gtk::gio; use gtk::glib; use gtk::prelude::*; +use gtk::Application; +use gtk4 as gtk; +use gtk4::CssProvider; +use gtk4::StyleContext; use once_cell::sync::OnceCell; use postage::mpsc::Sender; use postage::prelude::*; @@ -132,7 +132,7 @@ fn main() { match event { Event::Activate(e) => { let _activate_window = zbus_conn - .call_method(Some(DEST), PATH, Some(DEST), "WindowFocus", &((e, ))) + .call_method(Some(DEST), PATH, Some(DEST), "WindowFocus", &((e,))) .await .expect("Failed to focus selected window"); } @@ -226,16 +226,16 @@ fn main() { // skip if equal if cached_results.len() == results.len() && results.iter().zip(cached_results.iter()).fold( - 0, - |acc, z: (&Item, &Item)| { - let (a, b) = z; - if a.name == b.name { - acc + 1 - } else { - acc - } - }, - ) == cached_results.len() + 0, + |acc, z: (&Item, &Item)| { + let (a, b) = z; + if a.name == b.name { + acc + 1 + } else { + acc + } + }, + ) == cached_results.len() { continue; // skip this update } diff --git a/examples/dock/window/imp.rs b/examples/dock/window/imp.rs index 078fc28..be51192 100644 --- a/examples/dock/window/imp.rs +++ b/examples/dock/window/imp.rs @@ -1,8 +1,10 @@ use std::cell::RefCell; use std::rc::Rc; -use glib::SignalHandlerId; use glib::subclass::InitializingObject; +use glib::SignalHandlerId; +use gtk::prelude::*; +use gtk::subclass::prelude::*; use gtk::{gio, glib}; use gtk::{CompositeTemplate, ListView}; use gtk4 as gtk; @@ -11,8 +13,6 @@ use gtk4::DragSource; use gtk4::DropTarget; use gtk4::EventControllerMotion; use gtk4::Revealer; -use gtk::prelude::*; -use gtk::subclass::prelude::*; use once_cell::sync::OnceCell; // Object holding the state diff --git a/examples/dock/window/mod.rs b/examples/dock/window/mod.rs index 2e3e785..25fba1c 100644 --- a/examples/dock/window/mod.rs +++ b/examples/dock/window/mod.rs @@ -11,16 +11,16 @@ use gio::Icon; // use crate::application_row::ApplicationRow; use glib::Object; use glib::Type; +use gtk::prelude::*; +use gtk::subclass::prelude::*; use gtk::{gio, glib}; use gtk::{Application, SignalListItemFactory}; use gtk4 as gtk; +use gtk4::prelude::ListModelExt; use gtk4::DragSource; use gtk4::DropTarget; use gtk4::EventControllerMotion; use gtk4::IconTheme; -use gtk4::prelude::ListModelExt; -use gtk::prelude::*; -use gtk::subclass::prelude::*; use postage::prelude::Sink; use x11rb::connection::Connection; use x11rb::protocol::xproto; @@ -32,9 +32,9 @@ use crate::BoxedWindowList; // use crate::ApplicationObject; use crate::dock_item::DockItem; use crate::dock_object::DockObject; +use crate::utils::data_path; use crate::Event; use crate::TX; -use crate::utils::data_path; use crate::X11_CONN; mod imp; diff --git a/examples/launcher/main.rs b/examples/launcher/main.rs index 0aa5985..d9f033d 100644 --- a/examples/launcher/main.rs +++ b/examples/launcher/main.rs @@ -1,12 +1,12 @@ use gdk4::Display; use gio::DesktopAppInfo; -use gtk4 as gtk; -use gtk4::CssProvider; -use gtk4::StyleContext; -use gtk::Application; use gtk::gio; use gtk::glib; use gtk::prelude::*; +use gtk::Application; +use gtk4 as gtk; +use gtk4::CssProvider; +use gtk4::StyleContext; use once_cell::sync::OnceCell; use pop_launcher_service::IpcClient; use postage::mpsc::Sender; diff --git a/examples/launcher/search_result_row/imp.rs b/examples/launcher/search_result_row/imp.rs index 8b64e79..eacf66c 100644 --- a/examples/launcher/search_result_row/imp.rs +++ b/examples/launcher/search_result_row/imp.rs @@ -1,8 +1,8 @@ -use gtk4 as gtk; -use gtk::CompositeTemplate; use gtk::glib; use gtk::prelude::*; use gtk::subclass::prelude::*; +use gtk::CompositeTemplate; +use gtk4 as gtk; #[derive(Debug, Default, CompositeTemplate)] #[template(file = "application_row.ui")] diff --git a/examples/launcher/search_result_row/mod.rs b/examples/launcher/search_result_row/mod.rs index 9cb393f..8bf1238 100644 --- a/examples/launcher/search_result_row/mod.rs +++ b/examples/launcher/search_result_row/mod.rs @@ -1,10 +1,10 @@ -use gtk4 as gtk; use gtk::glib; use gtk::prelude::*; use gtk::subclass::prelude::*; +use gtk4 as gtk; -use crate::BoxedSearchResult; use crate::icon_source; +use crate::BoxedSearchResult; use crate::SearchResultObject; mod imp; diff --git a/examples/launcher/window/imp.rs b/examples/launcher/window/imp.rs index 36f3be9..7cec1b2 100644 --- a/examples/launcher/window/imp.rs +++ b/examples/launcher/window/imp.rs @@ -1,9 +1,9 @@ use glib::subclass::InitializingObject; +use gtk::prelude::*; +use gtk::subclass::prelude::*; use gtk::{gio, glib}; use gtk::{CompositeTemplate, Entry, ListView}; use gtk4 as gtk; -use gtk::prelude::*; -use gtk::subclass::prelude::*; use once_cell::sync::OnceCell; // Object holding the state diff --git a/examples/launcher/window/mod.rs b/examples/launcher/window/mod.rs index e81ca1c..ab9e10f 100644 --- a/examples/launcher/window/mod.rs +++ b/examples/launcher/window/mod.rs @@ -2,11 +2,11 @@ use gdk4::Rectangle; use gdk4_x11::X11Display; use gdk4_x11::X11Surface; use glib::Object; +use gtk::prelude::*; +use gtk::subclass::prelude::*; use gtk::{gio, glib}; use gtk::{Application, SignalListItemFactory}; use gtk4 as gtk; -use gtk::prelude::*; -use gtk::subclass::prelude::*; use postage::prelude::Sink; use x11rb::connection::Connection; use x11rb::protocol::xproto;