From 4439499cdabc3ecb1fcc96d6ddf5fdfdc55e3a32 Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Thu, 4 Dec 2025 06:14:49 +0100 Subject: [PATCH] code: Reformat with Rust 2024 edition --- src/decoder/formats.rs | 2 +- src/decoder/formats/svg.rs | 2 +- src/editing/preview.rs | 2 +- src/file_model.rs | 10 ++++++---- src/util.rs | 2 +- src/widgets/edit/crop.rs | 4 ++-- src/widgets/edit/crop_selection.rs | 6 +----- src/widgets/edit_window.rs | 4 ++-- src/widgets/error_details.rs | 2 +- src/widgets/image.rs | 2 +- src/widgets/image/loading.rs | 4 ++-- src/widgets/image/rendering.rs | 4 +++- src/widgets/image_page.rs | 9 +++++---- src/widgets/image_view.rs | 4 ++-- src/widgets/properties_view.rs | 2 +- 15 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/decoder/formats.rs b/src/decoder/formats.rs index 1a7c2ea..ddfb485 100644 --- a/src/decoder/formats.rs +++ b/src/decoder/formats.rs @@ -19,6 +19,6 @@ mod glycin_proxy; mod svg; pub use glycin_proxy::Glycin; -pub use svg::{Svg, RSVG_MAX_SIZE}; +pub use svg::{RSVG_MAX_SIZE, Svg}; use super::{DecoderUpdate, UpdateSender}; diff --git a/src/decoder/formats/svg.rs b/src/decoder/formats/svg.rs index 5b84f23..4ec1faf 100644 --- a/src/decoder/formats/svg.rs +++ b/src/decoder/formats/svg.rs @@ -24,8 +24,8 @@ use async_channel as mpsc; use gtk::prelude::*; use super::*; -use crate::decoder::tiling::SharedFrameBuffer; use crate::decoder::TileRequest; +use crate::decoder::tiling::SharedFrameBuffer; use crate::deps::*; use crate::metadata::Metadata; diff --git a/src/editing/preview.rs b/src/editing/preview.rs index dc03f81..d0a0113 100644 --- a/src/editing/preview.rs +++ b/src/editing/preview.rs @@ -87,7 +87,7 @@ impl OperationsSnapshot { if let Err(err) = operation_result { match err { OperationError::EmptyNode => { - return Err(EditingError::EmptyNode(operation.clone())) + return Err(EditingError::EmptyNode(operation.clone())); } } } diff --git a/src/file_model.rs b/src/file_model.rs index 1dcbee2..2d741bc 100644 --- a/src/file_model.rs +++ b/src/file_model.rs @@ -24,8 +24,8 @@ use std::time::Instant; use anyhow::Context; use gio::prelude::*; use gio::subclass::prelude::*; -use glib::subclass::Signal; use glib::GString; +use glib::subclass::Signal; use indexmap::IndexMap; use crate::deps::*; @@ -124,9 +124,11 @@ mod imp { impl ObjectImpl for LpFileModel { fn signals() -> &'static [Signal] { static SIGNALS: LazyLock> = LazyLock::new(|| { - vec![Signal::builder("changed") - .param_types([glib::Type::VARIANT]) - .build()] + vec![ + Signal::builder("changed") + .param_types([glib::Type::VARIANT]) + .build(), + ] }); SIGNALS.as_ref() } diff --git a/src/util.rs b/src/util.rs index a716080..e07ff76 100644 --- a/src/util.rs +++ b/src/util.rs @@ -24,7 +24,7 @@ use std::fmt::{Debug, Write}; use std::path::{Path, PathBuf}; use std::sync::LazyLock; -use anyhow::{anyhow, bail, Context}; +use anyhow::{Context, anyhow, bail}; use gio::prelude::*; use crate::deps::*; diff --git a/src/widgets/edit/crop.rs b/src/widgets/edit/crop.rs index 4389bfd..4239f16 100644 --- a/src/widgets/edit/crop.rs +++ b/src/widgets/edit/crop.rs @@ -27,11 +27,11 @@ use glycin::{Operation, Operations}; use crate::deps::*; use crate::editing::preview::EditingError; +use crate::util::ErrorType; use crate::util::gettext::*; use crate::util::root::ParentWindow; -use crate::util::ErrorType; -use crate::widgets::edit::LpEditCropSelection; use crate::widgets::LpImage; +use crate::widgets::edit::LpEditCropSelection; /// Aspect ratio modes that can be selected #[derive(Debug, Clone, Copy, Default, glib::Enum, glib::Variant)] diff --git a/src/widgets/edit/crop_selection.rs b/src/widgets/edit/crop_selection.rs index 94f3261..2023608 100644 --- a/src/widgets/edit/crop_selection.rs +++ b/src/widgets/edit/crop_selection.rs @@ -377,11 +377,7 @@ mod imp { aspect_ratio, ); - if u.area() > v.area() { - u - } else { - v - } + if u.area() > v.area() { u } else { v } } } else { imp.new_crop_area_aspect_free(&resize, coord) diff --git a/src/widgets/edit_window.rs b/src/widgets/edit_window.rs index 9437396..e0a9cac 100644 --- a/src/widgets/edit_window.rs +++ b/src/widgets/edit_window.rs @@ -22,12 +22,12 @@ use adw::prelude::*; use adw::subclass::prelude::*; use glycin::Operations; -use super::edit::LpEditCrop; use super::LpImage; +use super::edit::LpEditCrop; use crate::deps::*; +use crate::util::ErrorType; use crate::util::gettext::*; use crate::util::root::ParentWindow; -use crate::util::ErrorType; mod imp { use super::*; diff --git a/src/widgets/error_details.rs b/src/widgets/error_details.rs index 1cb0cdc..c6c0689 100644 --- a/src/widgets/error_details.rs +++ b/src/widgets/error_details.rs @@ -20,8 +20,8 @@ use adw::subclass::prelude::*; use gtk::CompositeTemplate; use crate::deps::*; -use crate::util::gettext::*; use crate::util::ErrorType; +use crate::util::gettext::*; mod imp { use super::*; diff --git a/src/widgets/image.rs b/src/widgets/image.rs index e5056ae..5dc5ff9 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -54,7 +54,7 @@ use glib::subclass::Signal; use glib::{Properties, SignalGroup}; use gufo_common::orientation::Orientation; -use crate::decoder::{self, tiling, Decoder, DecoderUpdate}; +use crate::decoder::{self, Decoder, DecoderUpdate, tiling}; use crate::deps::*; use crate::metadata::Metadata; use crate::util::Gesture; diff --git a/src/widgets/image/loading.rs b/src/widgets/image/loading.rs index df06cc4..f83d43c 100644 --- a/src/widgets/image/loading.rs +++ b/src/widgets/image/loading.rs @@ -44,8 +44,8 @@ impl imp::LpImage { self.file.replace(Some(new_file.clone())); self.reload_file_info().await; - // Reload if file extension changed since other decoding path might be responsible - // now + // Reload if file extension changed since other decoding path might be + // responsible now if old_filename_ext != new_filename_ext { obj.load(new_file).await; return; diff --git a/src/widgets/image/rendering.rs b/src/widgets/image/rendering.rs index 881cbda..0d5ff9a 100644 --- a/src/widgets/image/rendering.rs +++ b/src/widgets/image/rendering.rs @@ -168,7 +168,9 @@ impl WidgetImpl for imp::LpImage { log::trace!("Small monitor detected: Using {SMALL_OCCUPY_SCREEN} screen area"); SMALL_OCCUPY_SCREEN } else { - log::trace!("Sufficiently large monitor detected: Using {DEFAULT_OCCUPY_SCREEN} screen area"); + log::trace!( + "Sufficiently large monitor detected: Using {DEFAULT_OCCUPY_SCREEN} screen area" + ); DEFAULT_OCCUPY_SCREEN }; diff --git a/src/widgets/image_page.rs b/src/widgets/image_page.rs index 328f883..eeb6f91 100644 --- a/src/widgets/image_page.rs +++ b/src/widgets/image_page.rs @@ -21,15 +21,15 @@ //! This widget also handles showing the context menu. use adw::subclass::prelude::*; -use glib::{clone, Properties}; -use gtk::prelude::*; +use glib::{Properties, clone}; use gtk::CompositeTemplate; +use gtk::prelude::*; use super::LpErrorDetails; use crate::decoder::DecoderError; use crate::deps::*; -use crate::util::gettext::*; use crate::util::ErrorType; +use crate::util::gettext::*; use crate::widgets::LpImage; mod imp { @@ -225,7 +225,8 @@ impl LpImagePage { // Translators: {} is replaced with a version number let message = gettext_f( "No image loaders available. Maybe the “glycin-loaders” package with compatibility version “{}” is not installed.", - [ format!("{}+", glycin::COMPAT_VERSION)]); + [format!("{}+", glycin::COMPAT_VERSION)], + ); imp.error_page.set_description(Some(&message)); imp.stack.set_visible_child(&*imp.error_page); diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs index b676f2a..6e4ae67 100644 --- a/src/widgets/image_view.rs +++ b/src/widgets/image_view.rs @@ -35,10 +35,10 @@ use std::marker::PhantomData; use adw::prelude::*; use adw::subclass::prelude::*; use anyhow::Context; -use ashpd::desktop::{wallpaper, ResponseError}; +use ashpd::desktop::{ResponseError, wallpaper}; use ashpd::{Error, WindowIdentifier}; use glib::translate::IntoGlib; -use glib::{clone, Properties}; +use glib::{Properties, clone}; use gtk::CompositeTemplate; use crate::decoder::DecoderError; diff --git a/src/widgets/properties_view.rs b/src/widgets/properties_view.rs index d4eec5d..ff4f0fa 100644 --- a/src/widgets/properties_view.rs +++ b/src/widgets/properties_view.rs @@ -22,8 +22,8 @@ use std::cell::{OnceCell, RefCell}; use adw::prelude::*; use adw::subclass::prelude::*; -use glib::translate::IntoGlib; use glib::Properties; +use glib::translate::IntoGlib; use gtk::CompositeTemplate; use crate::deps::*;