leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump MSRV to 1.64

Browse source
This commit is contained in:
Kirill Chibisov 2023-03-08 19:34:10 +03:00 • committed by GitHub
parent fb9695d56d
commit b18295a1ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/platform_impl/linux/wayland/output.rs
View file

@ -171,7 +171,7 @@ impl MonitorHandle {
sctk::output::with_output_info(&self.proxy, |info| {
info.modes
.iter()
.find_map(|mode| mode.is_current.then(|| mode.refresh_rate as u32))
.find_map(|mode| mode.is_current.then_some(mode.refresh_rate as u32))
})
.flatten()
}

4
src/platform_impl/linux/wayland/seat/text_input/handlers.rs
View file

@ -72,10 +72,10 @@ pub(super) fn handle_text_input(
let text = text.unwrap_or_default();
let cursor_begin = usize::try_from(cursor_begin)
.ok()
.and_then(|idx| text.is_char_boundary(idx).then(|| idx));
.and_then(|idx| text.is_char_boundary(idx).then_some(idx));
let cursor_end = usize::try_from(cursor_end)
.ok()
.and_then(|idx| text.is_char_boundary(idx).then(|| idx));
.and_then(|idx| text.is_char_boundary(idx).then_some(idx));
inner.pending_preedit = Some(Preedit {
text,

6
src/platform_impl/linux/x11/ime/context.rs
View file

@ -263,7 +263,7 @@ impl ImeContext {
ptr::null_mut::<()>(),
);
(!ic.is_null()).then(|| ic)
(!ic.is_null()).then_some(ic)
}
unsafe fn create_preedit_ic(
@ -302,7 +302,7 @@ impl ImeContext {
ptr::null_mut::<()>(),
);
(!ic.is_null()).then(|| ic)
(!ic.is_null()).then_some(ic)
}
unsafe fn create_nothing_ic(
@ -320,7 +320,7 @@ impl ImeContext {
ptr::null_mut::<()>(),
);
(!ic.is_null()).then(|| ic)
(!ic.is_null()).then_some(ic)
}
pub(crate) fn focus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {

2
src/platform_impl/linux/x11/util/hint.rs
View file

@ -197,7 +197,7 @@ impl<'a> NormalHints<'a> {
}
pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
has_flag(self.size_hints.flags, ffi::PResizeInc).then(|| {
has_flag(self.size_hints.flags, ffi::PResizeInc).then_some({
(
self.size_hints.width_inc as u32,
self.size_hints.height_inc as u32,

9
src/platform_impl/windows/window_state.rs
View file

@ -371,10 +371,11 @@ impl WindowFlags {
if diff.contains(WindowFlags::CLOSABLE) || new.contains(WindowFlags::CLOSABLE) {
let flags = MF_BYCOMMAND
| new
.contains(WindowFlags::CLOSABLE)
.then(|| MF_ENABLED)
.unwrap_or(MF_DISABLED);
| if new.contains(WindowFlags::CLOSABLE) {
MF_ENABLED
} else {
MF_DISABLED
};
unsafe {
EnableMenuItem(GetSystemMenu(window, 0), SC_CLOSE, flags);