summaryrefslogtreecommitdiffstats
path: root/winit/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector@hecrj.dev>2023-09-19 13:22:21 +0200
committerLibravatar GitHub <noreply@github.com>2023-09-19 13:22:21 +0200
commit582da10ae2465a7a65ea062347b8f14fba8e6064 (patch)
treee4be970e1f7614e79e5303a391b77858cc03121e /winit/src
parenta4dbf0788716e8b83a9f37963ef685b765a326c6 (diff)
parentc997aad85d7ee6e77085e50e5e599002549d228f (diff)
downloadiced-582da10ae2465a7a65ea062347b8f14fba8e6064.tar.gz
iced-582da10ae2465a7a65ea062347b8f14fba8e6064.tar.bz2
iced-582da10ae2465a7a65ea062347b8f14fba8e6064.zip
Merge pull request #2090 from nyurik/mapping
Chore: Apply clippy map transformations
Diffstat (limited to 'winit/src')
-rw-r--r--winit/src/application/state.rs3
-rw-r--r--winit/src/clipboard.rs3
2 files changed, 2 insertions, 4 deletions
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index e655529a..9d1d5dcf 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -97,8 +97,7 @@ where
self.viewport.scale_factor(),
)
})
- .map(mouse::Cursor::Available)
- .unwrap_or(mouse::Cursor::Unavailable)
+ .map_or(mouse::Cursor::Unavailable, mouse::Cursor::Available)
}
/// Returns the current keyboard modifiers of the [`State`].
diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 8b6c83ce..4228e46f 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 }
}