From 2648295a18b6f0a70aaad6cd302911d636d8fe87 Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Wed, 6 Dec 2023 23:45:02 +0100 Subject: [PATCH] code: Reformat with group_imports=StdExternalCrate --- .rustfmt.toml | 1 + src/application.rs | 7 +++---- src/decoder/formats/glycin_proxy.rs | 10 +++++----- src/decoder/formats/svg.rs | 12 ++++++------ src/decoder/mod.rs | 15 ++++++--------- src/decoder/tiling.rs | 10 +++++----- src/file_model.rs | 9 +++++---- src/metadata/mod.rs | 3 +-- src/util/mod.rs | 8 ++++---- src/widgets/drag_overlay.rs | 6 +++--- src/widgets/image.rs | 21 ++++++++++----------- src/widgets/image_page.rs | 6 +++--- src/widgets/image_view.rs | 14 +++++++------- src/widgets/print.rs | 12 ++++++------ src/widgets/print_preview.rs | 6 +++--- src/widgets/properties_view.rs | 9 ++++----- src/widgets/sliding_view.rs | 9 +++++---- src/window.rs | 18 +++++++++--------- 18 files changed, 86 insertions(+), 90 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index ad0a8a0d..022fb016 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,3 +1,4 @@ format_code_in_doc_comments = true +group_imports = "StdExternalCrate" imports_granularity = "Module" wrap_comments = true diff --git a/src/application.rs b/src/application.rs index 586f167a..ec0ab522 100644 --- a/src/application.rs +++ b/src/application.rs @@ -1,6 +1,7 @@ // Copyright (c) 2020-2023 Christopher Davis // Copyright (c) 2022-2023 Sophie Herold // Copyright (c) 2022-2023 Sabri Ünal +// Copyright (c) 2023 Matteo Nardi // Copyright (c) 2023 Julian Hofer // Copyright (c) 2023 Huan Nguyen // @@ -19,14 +20,12 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -use crate::about; -use crate::deps::*; - use adw::prelude::*; use adw::subclass::prelude::*; -use crate::config; +use crate::deps::*; use crate::window::LpWindow; +use crate::{about, config}; mod imp { use super::*; diff --git a/src/decoder/formats/glycin_proxy.rs b/src/decoder/formats/glycin_proxy.rs index b48ffb13..5411afb8 100644 --- a/src/decoder/formats/glycin_proxy.rs +++ b/src/decoder/formats/glycin_proxy.rs @@ -16,15 +16,15 @@ // SPDX-License-Identifier: GPL-3.0-or-later //! Decode using glycin -use super::*; -use crate::decoder::tiling::{self, FrameBufferExt}; -use crate::deps::*; -use crate::metadata::{ImageFormat, Metadata}; +use std::sync::Arc; use arc_swap::ArcSwap; use gtk::prelude::*; -use std::sync::Arc; +use super::*; +use crate::decoder::tiling::{self, FrameBufferExt}; +use crate::deps::*; +use crate::metadata::{ImageFormat, Metadata}; pub const FRAME_BUFFER: usize = 3; diff --git a/src/decoder/formats/svg.rs b/src/decoder/formats/svg.rs index f861bc42..373d43fd 100644 --- a/src/decoder/formats/svg.rs +++ b/src/decoder/formats/svg.rs @@ -16,18 +16,18 @@ // SPDX-License-Identifier: GPL-3.0-or-later //! Decode using librsvg -use super::*; -use crate::decoder::tiling::{self, FrameBufferExt}; -use crate::decoder::TileRequest; -use crate::deps::*; -use crate::metadata::ImageFormat; +use std::sync::Arc; use anyhow::Context; use arc_swap::ArcSwap; use async_channel as mpsc; use gtk::prelude::*; -use std::sync::Arc; +use super::*; +use crate::decoder::tiling::{self, FrameBufferExt}; +use crate::decoder::TileRequest; +use crate::deps::*; +use crate::metadata::ImageFormat; /// Current librsvg limit on maximum dimensions. See /// diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index 52fabde6..5d706503 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -20,20 +20,17 @@ pub mod formats; pub mod tiling; -pub use formats::ImageDimensionDetails; - -use crate::deps::*; -use crate::metadata::{ImageFormat, Metadata}; -use formats::*; -use tiling::FrameBufferExt; +use std::sync::Arc; use anyhow::Result; use arc_swap::ArcSwap; +use formats::*; +pub use formats::{ImageDimensionDetails, RSVG_MAX_SIZE}; use futures::channel::mpsc; +use tiling::FrameBufferExt; -use std::sync::Arc; - -pub use formats::RSVG_MAX_SIZE; +use crate::deps::*; +use crate::metadata::{ImageFormat, Metadata}; #[derive(Clone, Copy, Debug)] /// Renderer requests new tiles diff --git a/src/decoder/tiling.rs b/src/decoder/tiling.rs index d19dc1ba..489d2d30 100644 --- a/src/decoder/tiling.rs +++ b/src/decoder/tiling.rs @@ -26,15 +26,15 @@ //! be re-genearted for each zoom level. It can also be used to allow //! showing large JPEGs etc where the complete decoded image would not //! even fit in the VRAM. -use super::{DecoderUpdate, ImageDimensionDetails, UpdateSender}; -use crate::deps::*; +use std::collections::{BTreeMap, VecDeque}; +use std::sync::Arc; +use std::time::Duration; use arc_swap::ArcSwap; use gtk::prelude::*; -use std::collections::{BTreeMap, VecDeque}; -use std::sync::Arc; -use std::time::Duration; +use super::{DecoderUpdate, ImageDimensionDetails, UpdateSender}; +use crate::deps::*; const ZOOM_SIGNIFICANT_DIGITS: i32 = 6; pub const MIN_TILE_SIZE: u16 = 500; diff --git a/src/file_model.rs b/src/file_model.rs index 553c9631..c5180fc8 100644 --- a/src/file_model.rs +++ b/src/file_model.rs @@ -18,9 +18,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -use crate::deps::*; -use crate::util; -use crate::util::gettext::*; +use std::cell::{OnceCell, RefCell}; use anyhow::Context; use gio::prelude::*; @@ -29,7 +27,10 @@ use glib::subclass::Signal; use glib::GString; use indexmap::IndexMap; use once_cell::sync::Lazy; -use std::cell::{OnceCell, RefCell}; + +use crate::deps::*; +use crate::util; +use crate::util::gettext::*; mod imp { use super::*; diff --git a/src/metadata/mod.rs b/src/metadata/mod.rs index 30a3d616..6eb323b2 100644 --- a/src/metadata/mod.rs +++ b/src/metadata/mod.rs @@ -29,11 +29,10 @@ pub use file::FileInfo; pub use format::ImageFormat; pub use gps::GPSLocation; +use crate::deps::*; use crate::util; use crate::util::gettext::*; -use crate::deps::*; - #[derive(Default)] pub struct Metadata { exif: Option, diff --git a/src/util/mod.rs b/src/util/mod.rs index c254b419..67f52d31 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -18,15 +18,15 @@ pub mod gettext; -use crate::deps::*; -use crate::util::gettext::*; +use std::fmt::{Debug, Write}; +use std::path::{Path, PathBuf}; use anyhow::{anyhow, bail, Context}; use gio::prelude::*; use once_cell::sync::Lazy; -use std::fmt::{Debug, Write}; -use std::path::{Path, PathBuf}; +use crate::deps::*; +use crate::util::gettext::*; /// Returns localized date + time format pub fn datetime_fmt(datetime: &glib::DateTime) -> Option { diff --git a/src/widgets/drag_overlay.rs b/src/widgets/drag_overlay.rs index e8df24c5..a5e10307 100644 --- a/src/widgets/drag_overlay.rs +++ b/src/widgets/drag_overlay.rs @@ -20,14 +20,14 @@ //! //! This implementation is inspired by [Amberol](https://gitlab.gnome.org/World/amberol) -use crate::deps::*; use adw::prelude::*; -mod imp { - use once_cell::sync::OnceCell; +use crate::deps::*; +mod imp { use adw::subclass::prelude::*; use glib::{ParamSpec, Properties, Value}; + use once_cell::sync::OnceCell; use super::*; diff --git a/src/widgets/image.rs b/src/widgets/image.rs index 80bbe350..6c74ba5b 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2021, 2023 Christopher Davis +// Copyright (c) 2021 Christopher Davis // Copyright (c) 2022-2023 Sophie Herold // Copyright (c) 2023 Julian Hofer // Copyright (c) 2023 Lubosz Sarnecki @@ -41,12 +41,10 @@ mod rotation; mod scrollable; mod zoom; -use crate::deps::*; - -use crate::decoder::tiling::FrameBufferExt; -use crate::decoder::{self, tiling, Decoder, DecoderUpdate}; -use crate::metadata::Metadata; -use crate::util::Gesture; +use std::cell::{Cell, OnceCell, RefCell}; +use std::marker::PhantomData; +use std::ops::Deref; +use std::sync::Arc; use adw::prelude::*; use adw::subclass::prelude::*; @@ -56,10 +54,11 @@ use glib::subclass::Signal; use glib::{Properties, SignalGroup}; use once_cell::sync::Lazy; -use std::cell::{Cell, OnceCell, RefCell}; -use std::marker::PhantomData; -use std::ops::Deref; -use std::sync::Arc; +use crate::decoder::tiling::FrameBufferExt; +use crate::decoder::{self, tiling, Decoder, DecoderUpdate}; +use crate::deps::*; +use crate::metadata::Metadata; +use crate::util::Gesture; /// Default background color around images and behind transparent images /// `#242424` diff --git a/src/widgets/image_page.rs b/src/widgets/image_page.rs index b4eafadb..5a700ce7 100644 --- a/src/widgets/image_page.rs +++ b/src/widgets/image_page.rs @@ -21,14 +21,14 @@ //! //! This widget also handles showing the context menu. -use crate::deps::*; -use crate::widgets::LpImage; - use adw::subclass::prelude::*; use glib::{clone, Properties}; use gtk::prelude::*; use gtk::CompositeTemplate; +use crate::deps::*; +use crate::widgets::LpImage; + mod imp { use super::*; diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs index b53d5e5b..5f90d647 100644 --- a/src/widgets/image_view.rs +++ b/src/widgets/image_view.rs @@ -30,11 +30,8 @@ //! [`LpSlidingView`]: crate::widgets::LpSlidingView //! [`LpFileModel`]: crate::file_model::LpFileModel -use crate::deps::*; -use crate::file_model::LpFileModel; -use crate::util::gettext::*; -use crate::util::{Direction, Position}; -use crate::widgets::{LpImage, LpImagePage, LpPrint, LpSlidingView}; +use std::cell::{Cell, OnceCell, RefCell}; +use std::marker::PhantomData; use adw::prelude::*; use adw::subclass::prelude::*; @@ -45,8 +42,11 @@ use glib::translate::IntoGlib; use glib::{clone, Properties}; use gtk::CompositeTemplate; -use std::cell::{Cell, OnceCell, RefCell}; -use std::marker::PhantomData; +use crate::deps::*; +use crate::file_model::LpFileModel; +use crate::util::gettext::*; +use crate::util::{Direction, Position}; +use crate::widgets::{LpImage, LpImagePage, LpPrint, LpSlidingView}; // The number of pages we want to buffer // on either side of the current page. diff --git a/src/widgets/print.rs b/src/widgets/print.rs index 4458dbb9..7eccae67 100644 --- a/src/widgets/print.rs +++ b/src/widgets/print.rs @@ -18,10 +18,8 @@ //! The print layout widget that also coordinates the print process -use crate::decoder; -use crate::deps::*; -use crate::util::gettext::*; -use crate::widgets::{LpImage, LpPrintPreview}; +use std::cell::{Cell, RefCell}; +use std::rc::Rc; use adw::prelude::*; use adw::subclass::prelude::*; @@ -29,8 +27,10 @@ use glib::Properties; use gtk::CompositeTemplate; use once_cell::sync::OnceCell; -use std::cell::{Cell, RefCell}; -use std::rc::Rc; +use crate::decoder; +use crate::deps::*; +use crate::util::gettext::*; +use crate::widgets::{LpImage, LpPrintPreview}; #[derive(Default, Clone, Copy)] struct PageAlignment { diff --git a/src/widgets/print_preview.rs b/src/widgets/print_preview.rs index d545d2b6..34d96d38 100644 --- a/src/widgets/print_preview.rs +++ b/src/widgets/print_preview.rs @@ -17,14 +17,14 @@ //! Print preview widget that shows a fake page with the image on it -use crate::deps::*; -use crate::widgets::LpPrint; - use adw::subclass::prelude::*; use glib::Properties; use gtk::prelude::*; use once_cell::sync::OnceCell; +use crate::deps::*; +use crate::widgets::LpPrint; + mod imp_page { use super::*; diff --git a/src/widgets/properties_view.rs b/src/widgets/properties_view.rs index d7a55ca0..60c0fe96 100644 --- a/src/widgets/properties_view.rs +++ b/src/widgets/properties_view.rs @@ -16,17 +16,16 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -use crate::decoder::ImageDimensionDetails; -use crate::deps::*; -use crate::util; +use std::cell::{OnceCell, RefCell}; use adw::prelude::*; use adw::subclass::prelude::*; use glib::Properties; use gtk::CompositeTemplate; -use std::cell::{OnceCell, RefCell}; - +use crate::decoder::ImageDimensionDetails; +use crate::deps::*; +use crate::util; use crate::widgets::image::LpImage; const FALLBACK: &str = "–"; diff --git a/src/widgets/sliding_view.rs b/src/widgets/sliding_view.rs index 5efed5b7..9282e9a1 100644 --- a/src/widgets/sliding_view.rs +++ b/src/widgets/sliding_view.rs @@ -22,8 +22,7 @@ //! //! This widget it similar to `AdwCarousel`. -use crate::deps::*; -use crate::widgets::LpImagePage; +use std::cell::{Cell, OnceCell, RefCell}; use adw::prelude::*; use adw::subclass::prelude::*; @@ -31,7 +30,8 @@ use glib::Properties; use indexmap::IndexMap; use once_cell::sync::Lazy; -use std::cell::{Cell, OnceCell, RefCell}; +use crate::deps::*; +use crate::widgets::LpImagePage; static SCROLL_DAMPING_RATIO: f64 = 1.; static SCROLL_MASS: f64 = 0.5; @@ -46,9 +46,10 @@ static PAGE_SPACING_FIXED: f32 = 25.; const PAGE_SPACING_PERCENT: f32 = 0.02; mod imp { - use super::*; use glib::subclass::Signal; + use super::*; + #[derive(Default, Properties)] #[properties(wrapper_type = super::LpSlidingView)] pub struct LpSlidingView { diff --git a/src/window.rs b/src/window.rs index db69af6c..ed4359c6 100644 --- a/src/window.rs +++ b/src/window.rs @@ -2,6 +2,7 @@ // Copyright (c) 2022-2023 Sophie Herold // Copyright (c) 2022 Elton A Rodrigues // Copyright (c) 2022 Maximiliano Sandoval R +// Copyright (c) 2023 Matteo Nardi // Copyright (c) 2023 Julian Hofer // Copyright (c) 2023 FineFindus // Copyright (c) 2023 qwel @@ -24,19 +25,18 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -use crate::deps::*; -use crate::util::gettext::*; +use std::cell::{Cell, OnceCell, RefCell}; +use std::path::{Path, PathBuf}; use adw::prelude::*; use adw::subclass::prelude::*; use glib::clone; use gtk::CompositeTemplate; -use std::cell::{Cell, OnceCell, RefCell}; -use std::path::{Path, PathBuf}; - use crate::application::LpApplication; use crate::config; +use crate::deps::*; +use crate::util::gettext::*; use crate::util::{Direction, Position}; use crate::widgets::{LpDragOverlay, LpImage, LpImageView, LpPropertiesView}; @@ -789,12 +789,12 @@ impl LpWindow { imp.properties_button.set_sensitive(has_image); } - /// When the image-properties sidebar is displayed or hidden, we should update the - /// "show-properties" setting. + /// When the image-properties sidebar is displayed or hidden, we should + /// update the "show-properties" setting. fn on_properties_button_toggled(&self) { let imp = self.imp(); - // When no image is shown, we skip this update as the sidebar should always be hidden. - // This can happen when deleting a picture. + // When no image is shown, we skip this update as the sidebar should always be + // hidden. This can happen when deleting a picture. if imp.image_view.current_page().is_none() { return; } -- GitLab