diff options
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/src/application.rs | 4 | ||||
| -rw-r--r-- | winit/src/application/state.rs | 3 | ||||
| -rw-r--r-- | winit/src/clipboard.rs | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/winit/src/application.rs b/winit/src/application.rs index d1689452..dec77e80 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -157,7 +157,7 @@ where ) .with_visible(false); - log::debug!("Window builder: {:#?}", builder); + log::debug!("Window builder: {builder:#?}"); let window = builder .build(&event_loop) @@ -174,7 +174,7 @@ where let body = document.body().unwrap(); let target = target.and_then(|target| { - body.query_selector(&format!("#{}", target)) + body.query_selector(&format!("#{target}")) .ok() .unwrap_or(None) }); 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 7271441d..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 } } @@ -45,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 => {} |