code: Reformat with Rust 2024 edition

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};

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;
 

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()));
                     }
                 }
             }

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<Vec<Signal>> = LazyLock::new(|| {
-                vec![Signal::builder("changed")
+                vec![
-                    .param_types([glib::Type::VARIANT])
+                    Signal::builder("changed")
-                    .build()]
+                        .param_types([glib::Type::VARIANT])
+                        .build(),
+                ]
             });
             SIGNALS.as_ref()
         }

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::*;

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)]

src/widgets/edit/crop_selection.rs

@@ -377,11 +377,7 @@ mod imp {
                                     aspect_ratio,
                                 );
 
-                                if u.area() > v.area() {
+                                if u.area() > v.area() { u } else { v }
-                                    u
-                                } else {
-                                    v
-                                }
                             }
                         } else {
                             imp.new_crop_area_aspect_free(&resize, coord)

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::*;

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::*;

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;

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
+        // Reload if file extension changed since other decoding path might be
-        // now
+        // responsible now
         if old_filename_ext != new_filename_ext {
             obj.load(new_file).await;
             return;

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
                 };
 

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 glib::{Properties, clone};
-use gtk::prelude::*;
 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);

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;

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::*;