summaryrefslogtreecommitdiffstats
path: root/winit
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-09-20 16:26:43 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-09-20 16:26:43 +0200
commitb27762554627b8e89f2b840b1a8a512e22d4cd87 (patch)
tree4099870d14980fb2651dc50786639ca704a55074 /winit
parent76873921af3cd04ac0cbed01ebbd66936454dbe3 (diff)
downloadiced-b27762554627b8e89f2b840b1a8a512e22d4cd87.tar.gz
iced-b27762554627b8e89f2b840b1a8a512e22d4cd87.tar.bz2
iced-b27762554627b8e89f2b840b1a8a512e22d4cd87.zip
Revert "Chore: Apply clippy map transformations"
This reverts commit c997aad85d7ee6e77085e50e5e599002549d228f.
Diffstat (limited to 'winit')
-rw-r--r--winit/src/application/state.rs3
-rw-r--r--winit/src/clipboard.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index 9d1d5dcf..e655529a 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -97,7 +97,8 @@ where
self.viewport.scale_factor(),
)
})
- .map_or(mouse::Cursor::Unavailable, mouse::Cursor::Available)
+ .map(mouse::Cursor::Available)
+ .unwrap_or(mouse::Cursor::Unavailable)
}
/// Returns the current keyboard modifiers of the [`State`].
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 }
}