From 3d6b9637c3b1c9f3c654a3ecef7a247cfd6edef3 Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Date: Tue, 19 Sep 2023 01:31:10 -0400
Subject: Chore: Inline format args for ease of reading

A minor cleanup to inline all simple cases of format arguments. Makes the format strings just a bit easier to read.
---
 winit/src/clipboard.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'winit/src/clipboard.rs')

diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 7271441d..8b6c83ce 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -45,7 +45,7 @@ impl Clipboard {
             State::Connected(clipboard) => match clipboard.write(contents) {
                 Ok(()) => {}
                 Err(error) => {
-                    log::warn!("error writing to clipboard: {}", error)
+                    log::warn!("error writing to clipboard: {error}")
                 }
             },
             State::Unavailable => {}
-- 
cgit 


From c997aad85d7ee6e77085e50e5e599002549d228f Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Date: Tue, 19 Sep 2023 01:46:46 -0400
Subject: Chore: Apply clippy map transformations

Convert `.map().unwrap_or()` to `.map_or()` and similar transformations.
---
 winit/src/clipboard.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'winit/src/clipboard.rs')

diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 7271441d..14bbcbee 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -17,8 +17,7 @@ impl Clipboard {
     pub fn connect(window: &winit::window::Window) -> Clipboard {
         let state = window_clipboard::Clipboard::connect(window)
             .ok()
-            .map(State::Connected)
-            .unwrap_or(State::Unavailable);
+            .map_or(State::Unavailable, State::Connected);
 
         Clipboard { state }
     }
-- 
cgit 


From 34f07b60273d6cfe13834af54cd0e24d34569387 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 20 Sep 2023 04:11:52 +0200
Subject: Fix `clippy::semicolon_if_nothing_returned`

---
 winit/src/clipboard.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'winit/src/clipboard.rs')

diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 4228e46f..0a09c255 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -44,7 +44,7 @@ impl Clipboard {
             State::Connected(clipboard) => match clipboard.write(contents) {
                 Ok(()) => {}
                 Err(error) => {
-                    log::warn!("error writing to clipboard: {error}")
+                    log::warn!("error writing to clipboard: {error}");
                 }
             },
             State::Unavailable => {}
@@ -58,6 +58,6 @@ impl crate::core::Clipboard for Clipboard {
     }
 
     fn write(&mut self, contents: String) {
-        self.write(contents)
+        self.write(contents);
     }
 }
-- 
cgit 


From b27762554627b8e89f2b840b1a8a512e22d4cd87 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 20 Sep 2023 16:26:43 +0200
Subject: Revert "Chore: Apply clippy map transformations"

This reverts commit c997aad85d7ee6e77085e50e5e599002549d228f.
---
 winit/src/clipboard.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'winit/src/clipboard.rs')

diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 0a09c255..f7a32868 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -17,7 +17,8 @@ impl Clipboard {
     pub fn connect(window: &winit::window::Window) -> Clipboard {
         let state = window_clipboard::Clipboard::connect(window)
             .ok()
-            .map_or(State::Unavailable, State::Connected);
+            .map(State::Connected)
+            .unwrap_or(State::Unavailable);
 
         Clipboard { state }
     }
-- 
cgit