fjordgard

commit 3d8cde01759b40d2b9a5dea1c30cfbceff34f66b
parent 80e30620cacbb478d59d5eab69dd4d95c9faa764
Author: Sylvia Ivory <git@sivory.net>
Date:   Thu, 19 Jun 2025 19:21:07 -0700

Resolve clippy warnings

Diffstat:
M
src/background.rs
 | 
21
++++++++++++---------
M
src/main.rs
 | 
22
++++++++++++++--------

2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/background.rs b/src/background.rs
@@ -60,7 +60,7 @@ pub struct BackgroundHandle {
 #[derive(Debug, Clone)]
 pub enum Message {
     BackgroundRead(Result<Vec<u8>, String>),
-    UnsplashCollection(Result<Collection, String>),
+    UnsplashCollection(Box<Result<Collection, String>>),
     UnsplashCollectionPhotos(Result<CollectionPhotos, String>),
     RequestUnsplash(isize),
     PauseUnsplash,
@@ -127,8 +127,9 @@ impl BackgroundHandle {
                     let collection = self.background.clone();
                     let client = self.unsplash_client.clone().unwrap();
 
-                    Task::future(async move { client.collection(&collection).await })
-                        .map(|r| Message::UnsplashCollection(r.map_err(|e| e.to_string())))
+                    Task::future(async move { client.collection(&collection).await }).map(|r| {
+                        Message::UnsplashCollection(Box::new(r.map_err(|e| e.to_string())))
+                    })
                 } else {
                     Task::none()
                 }
@@ -149,7 +150,7 @@ impl BackgroundHandle {
                     Task::none()
                 }
             },
-            Message::UnsplashCollection(res) => match res {
+            Message::UnsplashCollection(res) => match *res {
                 Err(e) => {
                     error!("failed to fetch collection: {e}");
                     Task::none()
@@ -248,11 +249,13 @@ impl BackgroundHandle {
                     _ => Task::none(),
                 },
             },
-            Message::PauseUnsplash => if let Some(state) = &mut self.unsplash_state {
-                state.paused = !state.paused;
-                Task::none()
-            } else {
-                Task::none()
+            Message::PauseUnsplash => {
+                if let Some(state) = &mut self.unsplash_state {
+                    state.paused = !state.paused;
+                    Task::none()
+                } else {
+                    Task::none()
+                }
             }
         }
     }
diff --git a/src/main.rs b/src/main.rs
@@ -65,7 +65,7 @@ enum Message {
     Background(background::Message),
 
     RequestForecastUpdate,
-    ForecastUpdate(Result<Forecast, String>),
+    ForecastUpdate(Box<Result<Forecast, String>>),
 }
 
 impl Fjordgard {
@@ -120,10 +120,16 @@ impl Fjordgard {
                 Task::none()
             }
             Message::Media(action) => match action {
-                MediaControl::Next => Task::done(Message::Background(background::Message::RequestUnsplash(1))),
-                MediaControl::Previous => Task::done(Message::Background(background::Message::RequestUnsplash(-1))),
-                MediaControl::Pause => Task::done(Message::Background(background::Message::PauseUnsplash)),
-            }
+                MediaControl::Next => {
+                    Task::done(Message::Background(background::Message::RequestUnsplash(1)))
+                }
+                MediaControl::Previous => Task::done(Message::Background(
+                    background::Message::RequestUnsplash(-1),
+                )),
+                MediaControl::Pause => {
+                    Task::done(Message::Background(background::Message::PauseUnsplash))
+                }
+            },
             Message::OpenSettings => {
                 if self.settings_window.is_none() {
                     let (_id, open) = window::open(window::Settings {
@@ -213,7 +219,7 @@ impl Fjordgard {
                             )
                             .await
                     })
-                    .map(|r| Message::ForecastUpdate(r.map_err(|e| e.to_string())))
+                    .map(|r| Message::ForecastUpdate(Box::new(r.map_err(|e| e.to_string()))))
                 } else {
                     self.forecast_text = String::from("Weather unknown");
                     self.forecast_icon = String::from("icons/weather/100-0.svg");
@@ -221,7 +227,7 @@ impl Fjordgard {
                     Task::none()
                 }
             }
-            Message::ForecastUpdate(res) => match res {
+            Message::ForecastUpdate(res) => match *res {
                 Err(e) => {
                     error!("failed to load forecast: {e}");
                     Task::none()
@@ -311,7 +317,7 @@ impl Fjordgard {
 
                     Task::none()
                 }
-            }
+            },
         }
     }